From 80ddb522d75cca49a7337c62431709be670c9bdd Mon Sep 17 00:00:00 2001
From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= <rem@videolan.org>
Date: Sat, 10 May 2008 12:29:25 +0300
Subject: [PATCH] Move some internal message stuff to src/

---
 include/vlc_messages.h | 18 ------------------
 src/libvlc.h           | 17 ++++++++++++++++-
 src/misc/messages.c    | 14 +++++++-------
 3 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/include/vlc_messages.h b/include/vlc_messages.h
index e8bb637e83..9d4405e029 100644
--- a/include/vlc_messages.h
+++ b/include/vlc_messages.h
@@ -41,17 +41,6 @@
  * @{
  */
 
-/** Internal message stack context */
-typedef struct
-{
-    int i_code;
-    char * psz_message;
-} msg_context_t;
-
-void msg_StackSet ( int, const char*, ... );
-void msg_StackAdd ( const char*, ... );
-const char* msg_StackMsg ( void );
-
 /**
  * Store a single message sent to user.
  */
@@ -116,13 +105,6 @@ VLC_EXPORT( void, __msg_Dbg,    ( vlc_object_t *, const char *, ... ) ATTRIBUTE_
       __msg_Generic( VLC_OBJECT(p_this), MSG_QUEUE_NORMAL, VLC_MSG_DBG, \
                      MODULE_STRING, __VA_ARGS__ )
 
-#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,b) __msg_Subscribe(VLC_OBJECT(a),b)
 #define msg_Unsubscribe(a,b) __msg_Unsubscribe(VLC_OBJECT(a),b)
 VLC_EXPORT( msg_subscription_t*, __msg_Subscribe, ( vlc_object_t *, int ) );
diff --git a/src/libvlc.h b/src/libvlc.h
index b0b00db552..6c0b92fc1d 100644
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -89,7 +89,7 @@ typedef struct msg_queue_t
 } msg_queue_t;
 
 /**
- * Store all data requiered by messages interfaces.
+ * Store all data required by messages interfaces.
  */
 typedef struct msg_bank_t
 {
@@ -97,6 +97,21 @@ typedef struct msg_bank_t
     msg_queue_t             queues[NB_QUEUES];
 } msg_bank_t;
 
+void msg_Create  (libvlc_int_t *);
+void msg_Flush   (libvlc_int_t *);
+void msg_Destroy (libvlc_int_t *);
+
+/** Internal message stack context */
+typedef struct
+{
+    int i_code;
+    char * psz_message;
+} msg_context_t;
+
+void msg_StackSet ( int, const char*, ... );
+void msg_StackAdd ( const char*, ... );
+const char* msg_StackMsg ( void );
+
 /*
  * Unicode stuff
  */
diff --git a/src/misc/messages.c b/src/misc/messages.c
index e2345fff1b..b55a3e6d90 100644
--- a/src/misc/messages.c
+++ b/src/misc/messages.c
@@ -82,9 +82,9 @@ static void PrintMsg ( vlc_object_t *, msg_item_t * );
  * Initialize messages queues
  * This function initializes all message queues
  */
-void __msg_Create( vlc_object_t *p_this )
+void msg_Create (libvlc_int_t *p_libvlc)
 {
-    libvlc_priv_t *priv = libvlc_priv (p_this->p_libvlc);
+    libvlc_priv_t *priv = libvlc_priv (p_libvlc);
     vlc_mutex_init( &priv->msg_bank.lock );
 
     for( int i = 0; i < 2; i++ )
@@ -110,9 +110,9 @@ void __msg_Create( vlc_object_t *p_this )
 /**
  * Flush all message queues
  */
-void __msg_Flush( vlc_object_t *p_this )
+void msg_Flush (libvlc_int_t *p_libvlc)
 {
-    libvlc_priv_t *priv = libvlc_priv (p_this->p_libvlc);
+    libvlc_priv_t *priv = libvlc_priv (p_libvlc);
 
     for( int i = 0 ; i < NB_QUEUES ; i++ )
     {
@@ -129,14 +129,14 @@ void __msg_Flush( vlc_object_t *p_this )
  * then frees all the allocated ressources
  * No other messages interface functions should be called after this one.
  */
-void __msg_Destroy( vlc_object_t *p_this )
+void msg_Destroy (libvlc_int_t *p_libvlc)
 {
-    libvlc_priv_t *priv = libvlc_priv (p_this->p_libvlc);
+    libvlc_priv_t *priv = libvlc_priv (p_libvlc);
 
     for( int i = NB_QUEUES -1 ; i >= 0;  i-- )
     {
         if( QUEUE(i).i_sub )
-            msg_Err( p_this, "stale interface subscribers" );
+            msg_Err( p_libvlc, "stale interface subscribers" );
 
         FlushMsg( &QUEUE(i) );
 
-- 
2.39.2