Implement atomic operations for MSVC using the Interlocked API.

[vlc] / include / vlc_messages.h

diff --git a/include/vlc_messages.h b/include/vlc_messages.h
index b358955b6333a85f010d39a1a65ab749a6f4f8f1..691488371c6e1cc6e9f558538c103a9e19449603 100644 (file)
--- a/include/vlc_messages.h
+++ b/include/vlc_messages.h
@@ -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,15 +77,9 @@ 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 *);
+#ifndef MODULE_STRING
+# define MODULE_STRING __FILE__
+#endif
 
 /**
  * @}