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 01ade2fbaa20beccf33b4259b4dc5820e38499d2..56e83c622f51d56c7d6a9a9e30ad84be3ada220d 100644 (file)
--- a/include/vlc/libvlc_structures.h
+++ b/include/vlc/libvlc_structures.h
@@ -52,22 +52,6 @@ typedef struct libvlc_exception_t
 
 /**@} */
 
-/*****************************************************************************
- * Tree
- *****************************************************************************/
-/** defgroup libvlc_tree Tree
- * \ingroup libvlc
- * LibVLC Tree 
- * @{
- */
-
-typedef void (*libvlc_retain_function)(void *);
-typedef void (*libvlc_release_function)(void *);
-
-typedef struct libvlc_tree_t libvlc_tree_t;
-
-/**@} */
-
 /*****************************************************************************
  * Tag
  *****************************************************************************/
@@ -151,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
  *****************************************************************************/
@@ -205,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,
@@ -277,7 +275,7 @@ typedef struct libvlc_log_message_t
  * LibVLC Event Callbacks
  * @{
  */
-    
+ 
 /**
  * Available events: (XXX: being reworked)
  * - libvlc_MediaInstanceReachedEnd
@@ -287,11 +285,17 @@ 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;
 
@@ -318,6 +322,12 @@ typedef struct libvlc_event_t
             libvlc_media_descriptor_t * new_child;
         } media_descriptor_subitem_added;
 
+        /* media instance */
+        struct
+        {
+            long int new_position;
+        } media_instance_position_changed;
+
         /* media list */
         struct
         {
@@ -329,11 +339,6 @@ typedef struct libvlc_event_t
             libvlc_media_descriptor_t * item;
             int index;
         } media_list_item_deleted;
-        struct
-        {
-            libvlc_media_descriptor_t * item;
-            int index;
-        } media_list_item_changed;
     } u;
 } libvlc_event_t;