X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcontrol%2Flibvlc_internal.h;h=7ab347d7aefd415eeeafabe49cf79acf8f94ae56;hb=2f63e68b447e5b2484954f60b90d430afd887b98;hp=bbee575a4e43ccda6e9329636c320ed9a1f9d3b6;hpb=bfdc79f153eae0e3b59c434ea639f09a28f430d7;p=vlc diff --git a/src/control/libvlc_internal.h b/src/control/libvlc_internal.h index bbee575a4e..7ab347d7ae 100644 --- a/src/control/libvlc_internal.h +++ b/src/control/libvlc_internal.h @@ -2,8 +2,8 @@ * libvlc_internal.h : Definition of opaque structures for libvlc exported API * Also contains some internal utility functions ***************************************************************************** - * Copyright (C) 2005 the VideoLAN team - * $Id: control_structures.h 13752 2005-12-15 10:14:42Z oaubert $ + * Copyright (C) 2005-2009 the VideoLAN team + * $Id$ * * Authors: Clément Stenac * @@ -25,258 +25,92 @@ #ifndef _LIBVLC_INTERNAL_H #define _LIBVLC_INTERNAL_H 1 -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include +#include +#include +#include -#include -#include +#include -# ifdef __cplusplus -extern "C" { -# endif +/* Note well: this header is included from LibVLC core. + * Therefore, static inline functions MUST NOT call LibVLC functions here + * (this can cause linkage failure on some platforms). */ /*************************************************************************** * 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 * ) ); +typedef void (*libvlc_vlm_release_func_t)( 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 +typedef struct libvlc_vlm_t { - libvlc_Locked, - libvlc_UnLocked -} libvlc_lock_state_t; + vlm_t *p_vlm; + libvlc_event_manager_t *p_event_manager; + libvlc_vlm_release_func_t pf_release; +} libvlc_vlm_t; struct libvlc_instance_t { libvlc_int_t *p_libvlc_int; - vlm_t *p_vlm; - int b_playlist_locked; + libvlc_vlm_t libvlc_vlm; + unsigned ref_count; + int verbosity; 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 */ -}; - -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 - * mlist comes, if any. */ - DECL_ARRAY(void *) items; - - /* Other way to see that media list */ - /* Used in flat_media_list.c */ - libvlc_media_list_t * p_flat_mlist; -}; - -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 -{ - 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 */ - struct libvlc_instance_t * p_libvlc_instance; /* Parent instance */ - libvlc_media_descriptor_t * p_md; /* current media descriptor */ - libvlc_event_manager_t * p_event_manager; - libvlc_drawable_t drawable; -}; - -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; - libvlc_media_list_t * p_mlist; -}; - -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 - * - * struct libvlc_cool_object_t - * { - * ... - * libvlc_event_manager_t * p_event_manager; - * ... - * } - * - * libvlc_my_cool_object_new() - * { - * ... - * p_self->p_event_manager = libvlc_event_manager_init( p_self, - * p_self->p_libvlc_instance, p_e); - * libvlc_event_manager_register_event_type(p_self->p_event_manager, - * libvlc_MyCoolObjectDidSomething, p_e) - * ... - * } - * - * libvlc_my_cool_object_release() - * { - * ... - * libvlc_event_manager_release( p_self->p_event_manager ); - * ... - * } - * - * libvlc_my_cool_object_do_something() - * { - * ... - * libvlc_event_t event; - * event.type = libvlc_MyCoolObjectDidSomething; - * event.u.my_cool_object_did_something.what_it_did = kSomething; - * libvlc_event_send( p_self->p_event_manager, &event ); - * } - * */ - -typedef struct libvlc_event_listener_t -{ - libvlc_event_type_t event_type; - void * p_user_data; - libvlc_callback_t pf_callback; -} libvlc_event_listener_t; - -typedef struct libvlc_event_listeners_group_t -{ - libvlc_event_type_t event_type; - DECL_ARRAY(libvlc_event_listener_t *) listeners; -} 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_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 * ) ); - -/* 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 * ) ); - -VLC_EXPORT (void, libvlc_media_instance_destroy, - ( libvlc_media_instance_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 * ) ); - -VLC_EXPORT (libvlc_media_descriptor_t *, libvlc_media_descriptor_duplicate, - ( libvlc_media_descriptor_t * ) ); -/* Media List */ -VLC_EXPORT ( void, libvlc_media_list_flat_media_list_release, ( libvlc_media_list_t * ) ); +/* Thread context */ +void libvlc_init_threads (void); +void libvlc_deinit_threads (void); /* 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 ); -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 ); -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_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_attach_async( libvlc_event_manager_t * p_event_manager, + libvlc_event_type_t event_type, + libvlc_callback_t pf_callback, + void *p_user_data ); -VLC_EXPORT (void, libvlc_event_send, ( libvlc_event_manager_t * p_em, libvlc_event_t * p_event ) ); - - -/* 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; } +static inline libvlc_time_t from_mtime(mtime_t time) +{ + return (time + 500ULL)/ 1000ULL; +} -# ifdef __cplusplus +static inline mtime_t to_mtime(libvlc_time_t time) +{ + return time * 1000ULL; } -# endif #endif