X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Flibvlc.h;h=0c7c295846dae957ed6b845bc2052e32c47d6d63;hb=a46fb0e4e14d971e7482b010bb42c6bc93df66f7;hp=9160eb7f6f340b2131f458305337dcd8a59ea2ee;hpb=523ef308d2bff928d1246e968003a3ff429890db;p=vlc diff --git a/src/libvlc.h b/src/libvlc.h index 9160eb7f6f..0c7c295846 100644 --- a/src/libvlc.h +++ b/src/libvlc.h @@ -46,7 +46,7 @@ void system_End ( libvlc_int_t * ); int vlc_threads_init( void ); void vlc_threads_end( void ); vlc_object_t *vlc_threadobj (void); -#ifndef NDEBUG +#ifdef LIBVLC_REFCHECK void vlc_refcheck (vlc_object_t *obj); #else # define vlc_refcheck( obj ) (void)0 @@ -118,7 +118,6 @@ void msg_StackDestroy (void *); * Unicode stuff */ char *vlc_fix_readdir (const char *); -bool vlc_current_charset (char **); /* * LibVLC objects stuff @@ -139,8 +138,10 @@ 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) @@ -163,7 +164,6 @@ typedef struct 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 object. @@ -180,6 +180,8 @@ struct vlc_object_internals_t bool b_thread; /* Objects thread synchronization */ + vlc_mutex_t lock; + vlc_cond_t wait; int pipes[2]; vlc_spinlock_t spin; @@ -187,6 +189,9 @@ 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; @@ -202,6 +207,16 @@ struct vlc_object_internals_t #define vlc_internals( obj ) (((vlc_object_internals_t*)(VLC_OBJECT(obj)))-1) +/* Signal an object without checking for locking consistency. This is wrong. */ +#ifdef __GNUC__ +__attribute__((deprecated)) +#endif +static inline void +vlc_object_signal_maybe (vlc_object_t *p_this) +{ + vlc_cond_signal (&(vlc_internals(p_this)->wait)); +} + /** * Private LibVLC instance data. */ @@ -230,11 +245,24 @@ 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) + + /* Thread support */ + unsigned threads_count; + vlc_mutex_t threads_lock; + vlc_cond_t threads_wait; + +#ifdef WIN32 + vlc_object_t *ipc_helper; +#endif } libvlc_priv_t; static inline libvlc_priv_t *libvlc_priv (libvlc_int_t *libvlc) @@ -242,6 +270,8 @@ static inline libvlc_priv_t *libvlc_priv (libvlc_int_t *libvlc) return (libvlc_priv_t *)(libvlc + 1); } +void playlist_ServicesDiscoveryKillAll( playlist_t *p_playlist ); + #define libvlc_stats( o ) (libvlc_priv((VLC_OBJECT(o))->p_libvlc)->b_stats) /**