extern const char vlc_usage[];
-/* Hotkey stuff */
-extern const struct hotkey libvlc_hotkeys[];
-extern const size_t libvlc_hotkeys_size;
+/* Actions (hot keys) */
+typedef struct action
+{
+ char name[24];
+ int value;
+} action_t;
+extern const struct action libvlc_actions[];
+extern const size_t libvlc_actions_count;
extern int vlc_key_to_action (vlc_object_t *, const char *,
vlc_value_t, vlc_value_t, void *);
#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
#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)
+void vlc_assert_locked (vlc_mutex_t *);
#else
# define vlc_assert_locked( m ) (void)m
#endif
typedef struct msg_bank_t
{
/** Message queue lock */
- vlc_mutex_t lock;
- vlc_cond_t wait;
+ vlc_rwlock_t lock;
/* Subscribers */
int i_sub;
/* 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 ) );
+char **module_GetModulesNamesForCapability (const char * psz_capability,
+ char ***psz_longname);
module_t *module_find_by_shortcut (const char *psz_shortcut);
/**
bool b_thread;
/* Objects thread synchronization */
- vlc_mutex_t lock;
int pipes[2];
/* Objects management */
libvlc_int_t public_data;
vlc_cond_t exiting; ///< signaled when VLC wants to exit
- /* Configuration */
- vlc_mutex_t config_lock; ///< config file lock
- char * psz_configfile; ///< location of config file
-
int i_last_input_id ; ///< Last id of input item
/* Messages */
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
vlm_t *p_vlm; ///< the VLM singleton (or NULL)
- interaction_t *p_interaction; ///< interface interaction object
- intf_thread_t *p_interaction_intf; ///< XXX interface for interaction
+ vlc_object_t *p_dialog_provider; ///< dialog provider
httpd_t *p_httpd; ///< HTTP daemon (src/network/httpd.c)
#ifdef ENABLE_SOUT
sap_handler_t *p_sap; ///< SAP SDP advertiser
#endif
+
+ /* Interfaces */
+ struct intf_thread_t *p_intf; ///< Interfaces linked-list
+
+ /* Objects tree */
vlc_mutex_t structure_lock;
} libvlc_priv_t;
}
void playlist_ServicesDiscoveryKillAll( playlist_t *p_playlist );
+void intf_DestroyAll( libvlc_int_t * );
#define libvlc_stats( o ) (libvlc_priv((VLC_OBJECT(o))->p_libvlc)->b_stats)
*/
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
*/
projects / vlc / blobdiff