* ./src/misc/modules.c: p_module->psz_filename is now filled with a real

[vlc] / include / vlc_messages.h

diff --git a/include/vlc_messages.h b/include/vlc_messages.h
index 6aa12b5a31a439812b38ff08d91017027ee7982a..e32cf71ae2e9e97a1399703dde4cdddada005d93 100644 (file)
--- a/include/vlc_messages.h
+++ b/include/vlc_messages.h
@@ -4,7 +4,7 @@
  * interface, such as message output.
  *****************************************************************************
  * Copyright (C) 1999, 2000, 2001, 2002 VideoLAN
- * $Id: vlc_messages.h,v 1.1 2002/06/01 12:31:58 sam Exp $
+ * $Id: vlc_messages.h,v 1.7 2002/11/13 15:28:24 sam Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -34,6 +34,8 @@
 typedef struct
 {
     int     i_type;                               /* message type, see below */
+    int     i_object_id;
+    int     i_object_type;
     char *  psz_module;
     char *  psz_msg;                                   /* the message itself */
 
@@ -56,10 +58,12 @@ typedef struct
  *****************************************************************************
  * Store all data requiered by messages interfaces.
  *****************************************************************************/
-struct msg_bank_s
+struct msg_bank_t
 {
     /* Message queue lock */
     vlc_mutex_t             lock;
+    vlc_bool_t              b_configured;
+    vlc_bool_t              b_overflow;
 
     /* Message queue */
     msg_item_t              msg[VLC_MSG_QSIZE];             /* message queue */
@@ -69,6 +73,11 @@ struct msg_bank_s
     /* Subscribers */
     int i_sub;
     msg_subscription_t **pp_sub;
+
+    /* Logfile for WinCE */
+#ifdef UNDER_CE
+    FILE *logfile;
+#endif
 };
 
 /*****************************************************************************
@@ -76,7 +85,7 @@ struct msg_bank_s
  *****************************************************************************
  * Used by interface plugins which subscribe to the message bank.
  *****************************************************************************/
-struct msg_subscription_s
+struct msg_subscription_t
 {
     int   i_start;
     int*  pi_stop;
@@ -97,19 +106,19 @@ VLC_EXPORT( void, __msg_Dbg,    ( void *, const char *, ... ) );
 #ifdef HAVE_VARIADIC_MACROS
 
 #   define msg_Info( p_this, psz_format, args... ) \
-      __msg_Generic( CAST_TO_VLC_OBJECT(p_this), VLC_MSG_INFO, MODULE_STRING, \
+      __msg_Generic( VLC_OBJECT(p_this), VLC_MSG_INFO, MODULE_STRING, \
                      psz_format, ## args )
 
 #   define msg_Err( p_this, psz_format, args... ) \
-      __msg_Generic( CAST_TO_VLC_OBJECT(p_this), VLC_MSG_ERR, MODULE_STRING, \
+      __msg_Generic( VLC_OBJECT(p_this), VLC_MSG_ERR, MODULE_STRING, \
                      psz_format, ## args )
 
 #   define msg_Warn( p_this, psz_format, args... ) \
-      __msg_Generic( CAST_TO_VLC_OBJECT(p_this), VLC_MSG_WARN, MODULE_STRING, \
+      __msg_Generic( VLC_OBJECT(p_this), VLC_MSG_WARN, MODULE_STRING, \
                      psz_format, ## args )
 
 #   define msg_Dbg( p_this, psz_format, args... ) \
-      __msg_Generic( CAST_TO_VLC_OBJECT(p_this), VLC_MSG_DBG, MODULE_STRING, \
+      __msg_Generic( VLC_OBJECT(p_this), VLC_MSG_DBG, MODULE_STRING, \
                      psz_format, ## args )
 
 #else /* HAVE_VARIADIC_MACROS */
@@ -121,3 +130,15 @@ VLC_EXPORT( void, __msg_Dbg,    ( void *, const char *, ... ) );
 
 #endif /* HAVE_VARIADIC_MACROS */
 
+#define msg_Create(a) __msg_Create(VLC_OBJECT(a))
+#define msg_Flush(a) __msg_Flush(VLC_OBJECT(a))
+#define msg_Destroy(a) __msg_Destroy(VLC_OBJECT(a))
+void __msg_Create  ( vlc_object_t * );
+void __msg_Flush   ( vlc_object_t * );
+void __msg_Destroy ( vlc_object_t * );
+
+#define msg_Subscribe(a) __msg_Subscribe(VLC_OBJECT(a))
+#define msg_Unsubscribe(a,b) __msg_Unsubscribe(VLC_OBJECT(a),b)
+VLC_EXPORT( msg_subscription_t*, __msg_Subscribe, ( vlc_object_t * ) );
+VLC_EXPORT( void, __msg_Unsubscribe, ( vlc_object_t *, msg_subscription_t * ) );
+