Removes trailing spaces. Removes tabs.

[vlc] / include / vlc / libvlc_structures.h

diff --git a/include/vlc/libvlc_structures.h b/include/vlc/libvlc_structures.h
index ce63b143c44337f02c61c1e91998c5a795258676..56e83c622f51d56c7d6a9a9e30ad84be3ada220d 100644 (file)
--- a/include/vlc/libvlc_structures.h
+++ b/include/vlc/libvlc_structures.h
@@ -52,6 +52,20 @@ typedef struct libvlc_exception_t
 
 /**@} */
 
+/*****************************************************************************
+ * Tag
+ *****************************************************************************/
+/** defgroup libvlc_tag Tag
+ * \ingroup libvlc
+ * LibVLC Tag  support in media descriptor
+ * @{
+ */
+
+typedef struct libvlc_tag_query_t libvlc_tag_query_t;
+typedef char * libvlc_tag_t;
+
+/**@} */
+
 /*****************************************************************************
  * Media Descriptor
  *****************************************************************************/
@@ -70,7 +84,22 @@ typedef struct libvlc_exception_t
 
 typedef enum libvlc_meta_t {
     libvlc_meta_Title,
-    libvlc_meta_Artist
+    libvlc_meta_Artist,
+    libvlc_meta_Genre,
+    libvlc_meta_Copyright,
+    libvlc_meta_Album,
+    libvlc_meta_TrackNumber,
+    libvlc_meta_Description,
+    libvlc_meta_Rating,
+    libvlc_meta_Date,
+    libvlc_meta_Setting,
+    libvlc_meta_URL,
+    libvlc_meta_Language,
+    libvlc_meta_NowPlaying,
+    libvlc_meta_Publisher,
+    libvlc_meta_EncodedBy,
+    libvlc_meta_ArtworkURL,
+    libvlc_meta_TrackID
 } libvlc_meta_t;
 
 /**@} */
@@ -79,6 +108,7 @@ typedef struct libvlc_media_descriptor_t libvlc_media_descriptor_t;
 
 /**@} */
 
+
 /*****************************************************************************
  * Media Instance
  *****************************************************************************/
@@ -92,6 +122,58 @@ typedef struct libvlc_media_instance_t libvlc_media_instance_t;
 
 /**@} */
 
+/*****************************************************************************
+ * Media List
+ *****************************************************************************/
+/** defgroup libvlc_media_list MediaList
+ * \ingroup libvlc
+ * LibVLC Media List handling
+ * @{
+ */
+
+typedef struct libvlc_media_list_t libvlc_media_list_t;
+
+/**@} */
+
+/*****************************************************************************
+ * Dynamic Media List
+ *****************************************************************************/
+/** defgroup libvlc_media_list MediaList
+ * \ingroup libvlc
+ * LibVLC Dynamic Media list: Media list with content synchronized with
+ * an other playlist
+ * @{
+ */
+
+typedef struct libvlc_dynamic_media_list_t libvlc_dynamic_media_list_t;
+
+/**@} */
+
+/*****************************************************************************
+ * Media List Player
+ *****************************************************************************/
+/** defgroup libvlc_media_list_player MediaListPlayer
+ * \ingroup libvlc
+ * LibVLC Media List Player handling
+ * @{
+ */
+
+typedef struct libvlc_media_list_player_t libvlc_media_list_player_t;
+
+/**@} */
+
+/*****************************************************************************
+ * Media Library
+ *****************************************************************************/
+/** defgroup libvlc_media_library Media Library
+ * \ingroup libvlc
+ * LibVLC Media Library
+ * @{
+ */
+
+typedef struct libvlc_media_library_t libvlc_media_library_t;
+
+/**@} */
 
 /*****************************************************************************
  * Playlist
@@ -121,7 +203,7 @@ typedef struct libvlc_playlist_item_t
  * LibVLC Video handling
  * @{
  */
-    
+ 
 /**
 * Downcast to this general type as placeholder for a platform specific one, such as:
 *  Drawable on X11,
@@ -143,6 +225,19 @@ libvlc_rectangle_t;
 /**@} */
 
 
+/*****************************************************************************
+ * Services/Media Discovery
+ *****************************************************************************/
+/** defgroup libvlc_media_discoverer Media Discoverer
+ * \ingroup libvlc
+ * LibVLC Media Discoverer
+ * @{
+ */
+
+typedef struct libvlc_media_discoverer_t libvlc_media_discoverer_t;
+
+/**@} */
+
 /*****************************************************************************
  * Message log handling
  *****************************************************************************/
@@ -180,16 +275,28 @@ typedef struct libvlc_log_message_t
  * LibVLC Event Callbacks
  * @{
  */
-    
+ 
 /**
  * Available events: (XXX: being reworked)
- * - libvlc_VolumeChanged
- * - libvlc_InputPositionChanged
+ * - libvlc_MediaInstanceReachedEnd
  */
 
 typedef enum libvlc_event_type_t {
-    libvlc_VolumeChanged,
-    libvlc_InputPositionChanged,
+    libvlc_MediaDescriptorMetaChanged,
+    libvlc_MediaDescriptorSubItemAdded,
+
+    libvlc_MediaInstancePlayed,
+    libvlc_MediaInstancePaused,
+    libvlc_MediaInstanceReachedEnd,
+    libvlc_MediaInstancePositionChanged,
+ 
+    libvlc_MediaListItemAdded,
+    libvlc_MediaListItemDeleted,
+
+    libvlc_MediaListPlayerPlayed,
+    libvlc_MediaListPlayerNextItemSet,
+    libvlc_MediaListPlayerStopped,
+
 } libvlc_event_type_t;
 
 /**
@@ -202,17 +309,36 @@ typedef enum libvlc_event_type_t {
 typedef struct libvlc_event_t
 {
     libvlc_event_type_t type;
-       void * p_obj;
-    union
+    void * p_obj;
+    union event_type_specific
     {
+        /* media descriptor */
+        struct
+        {
+            libvlc_meta_t meta_type;
+        } media_descriptor_meta_changed;
+        struct
+        {
+            libvlc_media_descriptor_t * new_child;
+        } media_descriptor_subitem_added;
+
+        /* media instance */
+        struct
+        {
+            long int new_position;
+        } media_instance_position_changed;
+
+        /* media list */
         struct
         {
-            int new_volume;
-        } volume_changed;
+            libvlc_media_descriptor_t * item;
+            int index;
+        } media_list_item_added;
         struct
         {
-            vlc_int64_t new_position;
-        } input_position_changed;
+            libvlc_media_descriptor_t * item;
+            int index;
+        } media_list_item_deleted;
     } u;
 } libvlc_event_t;
 
@@ -228,7 +354,7 @@ typedef struct libvlc_event_manager_t libvlc_event_manager_t;
  * \param p_event the event triggering the callback
  */
 
-typedef void ( *libvlc_callback_t )( const libvlc_event_t * );
+typedef void ( *libvlc_callback_t )( const libvlc_event_t *, void * );
 
 /**@} */