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 29a52230cef8e4e30289fccfd2d6300272ccc5db..56e83c622f51d56c7d6a9a9e30ad84be3ada220d 100644 (file)
--- a/include/vlc/libvlc_structures.h
+++ b/include/vlc/libvlc_structures.h
@@ -53,15 +53,16 @@ typedef struct libvlc_exception_t
 /**@} */
 
 /*****************************************************************************
- * Tag Query
+ * Tag
  *****************************************************************************/
-/** defgroup libvlc_tag_query Tag Query
+/** defgroup libvlc_tag Tag
  * \ingroup libvlc
- * LibVLC Tag Query support in media descriptor
+ * LibVLC Tag  support in media descriptor
  * @{
  */
 
 typedef struct libvlc_tag_query_t libvlc_tag_query_t;
+typedef char * libvlc_tag_t;
 
 /**@} */
 
@@ -91,7 +92,7 @@ typedef enum libvlc_meta_t {
     libvlc_meta_Description,
     libvlc_meta_Rating,
     libvlc_meta_Date,
-    libvlc_meta_Settings,
+    libvlc_meta_Setting,
     libvlc_meta_URL,
     libvlc_meta_Language,
     libvlc_meta_NowPlaying,
@@ -134,6 +135,20 @@ 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
  *****************************************************************************/
@@ -147,6 +162,19 @@ 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
  *****************************************************************************/
@@ -175,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,
@@ -197,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
  *****************************************************************************/
@@ -234,17 +275,28 @@ typedef struct libvlc_log_message_t
  * LibVLC Event Callbacks
  * @{
  */
-    
+ 
 /**
  * Available events: (XXX: being reworked)
  * - libvlc_MediaInstanceReachedEnd
  */
 
 typedef enum libvlc_event_type_t {
+    libvlc_MediaDescriptorMetaChanged,
+    libvlc_MediaDescriptorSubItemAdded,
+
+    libvlc_MediaInstancePlayed,
+    libvlc_MediaInstancePaused,
     libvlc_MediaInstanceReachedEnd,
+    libvlc_MediaInstancePositionChanged,
+ 
     libvlc_MediaListItemAdded,
     libvlc_MediaListItemDeleted,
-    libvlc_MediaListItemChanged,
+
+    libvlc_MediaListPlayerPlayed,
+    libvlc_MediaListPlayerNextItemSet,
+    libvlc_MediaListPlayerStopped,
+
 } libvlc_event_type_t;
 
 /**
@@ -260,21 +312,33 @@ typedef struct libvlc_event_t
     void * p_obj;
     union event_type_specific
     {
+        /* media descriptor */
         struct
         {
-            libvlc_media_descriptor_t * item;
-            int index;
-        } media_list_item_added;
+            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
         {
             libvlc_media_descriptor_t * item;
             int index;
-        } media_list_item_deleted;
+        } media_list_item_added;
         struct
         {
             libvlc_media_descriptor_t * item;
             int index;
-        } media_list_item_changed;
+        } media_list_item_deleted;
     } u;
 } libvlc_event_t;