X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_messages.h;h=69aaea4465cb1a67e67b8adfb1cbeeedf2016f40;hb=84f5d45571d24c0b9bfde6294ee399e2028b8a32;hp=4ff9118fe675e30f60bdab2da0993e136a8e754a;hpb=b21c8b2f44511c5f86e5212ebb4bd71d915594c4;p=vlc diff --git a/include/vlc_messages.h b/include/vlc_messages.h index 4ff9118fe6..69aaea4465 100644 --- a/include/vlc_messages.h +++ b/include/vlc_messages.h @@ -1,5 +1,5 @@ /***************************************************************************** - * messages.h: messages interface + * vlc_messages.h: messages interface * This library provides basic functions for threads to interact with user * interface, such as message output. ***************************************************************************** @@ -62,14 +62,6 @@ typedef struct const char *psz_header; /**< Additional header (used by VLM media) */ } msg_item_t; -/** - * Used by interface plugins which subscribe to the message bank. - */ -typedef struct msg_subscription_t msg_subscription_t; - -/***************************************************************************** - * Prototypes - *****************************************************************************/ VLC_API void vlc_Log(vlc_object_t *, int, const char *, const char *, ...) VLC_FORMAT( 4, 5 ); VLC_API void vlc_vaLog(vlc_object_t *, int, @@ -85,78 +77,6 @@ VLC_API void vlc_vaLog(vlc_object_t *, int, #define msg_Dbg( p_this, ... ) \ vlc_Log( VLC_OBJECT(p_this), VLC_MSG_DBG, MODULE_STRING, __VA_ARGS__ ) -/** - * Message logging callback signature. - * Accepts one private data pointer, the message, and an overrun counter. - */ -typedef void (*msg_callback_t) (void *, int, const msg_item_t *, - const char *, va_list); - -VLC_API msg_subscription_t *vlc_Subscribe(msg_callback_t, void *) VLC_USED; -VLC_API void vlc_Unsubscribe(msg_subscription_t *); - -/** - * @} - */ - -/** - * \defgroup statistics Statistics - * - * @{ - */ - -/**************************** - * Generic stats stuff - ****************************/ -enum -{ - STATS_COUNTER, - STATS_DERIVATIVE, -}; - -struct counter_sample_t -{ - vlc_value_t value; - mtime_t date; -}; - -struct counter_t -{ - unsigned int i_id; - char * psz_name; - int i_type; - void * p_obj; - int i_compute_type; - int i_samples; - counter_sample_t ** pp_samples; - - mtime_t update_interval; - mtime_t last_update; -}; - -enum -{ - 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, -}; - /** * @} */