void system_Configure ( libvlc_int_t *, int *, const char *[] );
void system_End ( libvlc_int_t * );
+/*
+ * Legacy object stuff that is still used within libvlccore (only)
+ */
+#define vlc_object_signal_unlocked( obj )
+
+vlc_list_t *vlc_list_find( vlc_object_t *, int, int );
+#define VLC_OBJECT_INTF (-4)
+#define VLC_OBJECT_PACKETIZER (-13)
+
/*
* Threads subsystem
*/
/* 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_object_signal_unlocked (vlc_object_t *);
-#define vlc_object_signal_unlocked( obj ) \
- __vlc_object_signal_unlocked( VLC_OBJECT( obj ) )
void vlc_trace (const char *fn, const char *file, unsigned line);
#define vlc_backtrace() vlc_trace(__func__, __FILE__, __LINE__)
/* Return a NULL terminated array with the names of the modules that have a
* certain capability.
* Free after uses both the string and the table. */
-VLC_EXPORT(char **, module_GetModulesNamesForCapability,
- ( const char * psz_capability, char ***psz_longname ) );
-
-#ifdef LIBVLC_USE_PTHREAD
-# include <semaphore.h> /* TODO: get rid of vlc_thread_ready and this */
-#endif
+char **module_GetModulesNamesForCapability (const char * psz_capability,
+ char ***psz_longname);
+module_t *module_find_by_shortcut (const char *psz_shortcut);
/**
* Private LibVLC data for each object.
*/
typedef struct vlc_object_internals_t
{
+ int i_object_type; /* Object type, deprecated */
+
/* Object variables */
variable_t * p_vars;
vlc_mutex_t var_lock;
/* 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;
/* Objects management */
vlc_spinlock_t ref_spin;
typedef struct libvlc_priv_t
{
libvlc_int_t public_data;
+ vlc_cond_t exiting; ///< signaled when VLC wants to exit
/* Configuration */
vlc_mutex_t config_lock; ///< config file lock
int i_timers; ///< Number of timers
bool b_stats; ///< Whether to collect stats
- 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
*/
void var_OptionParse (vlc_object_t *, const char *, bool trusted);
+
+/*
+ * Stats stuff
+ */
+#define stats_Update(a,b,c) __stats_Update( VLC_OBJECT(a), b, c )
+int __stats_Update (vlc_object_t*, counter_t *, vlc_value_t, vlc_value_t *);
+#define stats_CounterCreate(a,b,c) __stats_CounterCreate( VLC_OBJECT(a), b, c )
+counter_t * __stats_CounterCreate (vlc_object_t*, int, int);
+#define stats_Get(a,b,c) __stats_Get( VLC_OBJECT(a), b, c)
+int __stats_Get (vlc_object_t*, counter_t *, vlc_value_t*);
+
+void stats_CounterClean (counter_t * );
+
+#define stats_GetInteger(a,b,c) __stats_GetInteger( VLC_OBJECT(a), b, c )
+static inline int __stats_GetInteger( vlc_object_t *p_obj, counter_t *p_counter,
+ int *value )
+{
+ int i_ret;
+ vlc_value_t val; val.i_int = 0;
+ if( !p_counter ) return VLC_EGENERIC;
+ i_ret = __stats_Get( p_obj, p_counter, &val );
+ *value = val.i_int;
+ return i_ret;
+}
+
+#define stats_GetFloat(a,b,c) __stats_GetFloat( VLC_OBJECT(a), b, c )
+static inline int __stats_GetFloat( vlc_object_t *p_obj, counter_t *p_counter,
+ float *value )
+{
+ int i_ret;
+ vlc_value_t val; val.f_float = 0.0;
+ if( !p_counter ) return VLC_EGENERIC;
+ i_ret = __stats_Get( p_obj, p_counter, &val );
+ *value = val.f_float;
+ return i_ret;
+}
+#define stats_UpdateInteger(a,b,c,d) __stats_UpdateInteger( VLC_OBJECT(a),b,c,d )
+static inline int __stats_UpdateInteger( vlc_object_t *p_obj,counter_t *p_co,
+ int i, int *pi_new )
+{
+ int i_ret;
+ vlc_value_t val;
+ vlc_value_t new_val; new_val.i_int = 0;
+ if( !p_co ) return VLC_EGENERIC;
+ val.i_int = i;
+ i_ret = __stats_Update( p_obj, p_co, val, &new_val );
+ if( pi_new )
+ *pi_new = new_val.i_int;
+ return i_ret;
+}
+#define stats_UpdateFloat(a,b,c,d) __stats_UpdateFloat( VLC_OBJECT(a),b,c,d )
+static inline int __stats_UpdateFloat( vlc_object_t *p_obj, counter_t *p_co,
+ float f, float *pf_new )
+{
+ vlc_value_t val;
+ int i_ret;
+ vlc_value_t new_val;new_val.f_float = 0.0;
+ if( !p_co ) return VLC_EGENERIC;
+ val.f_float = f;
+ i_ret = __stats_Update( p_obj, p_co, val, &new_val );
+ if( pf_new )
+ *pf_new = new_val.f_float;
+ return i_ret;
+}
+
+VLC_EXPORT( void, stats_ComputeInputStats, (input_thread_t*, input_stats_t*) );
+VLC_EXPORT( void, stats_ReinitInputStats, (input_stats_t *) );
+VLC_EXPORT( void, stats_DumpInputStats, (input_stats_t *) );
+
/*
* Replacement functions
*/