X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Flibvlc.h;h=6cd9a0d93f9740e10fc24b84298fd41a2fba9935;hb=43b5fcef1b26f16914028b5954a846aff685c881;hp=936b75c1e06ed95aa08584703756c0077131638e;hpb=65892ac8249cd60f0f2ae25e138a76c76436e9e3;p=vlc diff --git a/src/libvlc.h b/src/libvlc.h index 936b75c1e0..6cd9a0d93f 100644 --- a/src/libvlc.h +++ b/src/libvlc.h @@ -25,6 +25,8 @@ #ifndef LIBVLC_LIBVLC_H # define LIBVLC_LIBVLC_H 1 +typedef struct variable_t variable_t; + extern const char vlc_usage[]; /* Hotkey stuff */ @@ -45,11 +47,19 @@ void system_End ( libvlc_int_t * ); */ int vlc_threads_init( void ); void vlc_threads_end( void ); -vlc_object_t *vlc_threadobj (void); -#ifdef LIBVLC_REFCHECK -void vlc_refcheck (vlc_object_t *obj); + +/* Hopefully, no need to export this. There is a new thread API instead. */ +void vlc_thread_cancel (vlc_object_t *); +int vlc_object_waitpipe (vlc_object_t *obj); + +void vlc_trace (const char *fn, const char *file, unsigned line); +#define vlc_backtrace() vlc_trace(__func__, __FILE__, __LINE__) + +#if defined (LIBVLC_USE_PTHREAD) && !defined (NDEBUG) +# define vlc_assert_locked( m ) \ + assert (pthread_mutex_lock (m) == EDEADLK) #else -# define vlc_refcheck( obj ) (void)0 +# define vlc_assert_locked( m ) (void)m #endif /* @@ -97,28 +107,15 @@ void msg_Flush (libvlc_int_t *); void msg_Destroy (libvlc_int_t *); /** Internal message stack context */ -typedef struct -{ - int i_code; - char * psz_message; -} msg_context_t; - void msg_StackSet ( int, const char*, ... ); void msg_StackAdd ( const char*, ... ); const char* msg_StackMsg ( 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; void msg_StackDestroy (void *); /* * Unicode stuff */ char *vlc_fix_readdir (const char *); -bool vlc_current_charset (char **); /* * LibVLC objects stuff @@ -139,35 +136,27 @@ bool vlc_current_charset (char **); * @return the created object, or NULL. */ extern void * -vlc_custom_create (vlc_object_t *p_this, size_t i_size, int i_type, - const char *psz_type); +__vlc_custom_create (vlc_object_t *p_this, size_t i_size, int i_type, + const char *psz_type); +#define vlc_custom_create(o, s, t, n) \ + __vlc_custom_create(VLC_OBJECT(o), s, t, n) + /** - * libvlc_global_data_t (global variable) - * - * 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. + * The module bank */ -typedef struct libvlc_global_data_t -{ - VLC_COMMON_MEMBERS - - /* Object structure data */ - int i_counter; ///< object counter - - module_bank_t * p_module_bank; ///< The module bank +extern module_bank_t *p_module_bank; - char * psz_vlcpath; -} libvlc_global_data_t; +extern char *psz_vlcpath; - -libvlc_global_data_t *vlc_global (void); +#ifdef LIBVLC_USE_PTHREAD +# include /* TODO: get rid of vlc_thread_ready and this */ +#endif /** * Private LibVLC data for each object. */ -struct vlc_object_internals_t +typedef struct vlc_object_internals_t { /* Object variables */ variable_t * p_vars; @@ -177,8 +166,15 @@ struct vlc_object_internals_t /* Thread properties, if any */ vlc_thread_t thread_id; bool b_thread; +#ifdef LIBVLC_USE_PTHREAD + sem_t thread_ready; +#elif defined (WIN32) + HANDLE thread_ready; +#endif /* Objects thread synchronization */ + vlc_mutex_t lock; + vlc_cond_t wait; int pipes[2]; vlc_spinlock_t spin; @@ -186,15 +182,12 @@ struct vlc_object_internals_t vlc_spinlock_t ref_spin; unsigned i_refcount; vlc_destructor_t pf_destructor; -#ifndef LIBVLC_REFCHECK - vlc_thread_t creator_id; -#endif /* Objects tree structure */ vlc_object_t *prev, *next; vlc_object_t **pp_children; int i_children; -}; +} vlc_object_internals_t; #define ZOOM_SECTION N_("Zoom") #define ZOOM_QUARTER_KEY_TEXT N_("1:4 Quarter") @@ -204,24 +197,27 @@ struct vlc_object_internals_t #define vlc_internals( obj ) (((vlc_object_internals_t*)(VLC_OBJECT(obj)))-1) +typedef struct sap_handler_t sap_handler_t; + /** * Private LibVLC instance data. */ typedef struct libvlc_priv_t { + libvlc_int_t public_data; + /* Configuration */ vlc_mutex_t config_lock; ///< config file lock char * psz_configfile; ///< location of config file - /* 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? + vlc_dictionary_t msg_enabled_objects; ///< Enabled objects + bool msg_all_objects_enabled; ///< Should we print all objects? /* Timer stats */ vlc_mutex_t timer_lock; ///< Lock to protect timers @@ -232,21 +228,25 @@ typedef struct libvlc_priv_t void *p_stats_computer; ///< Input thread computing stats /// (needs cleanup) + /* Singleton objects */ module_t *p_memcpy_module; ///< Fast memcpy plugin used playlist_t *p_playlist; //< the playlist singleton vlm_t *p_vlm; ///< the VLM singleton (or NULL) - vlc_object_t *p_interaction; ///< interface interaction object + interaction_t *p_interaction; ///< interface interaction object httpd_t *p_httpd; ///< HTTP daemon (src/network/httpd.c) - - /* Private playlist data (FIXME - playlist_t is too public...) */ - sout_instance_t *p_sout; ///< kept sout instance (for playlist) +#ifdef ENABLE_SOUT + sap_handler_t *p_sap; ///< SAP SDP advertiser +#endif + vlc_mutex_t structure_lock; } libvlc_priv_t; static inline libvlc_priv_t *libvlc_priv (libvlc_int_t *libvlc) { - return (libvlc_priv_t *)(libvlc + 1); + return (libvlc_priv_t *)libvlc; } +void playlist_ServicesDiscoveryKillAll( playlist_t *p_playlist ); + #define libvlc_stats( o ) (libvlc_priv((VLC_OBJECT(o))->p_libvlc)->b_stats) /**