X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc%2Flibvlc_events.h;h=8046b5f708632403f309219fa34c106b8e9a00a7;hb=9f1c2185529eec1eb422acd60800c6bca8d66983;hp=649fffa2d627623cfb5f9cac234a5364b318f8e4;hpb=141eb5a663b05b41afc5664ccf43cc73e601894c;p=vlc

diff --git a/include/vlc/libvlc_events.h b/include/vlc/libvlc_events.h
index 649fffa2d6..8046b5f708 100644
--- a/include/vlc/libvlc_events.h
+++ b/include/vlc/libvlc_events.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * libvlc_events.h:  libvlc_events external API structure
  *****************************************************************************
- * Copyright (C) 1998-2008 the VideoLAN team
+ * Copyright (C) 1998-2010 the VideoLAN team
  * $Id $
  *
  * Authors: Filippo Carone <littlejohn@videolan.org>
@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef LIBVLC_EVENTS_H
@@ -34,30 +34,26 @@
 extern "C" {
 # endif
 
-/*****************************************************************************
- * Events handling
- *****************************************************************************/
-
-/** \defgroup libvlc_event libvlc_event
- * \ingroup libvlc_core
- * LibVLC Available Events
+/**
+ * \ingroup libvlc_event
  * @{
  */
 
-#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,
+/**
+ * Event types
+ */
+enum libvlc_event_e {
+    /* Append new event types at the end of a category.
+     * Do not remove, insert or re-order any entry.
+     * Keep this in sync with src/control/event.c:libvlc_event_type_name(). */
+    libvlc_MediaMetaChanged=0,
     libvlc_MediaSubItemAdded,
     libvlc_MediaDurationChanged,
-    libvlc_MediaPreparsedChanged,
+    libvlc_MediaParsedChanged,
     libvlc_MediaFreed,
     libvlc_MediaStateChanged,
 
+    libvlc_MediaPlayerMediaChanged=0x100,
     libvlc_MediaPlayerNothingSpecial,
     libvlc_MediaPlayerOpening,
     libvlc_MediaPlayerBuffering,
@@ -72,29 +68,28 @@ enum libvlc_event_type_t {
     libvlc_MediaPlayerPositionChanged,
     libvlc_MediaPlayerSeekableChanged,
     libvlc_MediaPlayerPausableChanged,
+    libvlc_MediaPlayerTitleChanged,
+    libvlc_MediaPlayerSnapshotTaken,
+    libvlc_MediaPlayerLengthChanged,
 
-    libvlc_MediaListItemAdded,
+    libvlc_MediaListItemAdded=0x200,
     libvlc_MediaListWillAddItem,
     libvlc_MediaListItemDeleted,
     libvlc_MediaListWillDeleteItem,
 
-    libvlc_MediaListViewItemAdded,
+    libvlc_MediaListViewItemAdded=0x300,
     libvlc_MediaListViewWillAddItem,
     libvlc_MediaListViewItemDeleted,
     libvlc_MediaListViewWillDeleteItem,
 
-    libvlc_MediaListPlayerPlayed,
+    libvlc_MediaListPlayerPlayed=0x400,
     libvlc_MediaListPlayerNextItemSet,
     libvlc_MediaListPlayerStopped,
 
-    libvlc_MediaDiscovererStarted,
+    libvlc_MediaDiscovererStarted=0x500,
     libvlc_MediaDiscovererEnded,
 
-    libvlc_MediaPlayerTitleChanged,
-    libvlc_MediaPlayerSnapshotTaken,
-    libvlc_MediaPlayerLengthChanged,
-
-    libvlc_VlmMediaAdded,
+    libvlc_VlmMediaAdded=0x600,
     libvlc_VlmMediaRemoved,
     libvlc_VlmMediaChanged,
     libvlc_VlmMediaInstanceStarted,
@@ -105,21 +100,16 @@ enum libvlc_event_type_t {
     libvlc_VlmMediaInstanceStatusPause,
     libvlc_VlmMediaInstanceStatusEnd,
     libvlc_VlmMediaInstanceStatusError,
-    /* New event types HERE */
 };
 
 /**
- * An Event
- * \param type the even type
- * \param p_obj the sender object
- * \param u Event dependent content
+ * A LibVLC event
  */
-
-struct libvlc_event_t
+typedef struct libvlc_event_t
 {
-    libvlc_event_type_t type;
-    void * p_obj;
-    union event_type_specific
+    int   type; /**< Event type (see @ref libvlc_event_e) */
+    void *p_obj; /**< Object emitting the event */
+    union
     {
         /* media descriptor */
         struct
@@ -137,7 +127,7 @@ struct libvlc_event_t
         struct
         {
             int new_status;
-        } media_preparsed_changed;
+        } media_parsed_changed;
         struct
         {
             libvlc_media_t * md;
@@ -149,6 +139,10 @@ struct libvlc_event_t
 
         /* media instance */
         struct
+        {
+            float new_cache;
+        } media_player_buffering;
+        struct
         {
             float new_position;
         } media_player_position_changed;
@@ -162,11 +156,11 @@ struct libvlc_event_t
         } media_player_title_changed;
         struct
         {
-            uint64_t new_seekable; /* FIXME: that's a boolean! */
+            int new_seekable;
         } media_player_seekable_changed;
         struct
         {
-            uint64_t new_pausable; /* FIXME: that's a BOOL!!! */
+            int new_pausable;
         } media_player_pausable_changed;
 
         /* media list */
@@ -191,34 +185,12 @@ struct libvlc_event_t
             int index;
         } media_list_will_delete_item;
 
-        /* media list view */
-        struct
-        {
-            libvlc_media_t * item;
-            int index;
-        } media_list_view_item_added;
-        struct
-        {
-            libvlc_media_t * item;
-            int index;
-        } media_list_view_will_add_item;
-        struct
-        {
-            libvlc_media_t * item;
-            int index;
-        } media_list_view_item_deleted;
-        struct
-        {
-            libvlc_media_t * item;
-            int index;
-        } media_list_view_will_delete_item;
-
         /* media list player */
         struct
         {
             libvlc_media_t * item;
         } media_list_player_next_item_set;
-        
+
         /* snapshot taken */
         struct
         {
@@ -237,8 +209,14 @@ struct libvlc_event_t
             const char * psz_media_name;
             const char * psz_instance_name;
         } vlm_media_event;
-    } u;
-};
+
+        /* Extra MediaPlayer */
+        struct
+        {
+            libvlc_media_t * new_media;
+        } media_player_media_changed;
+    } u; /**< Type-dependent event description */
+} libvlc_event_t;
 
 
 /**@} */