X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcontrol%2Flibvlc_internal.h;h=2fcc51b9398420988cfc2984e92d8a853017c788;hb=5f62f401a2be8a45f119925dbbd241c48bab5da9;hp=d5f1d5166395cdff15151dc3a6366131ef623685;hpb=48586f51f89bd34422d50520fffea10f0f1ba402;p=vlc diff --git a/src/control/libvlc_internal.h b/src/control/libvlc_internal.h index d5f1d51663..2fcc51b939 100644 --- a/src/control/libvlc_internal.h +++ b/src/control/libvlc_internal.h @@ -3,7 +3,7 @@ * Also contains some internal utility functions ***************************************************************************** * Copyright (C) 2005 the VideoLAN team - * $Id: control_structures.h 13752 2005-12-15 10:14:42Z oaubert $ + * $Id$ * * Authors: Clément Stenac * @@ -25,128 +25,149 @@ #ifndef _LIBVLC_INTERNAL_H #define _LIBVLC_INTERNAL_H 1 +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include #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_InternalCleanup, ( libvlc_int_t * ) ); -VLC_EXPORT (int, libvlc_InternalDestroy, ( libvlc_int_t *, vlc_bool_t ) ); +VLC_EXPORT (int, libvlc_InternalInit, ( libvlc_int_t *, int, const char *ppsz_argv[] ) ); +VLC_EXPORT (void, libvlc_InternalCleanup, ( libvlc_int_t * ) ); +VLC_EXPORT (void, libvlc_InternalDestroy, ( libvlc_int_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 *, libvlc_exception_t * ) ); +VLC_EXPORT (int, libvlc_InternalAddIntf, ( libvlc_int_t *, const char * ) ); +VLC_EXPORT (void, libvlc_InternalWait, ( libvlc_int_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 +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 */ -}; - -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_tree_t -{ - libvlc_event_manager_t * p_event_manager; - int i_refcount; - void * p_item; /* For dynamic sublist */ - libvlc_retain_function pf_item_retain; - libvlc_release_function pf_item_release; - DECL_ARRAY(struct libvlc_tree_t *) subtrees; /* For dynamic sublist */ + void *p_user_data; /* Allows for VLC.framework to hook into media descriptor without creating a new VLCMedia object. */ }; 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; - char * psz_name; /* Usually NULL */ - 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_t * p_md; /* The media 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; + libvlc_media_list_t * p_flat_mlist; + + /* This indicates if this media list is read-only + * from a user point of view */ + bool b_read_only; }; -struct libvlc_dynamic_media_list_t +typedef libvlc_media_list_view_t * (*libvlc_media_list_view_constructor_func_t)( libvlc_media_list_t * p_mlist, libvlc_exception_t * p_e ) ; +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_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_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; + 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_constructor_func_t pf_constructor; + libvlc_media_list_view_release_func_t pf_release; + + /* Notification callback */ + void (*pf_ml_item_added)(const libvlc_event_t *, libvlc_media_list_view_t *); + void (*pf_ml_item_removed)(const libvlc_event_t *, libvlc_media_list_view_t *); }; -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; + + bool 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; - 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; + 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_t * p_current_playing_item; + libvlc_media_list_t * p_mlist; + libvlc_media_player_t * p_mi; }; struct libvlc_media_library_t @@ -155,7 +176,6 @@ struct libvlc_media_library_t libvlc_instance_t * p_libvlc_instance; int i_refcount; libvlc_media_list_t * p_mlist; - libvlc_tree_t * p_playlists_tree; }; struct libvlc_media_discoverer_t @@ -164,9 +184,11 @@ struct libvlc_media_discoverer_t libvlc_instance_t * p_libvlc_instance; services_discovery_t * p_sd; libvlc_media_list_t * p_mlist; + bool running; + vlc_dictionary_t catname_to_submedialist; }; -/* +/* * Event Handling */ /* Example usage @@ -181,7 +203,7 @@ struct libvlc_media_discoverer_t * libvlc_my_cool_object_new() * { * ... - * p_self->p_event_manager = libvlc_event_manager_init( p_self, + * p_self->p_event_manager = libvlc_event_manager_new( p_self, * p_self->p_libvlc_instance, p_e); * libvlc_event_manager_register_event_type(p_self->p_event_manager, * libvlc_MyCoolObjectDidSomething, p_e) @@ -215,66 +237,123 @@ 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; /*************************************************************************** * 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 (libvlc_media_descriptor_t *, libvlc_media_descriptor_duplicate, - ( libvlc_media_descriptor_t * ) ); +void libvlc_media_set_state( + libvlc_media_t *, libvlc_state_t, + libvlc_exception_t * ); /* Media List */ -VLC_EXPORT ( void, libvlc_media_list_flat_media_list_release, - ( libvlc_media_list_t * ) ); +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 */ +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 (void, libvlc_event_init, ( libvlc_instance_t *p_instance, 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_fini, ( libvlc_instance_t *p_instance, libvlc_exception_t *p_e ) ); +void libvlc_event_manager_release( + libvlc_event_manager_t * p_em ); -VLC_EXPORT (libvlc_event_manager_t *, libvlc_event_manager_new, ( void * p_obj, libvlc_instance_t * p_libvlc_inst, 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_manager_release, ( libvlc_event_manager_t * p_em ) ); +void libvlc_event_send( + libvlc_event_manager_t * p_em, + libvlc_event_t * p_event ); -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_send, ( libvlc_event_manager_t * p_em, libvlc_event_t * p_event ) ); +/* Media player - audio, video */ +libvlc_track_description_t * libvlc_get_track_description( + libvlc_media_player_t *p_mi, + const char *psz_variable, + libvlc_exception_t *p_e ); /* Exception shorcuts */ -#define RAISENULL( psz,a... ) { libvlc_exception_raise( p_e, psz,##a ); \ - return NULL; } -#define RAISEVOID( psz,a... ) { libvlc_exception_raise( p_e, psz,##a ); \ - return; } -#define RAISEZERO( psz,a... ) { libvlc_exception_raise( p_e, psz,##a ); \ - return 0; } - -# ifdef __cplusplus -} -# endif +#define RAISENULL( ... ) { libvlc_exception_raise( p_e, __VA_ARGS__ ); \ + return NULL; } +#define RAISEVOID( ... ) { libvlc_exception_raise( p_e, __VA_ARGS__ ); \ + return; } +#define RAISEZERO( ... ) { libvlc_exception_raise( p_e, __VA_ARGS__ ); \ + return 0; } #endif