Redefine vlc_dictionary_clear() and vlc_dictionary_remove_value_for_key() Allow passi...

[vlc] / src / misc / messages.c

diff --git a/src/misc/messages.c b/src/misc/messages.c
index 3b5298c83648733c390cb7191add6e5fa49fbc08..37863148eca114fb9b29188ba5ad808cf920f2f4 100644 (file)
--- a/src/misc/messages.c
+++ b/src/misc/messages.c
@@ -87,6 +87,8 @@ static void QueueMsg ( vlc_object_t *, int, const char *,
 static void FlushMsg ( msg_queue_t * );
 static void PrintMsg ( vlc_object_t *, msg_item_t * );
 
+static vlc_mutex_t msg_stack_lock = VLC_STATIC_MUTEX;
+
 /**
  * Initialize messages queues
  * This function initializes all message queues
@@ -96,6 +98,9 @@ void msg_Create (libvlc_int_t *p_libvlc)
     libvlc_priv_t *priv = libvlc_priv (p_libvlc);
     vlc_mutex_init( &priv->msg_bank.lock );
     vlc_mutex_init( &QUEUE.lock );
+    vlc_dictionary_init( &priv->msg_enabled_objects, 0 );
+    priv->msg_all_objects_enabled = true;
+
     QUEUE.b_overflow = false;
     QUEUE.i_start = 0;
     QUEUE.i_stop = 0;
@@ -110,10 +115,10 @@ void msg_Create (libvlc_int_t *p_libvlc)
     SetFilePointer( QUEUE.logfile, 0, NULL, FILE_END );
 #endif
 
-    vlc_mutex_t *lock = var_AcquireMutex( "msg-stack" );
+    vlc_mutex_lock( &msg_stack_lock );
     if( banks++ == 0 )
         vlc_threadvar_create( &msg_context, NULL );
-    vlc_mutex_unlock( lock );
+    vlc_mutex_unlock( &msg_stack_lock );
 }
 
 /**
@@ -127,6 +132,35 @@ void msg_Flush (libvlc_int_t *p_libvlc)
     vlc_mutex_unlock( &QUEUE.lock );
 }
 
+
+/**
+ * Object Printing selection
+ */
+static void const * kObjectPrintingEnabled = (void *) 1;
+static void const * kObjectPrintingDisabled = (void *) -1;
+
+void __msg_EnableObjectPrinting (vlc_object_t *p_this, char * psz_object)
+{
+    libvlc_priv_t *priv = libvlc_priv (p_this->p_libvlc);
+    vlc_mutex_lock( &QUEUE.lock );
+    if( !strcmp(psz_object, "all") )
+        priv->msg_all_objects_enabled = true;
+    else
+        vlc_dictionary_insert( &priv->msg_enabled_objects, psz_object, (void *)kObjectPrintingEnabled );
+    vlc_mutex_unlock( &QUEUE.lock );
+}
+
+void __msg_DisableObjectPrinting (vlc_object_t *p_this, char * psz_object)
+{
+    libvlc_priv_t *priv = libvlc_priv (p_this->p_libvlc);
+    vlc_mutex_lock( &QUEUE.lock );
+    if( !strcmp(psz_object, "all") )
+        priv->msg_all_objects_enabled = false;
+    else
+        vlc_dictionary_insert( &priv->msg_enabled_objects, psz_object, (void *)kObjectPrintingDisabled );
+    vlc_mutex_unlock( &QUEUE.lock );
+}
+
 /**
  * Destroy the message queues
  *
@@ -143,14 +177,17 @@ void msg_Destroy (libvlc_int_t *p_libvlc)
 
     FlushMsg( &QUEUE );
 
-    vlc_mutex_t *lock = var_AcquireMutex( "msg-stack" );
+    vlc_mutex_lock( &msg_stack_lock );
     if( --banks == 0 )
         vlc_threadvar_delete( &msg_context );
-    vlc_mutex_unlock( lock );
+    vlc_mutex_unlock( &msg_stack_lock );
 
 #ifdef UNDER_CE
     CloseHandle( QUEUE.logfile );
 #endif
+
+    vlc_dictionary_clear( &priv->msg_enabled_objects, NULL, NULL );
+
     /* Destroy lock */
     vlc_mutex_destroy( &QUEUE.lock );
     vlc_mutex_destroy( &priv->msg_bank.lock);
@@ -442,7 +479,7 @@ static void QueueMsg( vlc_object_t *p_this, int i_type, const char *psz_module,
             p_queue->i_stop = (p_queue->i_stop + 1) % VLC_MSG_QSIZE;
 
             p_item->i_type =        VLC_MSG_WARN;
-            p_item->i_object_id =   p_this->i_object_id;
+            p_item->i_object_id =   (uintptr_t)p_this;
             p_item->psz_object_type = p_this->psz_object_type;
             p_item->psz_module =    strdup( "message" );
             p_item->psz_msg =       strdup( "message queue overflowed" );
@@ -463,7 +500,7 @@ static void QueueMsg( vlc_object_t *p_this, int i_type, const char *psz_module,
 
     /* Fill message information fields */
     p_item->i_type =        i_type;
-    p_item->i_object_id =   p_this->i_object_id;
+    p_item->i_object_id =   (uintptr_t)p_this;
     p_item->psz_object_type = p_this->psz_object_type;
     p_item->psz_module =    strdup( psz_module );
     p_item->psz_msg =       psz_str;
@@ -567,6 +604,23 @@ static void PrintMsg ( vlc_object_t * p_this, msg_item_t * p_item )
     }
 
     psz_object = p_item->psz_object_type;
+    void * val = vlc_dictionary_value_for_key( &priv->msg_enabled_objects,
+                                               p_item->psz_module );
+    if( val == kObjectPrintingDisabled )
+        return;
+    if( val == kObjectPrintingEnabled )
+        /* Allowed */;
+    else
+    {
+        val = vlc_dictionary_value_for_key( &priv->msg_enabled_objects,
+                                            psz_object );
+        if( val == kObjectPrintingDisabled )
+            return;
+        if( val == kObjectPrintingEnabled )
+            /* Allowed */;
+        else if( !priv->msg_all_objects_enabled )
+            return;
+    }
 
     int canc = vlc_savecancel ();
 #ifdef UNDER_CE
@@ -583,40 +637,17 @@ static void PrintMsg ( vlc_object_t * p_this, msg_item_t * p_item )
 
 #else
     /* Send the message to stderr */
-    if( priv->b_color )
-    {
-        if( p_item->psz_header )
-        {
-            utf8_fprintf( stderr, "[" GREEN "%.8i" GRAY "] %s %s %s%s: %s%s" GRAY
-                              "\n",
-                         p_item->i_object_id, p_item->psz_header,
-                         p_item->psz_module, psz_object,
-                         ppsz_type[i_type], ppsz_color[i_type],
-                         p_item->psz_msg );
-        }
-        else
-        {
-             utf8_fprintf( stderr, "[" GREEN "%.8i" GRAY "] %s %s%s: %s%s" GRAY "\n",
-                         p_item->i_object_id, p_item->psz_module, psz_object,
-                         ppsz_type[i_type], ppsz_color[i_type],
-                         p_item->psz_msg );
-        }
-    }
-    else
-    {
-        if( p_item->psz_header )
-        {
-            utf8_fprintf( stderr, "[%.8i] %s %s %s%s: %s\n", p_item->i_object_id,
-                         p_item->psz_header, p_item->psz_module,
-                         psz_object, ppsz_type[i_type], p_item->psz_msg );
-        }
-        else
-        {
-            utf8_fprintf( stderr, "[%.8i] %s %s%s: %s\n", p_item->i_object_id,
-                         p_item->psz_module, psz_object, ppsz_type[i_type],
-                         p_item->psz_msg );
-        }
-    }
+    utf8_fprintf( stderr, "[%s%p%s] %s%s%s %s%s: %s%s%s\n",
+                  priv->b_color ? GREEN : "",
+                  (void *)p_item->i_object_id,
+                  priv->b_color ? GRAY : "",
+                  p_item->psz_header ? p_item->psz_header : "",
+                  p_item->psz_header ? " " : "",
+                  p_item->psz_module, psz_object,
+                  ppsz_type[i_type],
+                  priv->b_color ? ppsz_color[i_type] : "",
+                  p_item->psz_msg,
+                  priv->b_color ? GRAY : "" );
 
 #   if defined(WIN32)
     fflush( stderr );