Remove enums from public APIs

[vlc] / include / vlc / libvlc_events.h

diff --git a/include/vlc/libvlc_events.h b/include/vlc/libvlc_events.h
index f72ee6cab594f9e1be8978c5f2d27c3c0b0f4537..51c637e1fab7be2568e794379ff61c91ceb71075 100644 (file)
--- a/include/vlc/libvlc_events.h
+++ b/include/vlc/libvlc_events.h
@@ -44,7 +44,13 @@ extern "C" {
  * @{
  */
 
-typedef enum libvlc_event_type_t {
+#ifdef __cplusplus
+enum libvlc_event_type_e {
+#else
+enum libvlc_event_type_t {
+#endif
+    /* Append new event types at the end.
+     * Do not remove, insert or re-order any entry. */
     libvlc_MediaMetaChanged,
     libvlc_MediaSubItemAdded,
     libvlc_MediaDurationChanged,
@@ -84,9 +90,17 @@ typedef enum libvlc_event_type_t {
     libvlc_MediaDiscovererStarted,
     libvlc_MediaDiscovererEnded,
 
-    libvlc_MediaPlayerTitleChanged
+    libvlc_MediaPlayerTitleChanged,
+    libvlc_MediaPlayerSnapshotTaken,
+    libvlc_MediaPlayerLengthChanged,
 
-} libvlc_event_type_t;
+    libvlc_VlmMediaAdded,
+    libvlc_VlmMediaRemoved,
+    libvlc_VlmMediaChanged,
+    libvlc_VlmMediaInstanceStarted,
+    libvlc_VlmMediaInstanceStopped,
+    /* New event types HERE */
+};
 
 /**
  * An Event
@@ -95,16 +109,16 @@ typedef enum libvlc_event_type_t {
  * \param u Event dependent content
  */
 
-typedef struct libvlc_event_t
+struct libvlc_event_t
 {
-    libvlc_event_type_t type;
+    unsigned type;
     void * p_obj;
     union event_type_specific
     {
         /* media descriptor */
         struct
         {
-            libvlc_meta_t meta_type;
+            unsigned meta_type;
         } media_meta_changed;
         struct
         {
@@ -124,7 +138,7 @@ typedef struct libvlc_event_t
         } media_freed;
         struct
         {
-            libvlc_state_t new_state;
+            unsigned new_state;
         } media_state_changed;
 
         /* media instance */
@@ -142,11 +156,11 @@ typedef struct libvlc_event_t
         } media_player_title_changed;
         struct
         {
-            libvlc_time_t new_seekable;
+            uint64_t new_seekable; /* FIXME: that's a boolean! */
         } media_player_seekable_changed;
         struct
         {
-            libvlc_time_t new_pausable;
+            uint64_t new_pausable; /* FIXME: that's a BOOL!!! */
         } media_player_pausable_changed;
 
         /* media list */
@@ -193,32 +207,27 @@ typedef struct libvlc_event_t
             int index;
         } media_list_view_will_delete_item;
 
-        /* media discoverer */
+        /* snapshot taken */
         struct
         {
-            void * unused;
-        } media_media_discoverer_started;
+             char* psz_filename ;
+        } media_player_snapshot_taken ;
+
+        /* Length changed */
         struct
         {
-            void * unused;
-        } media_media_discoverer_ended;
-
-    } u;
-} libvlc_event_t;
-
-/**
- * Event manager that belongs to a libvlc object, and from whom events can
- * be received.
- */
+            libvlc_time_t   new_length;
+        } media_player_length_changed;
 
-typedef struct libvlc_event_manager_t libvlc_event_manager_t;
+        /* VLM media */
+        struct
+        {
+            const char * psz_media_name;
+        } vlm_media_event;
 
-/**
- * Callback function notification
- * \param p_event the event triggering the callback
- */
+    } u;
+};
 
-typedef void ( *libvlc_callback_t )( const libvlc_event_t *, void * );
 
 /**@} */