X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_events.h;h=51a3faa7066ec56b4fe452715462234578cea5c9;hb=7686840e5c2b384eab661455a5e532a97c669e96;hp=d3903ff8409bf469cc5ec1a22f8e3ff4220b7778;hpb=8cc3dca1d4f62ead403b6565e825e1de8d4f42ac;p=vlc

diff --git a/include/vlc_events.h b/include/vlc_events.h
index d3903ff840..51a3faa706 100644
--- a/include/vlc_events.h
+++ b/include/vlc_events.h
@@ -42,7 +42,7 @@
  *
  * This implements a way to send and receive event for an object (which can be
  * a simple C struct or less).
- * 
+ *
  * This is in direct concurrency with the Variable based Callback
  * (see src/misc/variables.c).
  *
@@ -59,7 +59,7 @@
  *
  * (vlc_cool_object_t doesn't need to have the VLC_COMMON_MEMBERS.)
  *
- * struct vlc_cool_object_t 
+ * struct vlc_cool_object_t
  * {
  *        ...
  *        vlc_event_manager_t p_event_manager;
@@ -69,7 +69,7 @@
  * vlc_my_cool_object_new()
  * {
  *        ...
- *        vlc_event_manager_Create( &p_self->p_event_manager, p_this );
+ *        vlc_event_manager_init( &p_self->p_event_manager, p_self, p_a_libvlc_object );
  *        vlc_event_manager_register_event_type(p_self->p_event_manager,
  *                vlc_MyCoolObjectDidSomething, p_e)
  *        ...
@@ -78,7 +78,7 @@
  * vlc_my_cool_object_release()
  * {
  *         ...
- *         vlc_event_manager_release( p_self->p_event_manager );
+ *         vlc_event_manager_fini( &p_self->p_event_manager );
  *         ...
  * }
  *
@@ -88,10 +88,10 @@
  *        vlc_event_t event;
  *        event.type = vlc_MyCoolObjectDidSomething;
  *        event.u.my_cool_object_did_something.what_it_did = kSomething;
- *        vlc_event_send( p_self->p_event_manager, &event );
+ *        vlc_event_send( &p_self->p_event_manager, &event );
  * }
  * */
- 
+
   /*****************************************************************************
  * Event Type
  *****************************************************************************/
@@ -104,6 +104,7 @@ typedef struct vlc_event_manager_t
 {
     void * p_obj;
     vlc_mutex_t object_lock;
+    vlc_mutex_t event_sending_lock;
     vlc_object_t *p_parent_object;
     DECL_ARRAY(struct vlc_event_listeners_group_t *) listeners_groups;
 } vlc_event_manager_t;
@@ -111,13 +112,23 @@ typedef struct vlc_event_manager_t
 /* List of event */
 /* Be sure to keep sync-ed with misc/events.c debug name table */
 typedef enum vlc_event_type_t {
+    /* Input (thread) events */
+    vlc_InputStateChanged,
+    vlc_InputSelectedStreamChanged,
+
     /* Input item events */
     vlc_InputItemMetaChanged,
     vlc_InputItemSubItemAdded,
+    vlc_InputItemDurationChanged,
+    vlc_InputItemPreparsedChanged,
+    vlc_InputItemNameChanged,
+    vlc_InputItemInfoChanged,
 
     /* Service Discovery event */
     vlc_ServicesDiscoveryItemAdded,
-    vlc_ServicesDiscoveryItemRemoved
+    vlc_ServicesDiscoveryItemRemoved,
+    vlc_ServicesDiscoveryStarted,
+    vlc_ServicesDiscoveryEnded
 } vlc_event_type_t;
 
 /* Event definition */
@@ -127,6 +138,16 @@ typedef struct vlc_event_t
     void * p_obj; /* Sender object, automatically filled by vlc_event_send() */
     union vlc_event_type_specific
     {
+        /* Input (thread) events */
+        struct vlc_input_state_changed
+        {
+            int new_state;
+        } input_state_changed;
+        struct vlc_input_selected_stream_changed
+        {
+            void * unused;
+        } input_selected_stream_changed;
+
         /* Input item events */
         struct vlc_input_item_meta_changed
         {
@@ -136,7 +157,23 @@ typedef struct vlc_event_t
         {
             input_item_t * p_new_child;
         } input_item_subitem_added;
-        
+        struct vlc_input_item_duration_changed
+        {
+            mtime_t new_duration;
+        } input_item_duration_changed;
+        struct vlc_input_item_preparsed_changed
+        {
+            int new_status;
+        } input_item_preparsed_changed;
+        struct vlc_input_item_name_changed
+        {
+            const char * new_name;
+        } input_item_name_changed;
+        struct vlc_input_item_info_changed
+        {
+            void * unused;
+        } input_item_info_changed;
+
         /* Service discovery events */
         struct vlc_services_discovery_item_added
         {
@@ -147,6 +184,14 @@ typedef struct vlc_event_t
         {
             input_item_t * p_item;
         } services_discovery_item_removed;
+        struct vlc_services_discovery_started
+        {
+            void * unused;
+        } services_discovery_started;
+        struct vlc_services_discovery_ended
+        {
+            void * unused;
+        } services_discovery_ended;
 
     } u;
 } vlc_event_t;
@@ -163,7 +208,12 @@ typedef void ( *vlc_event_callback_t )( const vlc_event_t *, void * );
  * which events are sent
  * p_obj is here to give us a libvlc instance
  */
-VLC_EXPORT(int, vlc_event_manager_init, ( vlc_event_manager_t * p_em,
+#define vlc_event_manager_init_with_vlc_object(a,b) \
+            vlc_event_manager_init( a, b, b )
+
+#define vlc_event_manager_init(a,b,c) \
+            __vlc_event_manager_init(a, b, VLC_OBJECT(c))
+VLC_EXPORT(int, __vlc_event_manager_init, ( vlc_event_manager_t * p_em,
                                           void * p_obj, vlc_object_t * ));
 
 /*