X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Flibvlc.h;h=f2466d52a4d187ac864d9707de3d6288858da337;hb=75c438d3302e2a816a473576a35e17989d05a42c;hp=da25c7d6a7ffebaa307e5c251875cf24c84f731c;hpb=df61d33b06e2b3cbbe746b2f5a9bea5b370c24ff;p=vlc diff --git a/src/libvlc.h b/src/libvlc.h index da25c7d6a7..f2466d52a4 100644 --- a/src/libvlc.h +++ b/src/libvlc.h @@ -56,8 +56,15 @@ VLC_EXPORT( const char * , system_VLCPath, (void)); /* * Threads subsystem */ -int __vlc_threads_init( vlc_object_t * ); -int __vlc_threads_end( vlc_object_t * ); +int vlc_threads_init( void ); +void vlc_threads_end( void ); + +/** The global thread var for msg stack context + * We store this as a static global variable so we don't need a vlc_object_t + * everywhere. + * This key is created in vlc_threads_init and is therefore ready to use at + * the very beginning of the universe */ +extern vlc_threadvar_t msg_context_global_key; /* * CPU capabilities @@ -65,6 +72,44 @@ int __vlc_threads_end( vlc_object_t * ); extern uint32_t cpu_flags; uint32_t CPUCapabilities( void ); +/* + * Message/logging stuff + */ + +#define NB_QUEUES 2 + +typedef struct msg_queue_t +{ + int i_id; + + /** Message queue lock */ + vlc_mutex_t lock; + bool b_overflow; + + /* Message queue */ + msg_item_t msg[VLC_MSG_QSIZE]; /**< message queue */ + int i_start; + int i_stop; + + /* Subscribers */ + int i_sub; + msg_subscription_t **pp_sub; + + /* Logfile for WinCE */ +#ifdef UNDER_CE + FILE *logfile; +#endif +} msg_queue_t; + +/** + * Store all data requiered by messages interfaces. + */ +typedef struct msg_bank_t +{ + vlc_mutex_t lock; + msg_queue_t queues[NB_QUEUES]; +} msg_bank_t; + /* * Unicode stuff */ @@ -91,48 +136,41 @@ extern void * vlc_custom_create (vlc_object_t *p_this, size_t i_size, int i_type, const char *psz_type); -/***************************************************************************** +/** * libvlc_global_data_t (global variable) - ***************************************************************************** - * This structure has an unique instance, statically allocated in main and - * never accessed from the outside. It stores once-initialized data such as - * the CPU capabilities or the global lock. - *****************************************************************************/ -struct libvlc_global_data_t + * + * This structure has an unique instance, statically allocated in libvlc and + * never accessed from the outside. It stores process-wide VLC variables, + * mostly process-wide locks, and (currently) the module bank and objects tree. + */ +typedef struct libvlc_global_data_t { VLC_COMMON_MEMBERS - bool b_ready; ///< Initialization boolean - /* Object structure data */ int i_counter; ///< object counter int i_objects; ///< Attached objects count vlc_object_t ** pp_objects; ///< Array of all objects module_bank_t * p_module_bank; ///< The module bank - intf_thread_t *p_probe; ///< Devices prober /* Arch-specific variables */ -#if !defined( WIN32 ) - bool b_daemon; -#endif #if defined( SYS_BEOS ) - vlc_object_t * p_appthread; char * psz_vlcpath; #elif defined( __APPLE__ ) char * psz_vlcpath; - vlc_iconv_t iconv_macosx; /* for HFS+ file names */ - vlc_mutex_t iconv_lock; #elif defined( WIN32 ) char * psz_vlcpath; #endif -}; +} libvlc_global_data_t; libvlc_global_data_t *vlc_global (void); libvlc_int_t *vlc_current_object (int i_object); -/* Private LibVLC data for each objects */ +/** + * Private LibVLC data for each object. + */ struct vlc_object_internals_t { /* Object variables */ @@ -142,7 +180,7 @@ struct vlc_object_internals_t /* Thread properties, if any */ vlc_thread_t thread_id; - bool b_thread; + bool b_thread; /* Objects thread synchronization */ int pipes[2]; @@ -151,7 +189,7 @@ struct vlc_object_internals_t /* Objects management */ unsigned i_refcount; vlc_destructor_t pf_destructor; - bool b_attached; + bool b_attached; }; #define ZOOM_SECTION N_("Zoom") @@ -162,9 +200,58 @@ struct vlc_object_internals_t static inline vlc_object_internals_t *vlc_internals( vlc_object_t *obj ) { - return obj->p_internals; + return ((vlc_object_internals_t *)obj) - 1; +} + +/** + * Private LibVLC instance data. + */ +typedef struct libvlc_priv_t +{ + /* Configuration */ + vlc_mutex_t config_lock; ///< config file lock + char * psz_configfile; ///< location of config file + char *psz_configdir; ///< user configuration directory + char *psz_datadir; ///< user data directory + + /* There is no real reason to keep a list of items, but not to break + * everything, let's keep it */ + input_item_array_t input_items; ///< Array of all created input items + int i_last_input_id ; ///< Last id of input item + + /* Messages */ + msg_bank_t msg_bank; ///< The message bank + int i_verbose; ///< info messages + bool b_color; ///< color messages? + + /* Timer stats */ + vlc_mutex_t timer_lock; ///< Lock to protect timers + counter_t **pp_timers; ///< Array of all timers + int i_timers; ///< Number of timers + bool b_stats; ///< Whether to collect stats + + void *p_stats_computer; ///< Input thread computing stats + /// (needs cleanup) + + module_t *p_memcpy_module; ///< Fast memcpy plugin used + vlm_t *p_vlm; ///< VLM if created from libvlc-common.c + vlc_object_t *p_interaction; ///< interface interaction object + httpd_t *p_httpd; ///< HTTP daemon (src/network/httpd.c) +} libvlc_priv_t; + +static inline libvlc_priv_t *libvlc_priv (libvlc_int_t *libvlc) +{ + return (libvlc_priv_t *)(libvlc + 1); } +static inline bool libvlc_stats (vlc_object_t *obj) +{ + return libvlc_priv (obj->p_libvlc)->b_stats; +} + +/** + * LibVLC "main module" configuration settings array. + */ extern module_config_t libvlc_config[]; extern const size_t libvlc_config_count;