X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_events.h;h=50cbc61912b8d051eaf79e3914d5bc417937fcb9;hb=12ade3e3bc975d5426ba4af155b7372c31093b31;hp=28fa302c5b1ab08a437a6d0c3ec75896bf3413ee;hpb=b6880d76665de38f089c387eed9bb9a91f72d2a1;p=vlc diff --git a/include/vlc_events.h b/include/vlc_events.h index 28fa302c5b..50cbc61912 100644 --- a/include/vlc_events.h +++ b/include/vlc_events.h @@ -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,11 +112,19 @@ 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_InputItemSubItemTreeAdded, vlc_InputItemDurationChanged, vlc_InputItemPreparsedChanged, + vlc_InputItemNameChanged, + vlc_InputItemInfoChanged, + vlc_InputItemErrorWhenReadingChanged, /* Service Discovery event */ vlc_ServicesDiscoveryItemAdded, @@ -131,6 +140,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 { @@ -140,6 +159,10 @@ typedef struct vlc_event_t { input_item_t * p_new_child; } input_item_subitem_added; + struct vlc_input_item_subitem_tree_added + { + input_item_node_t * p_root; + } input_item_subitem_tree_added; struct vlc_input_item_duration_changed { mtime_t new_duration; @@ -148,6 +171,18 @@ typedef struct vlc_event_t { 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; + struct input_item_error_when_reading_changed + { + bool new_value; + } input_item_error_when_reading_changed; /* Service discovery events */ struct vlc_services_discovery_item_added @@ -183,8 +218,13 @@ 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 */ +#define vlc_event_manager_init_with_vlc_object(a,b) \ + vlc_event_manager_init( a, b, b ) + VLC_EXPORT(int, vlc_event_manager_init, ( vlc_event_manager_t * p_em, void * p_obj, vlc_object_t * )); +#define vlc_event_manager_init(a,b,c) \ + vlc_event_manager_init(a, b, VLC_OBJECT(c)) /* * Destroy @@ -206,12 +246,12 @@ VLC_EXPORT(void, vlc_event_send, ( vlc_event_manager_t * p_em, /* * Add a callback for an event. */ -#define vlc_event_attach(a, b, c, d) __vlc_event_attach(a, b, c, d, #c) -VLC_EXPORT(int, __vlc_event_attach, ( vlc_event_manager_t * p_event_manager, - vlc_event_type_t event_type, - vlc_event_callback_t pf_callback, - void *p_user_data, - const char * psz_debug_name )); +VLC_EXPORT(int, vlc_event_attach, ( vlc_event_manager_t * p_event_manager, + vlc_event_type_t event_type, + vlc_event_callback_t pf_callback, + void *p_user_data, + const char * psz_debug_name )); +#define vlc_event_attach(a, b, c, d) vlc_event_attach(a, b, c, d, #c) /* * Remove a callback for an event.