X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Flibvlc.h;h=b2046140860d4849fd3d7b2ee042616f2192d3c8;hb=78a42a038b945c0404ac4e7c3ccd58eb0105067a;hp=5cb1ac88a496727ec549c20ed2ce083c09f434c9;hpb=c5dac996061594e526fff114b4fd08a4fde865a4;p=vlc diff --git a/src/libvlc.h b/src/libvlc.h index 5cb1ac88a4..b204614086 100644 --- a/src/libvlc.h +++ b/src/libvlc.h @@ -41,8 +41,12 @@ size_t vlc_towc (const char *str, uint32_t *restrict pwc); */ void system_Init ( void ); void system_Configure ( libvlc_int_t *, int, const char *const [] ); -void system_End ( void ); - +#if defined(_WIN32) || defined(__OS2__) +void system_End(void); +#ifndef __OS2__ +size_t EnumClockSource( vlc_object_t *, const char *, char ***, char *** ); +#endif +#endif void vlc_CPU_init(void); void vlc_CPU_dump(vlc_object_t *); @@ -54,6 +58,7 @@ void vlc_CPU_dump(vlc_object_t *); int vlc_clone_detach (vlc_thread_t *, void *(*)(void *), void *, int); int vlc_object_waitpipe (vlc_object_t *obj); +void ObjectKillChildrens (vlc_object_t *); int vlc_set_priority( vlc_thread_t, int ); @@ -62,12 +67,21 @@ void vlc_threads_setup (libvlc_int_t *); 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) +#if (defined (LIBVLC_USE_PTHREAD) || defined(__ANDROID__)) && !defined (NDEBUG) void vlc_assert_locked (vlc_mutex_t *); #else # define vlc_assert_locked( m ) (void)m #endif +/* + * Logging + */ +typedef struct vlc_logger_t vlc_logger_t; + +int vlc_LogPreinit(libvlc_int_t *); +int vlc_LogInit(libvlc_int_t *); +void vlc_LogDeinit(libvlc_int_t *); + /* * LibVLC exit event handling */ @@ -76,7 +90,6 @@ typedef struct vlc_exit vlc_mutex_t lock; void (*handler) (void *); void *opaque; - bool killed; } vlc_exit_t; void vlc_ExitInit( vlc_exit_t * ); @@ -119,49 +132,14 @@ void vlc_object_set_destructor (vlc_object_t *, vlc_destructor_t); /* * To be cleaned-up module stuff: */ -extern char *psz_vlcpath; - module_t *module_find_by_shortcut (const char *psz_shortcut); -/** - * Private LibVLC data for each object. - */ -typedef struct vlc_object_internals vlc_object_internals_t; - -struct vlc_object_internals -{ - char *psz_name; /* given name */ - - /* Object variables */ - void *var_root; - vlc_mutex_t var_lock; - vlc_cond_t var_wait; - - /* Objects thread synchronization */ - int pipes[2]; - - /* Objects management */ - vlc_spinlock_t ref_spin; - unsigned i_refcount; - vlc_destructor_t pf_destructor; - - /* Objects tree structure */ - vlc_object_internals_t *next; /* next sibling */ - vlc_object_internals_t *prev; /* previous sibling */ - vlc_object_internals_t *first; /* first child */ -}; - #define ZOOM_SECTION N_("Zoom") #define ZOOM_QUARTER_KEY_TEXT N_("1:4 Quarter") #define ZOOM_HALF_KEY_TEXT N_("1:2 Half") #define ZOOM_ORIGINAL_KEY_TEXT N_("1:1 Original") #define ZOOM_DOUBLE_KEY_TEXT N_("2:1 Double") -#define vlc_internals( obj ) (((vlc_object_internals_t*)(VLC_OBJECT(obj)))-1) -#define vlc_externals( priv ) ((vlc_object_t *)((priv) + 1)) - -typedef struct sap_handler_t sap_handler_t; - /** * Private LibVLC instance data. */ @@ -169,28 +147,17 @@ typedef struct libvlc_priv_t { libvlc_int_t public_data; - bool playlist_active; - - /* Messages */ - int i_verbose; ///< info messages - bool b_color; ///< color messages? + /* Logging */ bool b_stats; ///< Whether to collect stats /* Singleton objects */ - module_t *p_memcpy_module; ///< Fast memcpy plugin used - playlist_t *p_playlist; ///< the playlist singleton - struct media_library_t *p_ml; ///< the ML singleton - vlc_mutex_t ml_lock; ///< Mutex for ML creation + vlc_logger_t *logger; vlm_t *p_vlm; ///< the VLM singleton (or NULL) vlc_object_t *p_dialog_provider; ///< dialog provider -#ifdef ENABLE_SOUT - sap_handler_t *p_sap; ///< SAP SDP advertiser -#endif + struct playlist_t *playlist; ///< Playlist for interfaces + struct playlist_preparser_t *parser; ///< Input item meta data handler struct vlc_actions *actions; ///< Hotkeys handler - /* Interfaces */ - struct intf_thread_t *p_intf; ///< Interfaces linked-list - /* Objects tree */ vlc_mutex_t structure_lock; @@ -203,17 +170,12 @@ static inline libvlc_priv_t *libvlc_priv (libvlc_int_t *libvlc) return (libvlc_priv_t *)libvlc; } -void playlist_ServicesDiscoveryKillAll( playlist_t *p_playlist ); +void intf_InsertItem(libvlc_int_t *, const char *mrl, unsigned optc, + const char * const *optv, unsigned flags); void intf_DestroyAll( libvlc_int_t * ); #define libvlc_stats( o ) (libvlc_priv((VLC_OBJECT(o))->p_libvlc)->b_stats) -/** - * LibVLC "main module" configuration settings array. - */ -extern module_config_t libvlc_config[]; -extern const size_t libvlc_config_count; - /* * Variables stuff */ @@ -222,67 +184,53 @@ void var_OptionParse (vlc_object_t *, const char *, bool trusted); /* * Stats stuff */ -int stats_Update (vlc_object_t*, counter_t *, vlc_value_t, vlc_value_t *); -counter_t * stats_CounterCreate (vlc_object_t*, int, int); -#define stats_CounterCreate(a,b,c) stats_CounterCreate( VLC_OBJECT(a), b, c ) -int stats_Get (vlc_object_t*, counter_t *, vlc_value_t*); -#define stats_Get(a,b,c) stats_Get( VLC_OBJECT(a), b, c) - -void stats_CounterClean (counter_t * ); - -static inline int stats_GetInteger( vlc_object_t *p_obj, counter_t *p_counter, - int64_t *value ) +enum { - 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_GetInteger(a,b,c) stats_GetInteger( VLC_OBJECT(a), b, c ) + STATS_COUNTER, + STATS_DERIVATIVE, +}; -static inline int stats_GetFloat( vlc_object_t *p_obj, counter_t *p_counter, - float *value ) +typedef struct counter_sample_t { - 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_GetFloat(a,b,c) stats_GetFloat( VLC_OBJECT(a), b, c ) + uint64_t value; + mtime_t date; +} counter_sample_t; -static inline int stats_UpdateInteger( vlc_object_t *p_obj,counter_t *p_co, - int i, int *pi_new ) +typedef struct counter_t { - 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_UpdateInteger(a,b,c,d) stats_UpdateInteger( VLC_OBJECT(a),b,c,d ) + int i_compute_type; + int i_samples; + counter_sample_t ** pp_samples; + + mtime_t last_update; +} counter_t; -static inline int stats_UpdateFloat( vlc_object_t *p_obj, counter_t *p_co, - float f, float *pf_new ) +enum { - 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; -} -#define stats_UpdateFloat(a,b,c,d) stats_UpdateFloat( VLC_OBJECT(a),b,c,d ) + STATS_INPUT_BITRATE, + STATS_READ_BYTES, + STATS_READ_PACKETS, + STATS_DEMUX_READ, + STATS_DEMUX_BITRATE, + STATS_DEMUX_CORRUPTED, + STATS_DEMUX_DISCONTINUITY, + STATS_PLAYED_ABUFFERS, + STATS_LOST_ABUFFERS, + STATS_DECODED_AUDIO, + STATS_DECODED_VIDEO, + STATS_DECODED_SUB, + STATS_CLIENT_CONNECTIONS, + STATS_ACTIVE_CONNECTIONS, + STATS_SOUT_SENT_PACKETS, + STATS_SOUT_SENT_BYTES, + STATS_SOUT_SEND_BITRATE, + STATS_DISPLAYED_PICTURES, + STATS_LOST_PICTURES, +}; + +counter_t * stats_CounterCreate (int); +void stats_Update (counter_t *, uint64_t, uint64_t *); +void stats_CounterClean (counter_t * ); void stats_ComputeInputStats(input_thread_t*, input_stats_t*); void stats_ReinitInputStats(input_stats_t *);