X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcontrol%2Flibvlc_internal.h;h=4573f88fcc2af95ffa912ae41e1ca3b96091af2c;hb=40caaae0a39213f906821ba206cfc1fd59ebdf10;hp=9fdc5c6d4745c2bcbb095181b3ba78723411bcd0;hpb=632cfd1d7072e7e7156bbcede34fe4a13d0ad8e7;p=vlc diff --git a/src/control/libvlc_internal.h b/src/control/libvlc_internal.h index 9fdc5c6d47..4573f88fcc 100644 --- a/src/control/libvlc_internal.h +++ b/src/control/libvlc_internal.h @@ -45,14 +45,9 @@ extern "C" { VLC_EXPORT (libvlc_int_t *, libvlc_InternalCreate, ( void ) ); VLC_EXPORT (int, libvlc_InternalInit, ( libvlc_int_t *, int, const char *ppsz_argv[] ) ); VLC_EXPORT (int, libvlc_InternalCleanup, ( libvlc_int_t * ) ); -VLC_EXPORT (int, libvlc_InternalDestroy, ( libvlc_int_t *, vlc_bool_t ) ); - -VLC_EXPORT (int, libvlc_InternalAddIntf, ( libvlc_int_t *, const char *, vlc_bool_t, - vlc_bool_t, int, const char *const * ) ); - -VLC_EXPORT (void, libvlc_event_init, ( libvlc_instance_t *, libvlc_exception_t * ) ); -VLC_EXPORT (void, libvlc_event_fini, ( libvlc_instance_t * ) ); +VLC_EXPORT (int, libvlc_InternalDestroy, ( libvlc_int_t *, bool ) ); +VLC_EXPORT (int, libvlc_InternalAddIntf, ( libvlc_int_t *, const char *, bool ) ); /*************************************************************************** * Opaque structures for libvlc API @@ -77,41 +72,26 @@ struct libvlc_instance_t struct libvlc_callback_entry_list_t *p_callback_list; }; -struct libvlc_tags_storage_t -{ - char ** ppsz_tags; - int i_count; -}; - -struct libvlc_media_descriptor_t +struct libvlc_media_t { libvlc_event_manager_t * p_event_manager; int b_preparsed; input_item_t *p_input_item; int i_refcount; libvlc_instance_t *p_libvlc_instance; - vlc_dictionary_t tags; /* To be merged with core's meta soon */ libvlc_state_t state; struct libvlc_media_list_t *p_subitems; /* A media descriptor can have * Sub item */ void *p_user_data; /* Allows for VLC.framework to hook into media descriptor without creating a new VLCMedia object. */ }; -struct libvlc_tag_query_t -{ - struct libvlc_instance_t *p_libvlc_instance; /* Parent instance */ - int i_refcount; - libvlc_tag_t tag; - char * psz_tag_key; -}; - struct libvlc_media_list_t { libvlc_event_manager_t * p_event_manager; libvlc_instance_t * p_libvlc_instance; int i_refcount; vlc_mutex_t object_lock; - libvlc_media_descriptor_t * p_md; /* The media_descriptor from which the + libvlc_media_t * p_md; /* The media from which the * mlist comes, if any. */ vlc_array_t items; @@ -121,7 +101,7 @@ struct libvlc_media_list_t /* This indicates if this media list is read-only * from a user point of view */ - vlc_bool_t b_read_only; + bool b_read_only; }; typedef libvlc_media_list_view_t * (*libvlc_media_list_view_constructor_func_t)( libvlc_media_list_t * p_mlist, libvlc_exception_t * p_e ) ; @@ -130,7 +110,7 @@ typedef void (*libvlc_media_list_view_release_func_t)( libvlc_media_list_view_t typedef int (*libvlc_media_list_view_count_func_t)( libvlc_media_list_view_t * p_mlv, libvlc_exception_t * ) ; -typedef libvlc_media_descriptor_t * +typedef libvlc_media_t * (*libvlc_media_list_view_item_at_index_func_t)( libvlc_media_list_view_t * p_mlv, int index, @@ -167,30 +147,17 @@ struct libvlc_media_list_view_t void (*pf_ml_item_removed)(const libvlc_event_t *, libvlc_media_list_view_t *); }; -struct libvlc_dynamic_media_list_t -{ - libvlc_instance_t * p_libvlc_instance; - int i_refcount; - libvlc_media_list_t * p_media_provider; - libvlc_tag_query_t * p_query; - char * psz_tag_key; - libvlc_tag_t tag; - struct libvlc_media_list_t * p_mlist; - struct libvlc_media_list_t * p_provider; -}; - -struct libvlc_media_instance_t +struct libvlc_media_player_t { int i_refcount; vlc_mutex_t object_lock; - int i_input_id; /* Input object id. We don't use a pointer to - avoid any crash */ + input_thread_t * p_input_thread; struct libvlc_instance_t * p_libvlc_instance; /* Parent instance */ - libvlc_media_descriptor_t * p_md; /* current media descriptor */ + libvlc_media_t * p_md; /* current media descriptor */ libvlc_event_manager_t * p_event_manager; libvlc_drawable_t drawable; - vlc_bool_t b_own_its_input_thread; + bool b_own_its_input_thread; }; struct libvlc_media_list_player_t @@ -200,9 +167,9 @@ struct libvlc_media_list_player_t int i_refcount; vlc_mutex_t object_lock; libvlc_media_list_path_t current_playing_item_path; - libvlc_media_descriptor_t * p_current_playing_item; + libvlc_media_t * p_current_playing_item; libvlc_media_list_t * p_mlist; - libvlc_media_instance_t * p_mi; + libvlc_media_player_t * p_mi; }; struct libvlc_media_library_t @@ -219,7 +186,7 @@ struct libvlc_media_discoverer_t libvlc_instance_t * p_libvlc_instance; services_discovery_t * p_sd; libvlc_media_list_t * p_mlist; - vlc_bool_t running; + bool running; vlc_dictionary_t catname_to_submedialist; }; @@ -272,14 +239,15 @@ typedef struct libvlc_event_listener_t typedef struct libvlc_event_listeners_group_t { libvlc_event_type_t event_type; - DECL_ARRAY(libvlc_event_listener_t *) listeners; + vlc_array_t listeners; + bool b_sublistener_removed; } libvlc_event_listeners_group_t; typedef struct libvlc_event_manager_t { void * p_obj; struct libvlc_instance_t * p_libvlc_instance; - DECL_ARRAY(libvlc_event_listeners_group_t *) listeners_groups; + vlc_array_t listeners_groups; vlc_mutex_t object_lock; vlc_mutex_t event_sending_lock; } libvlc_event_sender_t; @@ -288,79 +256,91 @@ typedef struct libvlc_event_manager_t /*************************************************************************** * Other internal functions ***************************************************************************/ -VLC_EXPORT (input_thread_t *, libvlc_get_input_thread, - ( struct libvlc_media_instance_t *, libvlc_exception_t * ) ); +input_thread_t *libvlc_get_input_thread( + libvlc_media_player_t *, + libvlc_exception_t * ); /* Media instance */ -VLC_EXPORT (libvlc_media_instance_t *, libvlc_media_instance_new_from_input_thread, - ( struct libvlc_instance_t *, input_thread_t *, libvlc_exception_t * ) ); +libvlc_media_player_t * +libvlc_media_player_new_from_input_thread( libvlc_instance_t *, + input_thread_t *, + libvlc_exception_t * ); -VLC_EXPORT (void, libvlc_media_instance_destroy, - ( libvlc_media_instance_t * ) ); +void libvlc_media_player_destroy( + libvlc_media_player_t * ); /* Media Descriptor */ -VLC_EXPORT (libvlc_media_descriptor_t *, libvlc_media_descriptor_new_from_input_item, - ( struct libvlc_instance_t *, input_item_t *, libvlc_exception_t * ) ); +libvlc_media_t * libvlc_media_new_from_input_item( + libvlc_instance_t *, input_item_t *, + libvlc_exception_t * ); -VLC_EXPORT (void, libvlc_media_descriptor_set_state, - ( libvlc_media_descriptor_t *, libvlc_state_t, libvlc_exception_t * ) ); +void libvlc_media_set_state( + libvlc_media_t *, libvlc_state_t, + libvlc_exception_t * ); /* Media List */ -VLC_EXPORT ( void, _libvlc_media_list_add_media_descriptor, - ( libvlc_media_list_t * p_mlist, - libvlc_media_descriptor_t * p_md, - libvlc_exception_t * p_e ) ); - -VLC_EXPORT ( void, _libvlc_media_list_insert_media_descriptor, - ( libvlc_media_list_t * p_mlist, - libvlc_media_descriptor_t * p_md, - int index, - libvlc_exception_t * p_e ) ); - -VLC_EXPORT ( void, _libvlc_media_list_remove_index, - ( libvlc_media_list_t * p_mlist, - int index, - libvlc_exception_t * p_e ) ); +void _libvlc_media_list_add_media( + libvlc_media_list_t * p_mlist, + libvlc_media_t * p_md, + libvlc_exception_t * p_e ); + +void _libvlc_media_list_insert_media( + libvlc_media_list_t * p_mlist, + libvlc_media_t * p_md, int index, + libvlc_exception_t * p_e ); + +void _libvlc_media_list_remove_index( + libvlc_media_list_t * p_mlist, int index, + libvlc_exception_t * p_e ); /* Media List View */ -VLC_EXPORT ( libvlc_media_list_view_t *, libvlc_media_list_view_new, - ( libvlc_media_list_t * p_mlist, - libvlc_media_list_view_count_func_t pf_count, - libvlc_media_list_view_item_at_index_func_t pf_item_at_index, - libvlc_media_list_view_children_at_index_func_t pf_children_at_index, - libvlc_media_list_view_constructor_func_t pf_constructor, - libvlc_media_list_view_release_func_t pf_release, - void * this_view_data, - libvlc_exception_t * p_e ) ); - -VLC_EXPORT ( void, libvlc_media_list_view_set_ml_notification_callback, ( - libvlc_media_list_view_t * p_mlv, - void (*item_added)(const libvlc_event_t *, libvlc_media_list_view_t *), - void (*item_removed)(const libvlc_event_t *, libvlc_media_list_view_t *) )); - -VLC_EXPORT ( void, libvlc_media_list_view_will_delete_item, ( libvlc_media_list_view_t * p_mlv, - libvlc_media_descriptor_t * p_item, - int index )); -VLC_EXPORT ( void, libvlc_media_list_view_item_deleted, ( libvlc_media_list_view_t * p_mlv, - libvlc_media_descriptor_t * p_item, - int index )); -VLC_EXPORT ( void, libvlc_media_list_view_will_add_item, ( libvlc_media_list_view_t * p_mlv, - libvlc_media_descriptor_t * p_item, - int index )); -VLC_EXPORT ( void, libvlc_media_list_view_item_added, ( libvlc_media_list_view_t * p_mlv, - libvlc_media_descriptor_t * p_item, - int index )); +libvlc_media_list_view_t * libvlc_media_list_view_new( + libvlc_media_list_t * p_mlist, + libvlc_media_list_view_count_func_t pf_count, + libvlc_media_list_view_item_at_index_func_t pf_item_at_index, + libvlc_media_list_view_children_at_index_func_t pf_children_at_index, + libvlc_media_list_view_constructor_func_t pf_constructor, + libvlc_media_list_view_release_func_t pf_release, + void * this_view_data, + libvlc_exception_t * p_e ); + +void libvlc_media_list_view_set_ml_notification_callback( + libvlc_media_list_view_t * p_mlv, + void (*item_added)(const libvlc_event_t *, libvlc_media_list_view_t *), + void (*item_removed)(const libvlc_event_t *, libvlc_media_list_view_t *) ); + +void libvlc_media_list_view_will_delete_item( + libvlc_media_list_view_t * p_mlv, + libvlc_media_t * p_item, int index ); + +void libvlc_media_list_view_item_deleted( + libvlc_media_list_view_t * p_mlv, + libvlc_media_t * p_item, int index ); + +void libvlc_media_list_view_will_add_item ( + libvlc_media_list_view_t * p_mlv, + libvlc_media_t * p_item, int index ); + +void libvlc_media_list_view_item_added( + libvlc_media_list_view_t * p_mlv, + libvlc_media_t * p_item, int index ); /* Events */ -VLC_EXPORT (libvlc_event_manager_t *, libvlc_event_manager_new, ( void * p_obj, libvlc_instance_t * p_libvlc_inst, libvlc_exception_t *p_e ) ); +libvlc_event_manager_t * libvlc_event_manager_new( + void * p_obj, libvlc_instance_t * p_libvlc_inst, + libvlc_exception_t *p_e ); -VLC_EXPORT (void, libvlc_event_manager_release, ( libvlc_event_manager_t * p_em ) ); +void libvlc_event_manager_release( + libvlc_event_manager_t * p_em ); -VLC_EXPORT (void, libvlc_event_manager_register_event_type, ( libvlc_event_manager_t * p_em, libvlc_event_type_t event_type, libvlc_exception_t * p_e ) ); -VLC_EXPORT (void, libvlc_event_detach_lock_state, ( libvlc_event_manager_t *p_event_manager, libvlc_event_type_t event_type, libvlc_callback_t pf_callback, - void *p_user_data, libvlc_lock_state_t lockstate, libvlc_exception_t *p_e ) ); +void libvlc_event_manager_register_event_type( + libvlc_event_manager_t * p_em, + libvlc_event_type_t event_type, + libvlc_exception_t * p_e ); -VLC_EXPORT (void, libvlc_event_send, ( libvlc_event_manager_t * p_em, libvlc_event_t * p_event ) ); +void libvlc_event_send( + libvlc_event_manager_t * p_em, + libvlc_event_t * p_event ); /* Exception shorcuts */