X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=include%2Fvlc_messages.h;h=f746f61c09afd91f89dee61340a1d090bd96416c;hb=1723d7e97f421c27ed4c99159e70c3fafb8fdaee;hp=e6352d8262556367ed595b72ebeb8421a26cca8f;hpb=9697eabdc1130eeed082ce81a0a4b5f90d9347d4;p=vlc

diff --git a/include/vlc_messages.h b/include/vlc_messages.h
index e6352d8262..f746f61c09 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.
  *****************************************************************************
@@ -43,7 +43,7 @@
  */
 
 /** Message types */
-enum msg_item_type
+enum vlc_log_type
 {
     VLC_MSG_INFO=0, /**< Important information */
     VLC_MSG_ERR,    /**< Error */
@@ -54,22 +54,14 @@ enum msg_item_type
 /**
  * Log message
  */
-typedef struct
+typedef struct vlc_log_t
 {
     uintptr_t   i_object_id; /**< Emitter (temporaly) unique object ID or 0 */
     const char *psz_object_type; /**< Emitter object type name */
     const char *psz_module; /**< Emitter module (source code) */
     const char *psz_header; /**< Additional header (used by VLM media) */
-} msg_item_t;
+} vlc_log_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,74 +77,12 @@ 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
-{
-    int                 i_type;
-    int                 i_compute_type;
-    int                 i_samples;
-    counter_sample_t ** pp_samples;
-
-    mtime_t             update_interval;
-    mtime_t             last_update;
-};
+#ifndef MODULE_STRING
+# define MODULE_STRING __FILE__
+#endif
 
-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,
-};
+VLC_API const char *vlc_strerror(int);
+VLC_API const char *vlc_strerror_c(int);
 
 /**
  * @}