X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Flibvlc.h;h=b743776c0157d6c2591e196fa0c62a7f168d5e29;hb=d6c0f2425e0e646c12da16b13e9d972c8174f4d6;hp=e9ec933cd8223153bf83ba1aab817afecb22633a;hpb=33112b7797ba051e389d5c91a4a2e807d0e2c55c;p=vlc diff --git a/src/libvlc.h b/src/libvlc.h index e9ec933cd8..b743776c01 100644 --- a/src/libvlc.h +++ b/src/libvlc.h @@ -52,6 +52,10 @@ void vlc_refcheck (vlc_object_t *obj); # define vlc_refcheck( obj ) (void)0 #endif +/* Hopefully, no need to export this. There is a new thread API instead. */ +void vlc_thread_cancel (vlc_object_t *); + + /* * CPU capabilities */ @@ -154,9 +158,6 @@ 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 char * psz_vlcpath; @@ -207,16 +208,6 @@ 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. */ @@ -256,11 +247,6 @@ typedef struct libvlc_priv_t /* 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; } libvlc_priv_t; static inline libvlc_priv_t *libvlc_priv (libvlc_int_t *libvlc)