X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcontrol%2Flibvlc_internal.h;h=79d230e26c7ac8439a011b1472af5eaf007791e0;hb=d71d800d9d311531a566399bd6b33f9bff9c8a4a;hp=d382fe185fd3451094b4f889cdb2f4e80433be5a;hpb=a1eb826dcd331dd41cba9b06008beb813212ba9a;p=vlc diff --git a/src/control/libvlc_internal.h b/src/control/libvlc_internal.h index d382fe185f..79d230e26c 100644 --- a/src/control/libvlc_internal.h +++ b/src/control/libvlc_internal.h @@ -25,21 +25,21 @@ #ifndef _LIBVLC_INTERNAL_H #define _LIBVLC_INTERNAL_H 1 -# ifdef __cplusplus -extern "C" { -# endif - #include #include #include #include - + +# ifdef __cplusplus +extern "C" { +# endif + /*************************************************************************** * Internal creation and destruction functions ***************************************************************************/ VLC_EXPORT (libvlc_int_t *, libvlc_InternalCreate, ( void ) ); -VLC_EXPORT (int, libvlc_InternalInit, ( libvlc_int_t *, int, char *ppsz_argv[] ) ); +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 ) ); @@ -47,46 +47,125 @@ VLC_EXPORT (int, libvlc_InternalAddIntf, ( libvlc_int_t *, const char *, vlc_boo 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 *, libvlc_exception_t * ) ); +VLC_EXPORT (void, libvlc_event_fini, ( libvlc_instance_t * ) ); + /*************************************************************************** * Opaque structures for libvlc API ***************************************************************************/ +typedef int * libvlc_media_list_path_t; /* (Media List Player Internal) */ + +typedef enum libvlc_lock_state_t +{ + libvlc_Locked, + libvlc_UnLocked +} libvlc_lock_state_t; + struct libvlc_instance_t { libvlc_int_t *p_libvlc_int; vlm_t *p_vlm; int b_playlist_locked; + unsigned ref_count; vlc_mutex_t instance_lock; vlc_mutex_t event_callback_lock; 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 { + 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 */ + 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_list_t * p_media_provider; /* For dynamic sublist */ - libvlc_tag_query_t * p_query; /* For dynamic sublist */ - DECL_ARRAY(void *) items; + 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 + * mlist comes, if any. */ + vlc_array_t items; + + /* Other way to see that media list */ + /* Used in flat_media_list.c */ + libvlc_media_list_t * p_flat_mlist; +}; + +typedef void (*libvlc_media_list_view_release_func_t)( libvlc_media_list_view_t * p_mlv ) ; + +typedef int (*libvlc_media_list_view_count_func_t)( libvlc_media_list_view_t * p_mlv, + libvlc_exception_t * ) ; + +typedef libvlc_media_descriptor_t * + (*libvlc_media_list_view_item_at_index_func_t)( + libvlc_media_list_view_t * p_mlv, + int index, + libvlc_exception_t * ) ; + +typedef libvlc_media_list_view_t * + (*libvlc_media_list_view_children_at_index_func_t)( + libvlc_media_list_view_t * p_mlv, + int index, + libvlc_exception_t * ) ; + +/* A way to see a media list */ +struct libvlc_media_list_view_t +{ + libvlc_event_manager_t * p_event_manager; + libvlc_instance_t * p_libvlc_instance; + int i_refcount; + vlc_mutex_t object_lock; + + libvlc_media_list_t * p_mlist; + + struct libvlc_media_list_view_private_t * p_this_view_data; + + /* Accessors */ + 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_release_func_t pf_release; + + /* Notification callback */ + void (*pf_ml_item_added)(const libvlc_event_t *, void *); + void (*pf_ml_item_removed)(const libvlc_event_t *, void *); +}; + +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 @@ -99,23 +178,39 @@ struct libvlc_media_instance_t libvlc_media_descriptor_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; }; struct libvlc_media_list_player_t +{ + libvlc_event_manager_t * p_event_manager; + libvlc_instance_t * p_libvlc_instance; + 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_list_t * p_mlist; + libvlc_media_instance_t * p_mi; +}; + +struct libvlc_media_library_t { libvlc_event_manager_t * p_event_manager; libvlc_instance_t * p_libvlc_instance; int i_refcount; - vlc_mutex_t object_lock; - int i_current_playing_index; - libvlc_media_descriptor_t * p_current_playing_item; libvlc_media_list_t * p_mlist; - libvlc_media_instance_t * p_mi; }; +struct libvlc_media_discoverer_t +{ + libvlc_event_manager_t * p_event_manager; + libvlc_instance_t * p_libvlc_instance; + services_discovery_t * p_sd; + libvlc_media_list_t * p_mlist; +}; - -/* +/* * Event Handling */ /* Example usage @@ -172,6 +267,8 @@ 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_mutex_t object_lock; + vlc_mutex_t event_sending_lock; } libvlc_event_sender_t; @@ -195,16 +292,29 @@ VLC_EXPORT (libvlc_media_descriptor_t *, libvlc_media_descriptor_new_from_input_ VLC_EXPORT (libvlc_media_descriptor_t *, libvlc_media_descriptor_duplicate, ( libvlc_media_descriptor_t * ) ); -/* Events */ -VLC_EXPORT (void, libvlc_event_init, ( libvlc_instance_t *p_instance, libvlc_exception_t *p_e ) ); - -VLC_EXPORT (void, libvlc_event_fini, ( libvlc_instance_t *p_instance, 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_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 *, void *), + void (*item_removed)(const libvlc_event_t *, void *) )); +/* 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 ) ); VLC_EXPORT (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 ) ); VLC_EXPORT (void, libvlc_event_send, ( libvlc_event_manager_t * p_em, libvlc_event_t * p_event ) );