X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_messages.h;h=2da692e65ccd927807a34663a5e96fe952ffb997;hb=757ce25689dc8241817763dd357a6f4105418326;hp=4ff9118fe675e30f60bdab2da0993e136a8e754a;hpb=b21c8b2f44511c5f86e5212ebb4bd71d915594c4;p=vlc

diff --git a/include/vlc_messages.h b/include/vlc_messages.h
index 4ff9118fe6..2da692e65c 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,108 +54,56 @@ 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;
-
-/**
- * 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,
-                       const char *, const char *, va_list);
-#define msg_GenericVa(a, b, c, d, e) vlc_vaLog(VLC_OBJECT(a), b, c, d, e)
+    const char *file; /**< Source code file name or NULL */
+    int line; /**< Source code file line number or -1 */
+    const char *func; /**< Source code calling function name or NULL */
+} vlc_log_t;
+
+VLC_API void vlc_Log(vlc_object_t *obj, int prio, const char *module,
+                     const char *file, unsigned line, const char *func,
+                     const char *format, ...) VLC_FORMAT(7, 8);
+VLC_API void vlc_vaLog(vlc_object_t *obj, int prio, const char *module,
+                       const char *file, unsigned line, const char *func,
+                       const char *format, va_list ap);
+#define msg_GenericVa(o, p, fmt, ap) \
+    vlc_vaLog(VLC_OBJECT(o), p, MODULE_STRING, __FILE__, __LINE__, __func__, \
+              fmt, ap)
+
+#define msg_Generic(o, p, ...) \
+    vlc_Log(VLC_OBJECT(o), p, MODULE_STRING, __FILE__, __LINE__, \
+            __func__, __VA_ARGS__)
+#define msg_Info(p_this, ...) \
+    msg_Generic(p_this, VLC_MSG_INFO, __VA_ARGS__)
+#define msg_Err(p_this, ...) \
+    msg_Generic(p_this, VLC_MSG_ERR, __VA_ARGS__)
+#define msg_Warn(p_this, ...) \
+    msg_Generic(p_this, VLC_MSG_WARN, __VA_ARGS__)
+#define msg_Dbg(p_this, ...) \
+    msg_Generic(p_this, VLC_MSG_DBG, __VA_ARGS__)
+
+#ifndef MODULE_STRING
+# define MODULE_STRING __FILE__
+#endif
 
-#define msg_Info( p_this, ... ) \
-    vlc_Log( VLC_OBJECT(p_this), VLC_MSG_INFO, MODULE_STRING, __VA_ARGS__ )
-#define msg_Err( p_this, ... ) \
-    vlc_Log( VLC_OBJECT(p_this), VLC_MSG_ERR,  MODULE_STRING, __VA_ARGS__ )
-#define msg_Warn( p_this, ... ) \
-    vlc_Log( VLC_OBJECT(p_this), VLC_MSG_WARN, MODULE_STRING, __VA_ARGS__ )
-#define msg_Dbg( p_this, ... ) \
-    vlc_Log( VLC_OBJECT(p_this), VLC_MSG_DBG,  MODULE_STRING, __VA_ARGS__ )
+VLC_API const char *vlc_strerror(int);
+VLC_API const char *vlc_strerror_c(int);
 
 /**
  * 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
- *
- * @{
+ * \param data data pointer as provided to vlc_msg_SetCallback().
+ * \param type message type (VLC_MSG_* values from enum vlc_log_type)
+ * \param item meta information
+ * \param fmt format string
+ * \param args format string arguments
  */
-
-/****************************
- * 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,
-};
+typedef void (*vlc_log_cb) (void *data, int type, const vlc_log_t *item,
+                            const char *fmt, va_list args);
 
 /**
  * @}