Qt: add the popup menu in the main interface

[vlc] / src / control / log.c

diff --git a/src/control/log.c b/src/control/log.c
index 6616dfe7576b18a16a1d245ea736c1b79f41ec1f..b87d5d8bd248a7750cacdfa9bef7adb19a626120 100644 (file)
--- a/src/control/log.c
+++ b/src/control/log.c
@@ -23,7 +23,6 @@
  *****************************************************************************/
 
 #include "libvlc_internal.h"
-#include "../libvlc.h"
 #include <vlc/libvlc.h>
 #include <assert.h>
 
@@ -42,15 +41,19 @@ struct msg_cb_data_t
     vlc_spinlock_t lock;
     msg_item_t *items[VLC_MSG_QSIZE];
     unsigned    count;
+    int         verbosity;
 };
 
 static void handler( msg_cb_data_t *d, msg_item_t *p_item, unsigned i_drop )
 {
+    if (p_item->i_type > d->verbosity)
+        return;
+
     vlc_spin_lock (&d->lock);
     if (d->count < VLC_MSG_QSIZE)
     {
         d->items[d->count++] = p_item;
-        /* FIXME FIXME: yield the message item */
+        msg_Hold (p_item);
     }
     vlc_spin_unlock (&d->lock);
     (void)i_drop;
@@ -65,30 +68,23 @@ struct libvlc_log_t
 
 struct libvlc_log_iterator_t
 {
-    const msg_cb_data_t *p_data;
+    msg_cb_data_t *p_data;
     unsigned i_pos;
     unsigned i_end;
 };
 
 unsigned libvlc_get_log_verbosity( const libvlc_instance_t *p_instance, libvlc_exception_t *p_e )
 {
-    if( p_instance )
-    {
-        libvlc_priv_t *p_priv = libvlc_priv( p_instance->p_libvlc_int );
-        return p_priv->i_verbose;
-    }
-    RAISEZERO("Invalid VLC instance!");
+    assert( p_instance );
+    (void)p_e;
+    return p_instance->verbosity;
 }
 
 void libvlc_set_log_verbosity( libvlc_instance_t *p_instance, unsigned level, libvlc_exception_t *p_e )
 {
-    if( p_instance )
-    {
-        libvlc_priv_t *p_priv = libvlc_priv( p_instance->p_libvlc_int );
-        p_priv->i_verbose = level;
-    }
-    else
-        RAISEVOID("Invalid VLC instance!");
+    assert( p_instance );
+    (void)p_e;
+    p_instance->verbosity = level;
 }
 
 libvlc_log_t *libvlc_log_open( libvlc_instance_t *p_instance, libvlc_exception_t *p_e )
@@ -99,6 +95,9 @@ libvlc_log_t *libvlc_log_open( libvlc_instance_t *p_instance, libvlc_exception_t
     if( !p_log ) RAISENULL( "Out of memory" );
 
     p_log->p_instance = p_instance;
+    vlc_spin_init( &p_log->data.lock );
+    p_log->data.count = 0;
+    p_log->data.verbosity = p_instance->verbosity;
     p_log->p_messages = msg_Subscribe(p_instance->p_libvlc_int, handler, &p_log->data);
 
     if( !p_log->p_messages )
@@ -118,6 +117,8 @@ void libvlc_log_close( libvlc_log_t *p_log, libvlc_exception_t *p_e )
         assert( p_log->p_messages );
         msg_Unsubscribe(p_log->p_messages);
         libvlc_release( p_log->p_instance );
+        libvlc_log_clear( p_log, p_e );
+        vlc_spin_destroy( &p_log->data.lock );
         free(p_log);
     }
     else
@@ -128,13 +129,14 @@ unsigned libvlc_log_count( const libvlc_log_t *p_log, libvlc_exception_t *p_e )
 {
     if( p_log )
     {
+        msg_cb_data_t *data = &((libvlc_log_t *)p_log)->data;
         unsigned ret;
 
-        /* We cannot lock due to pointer constraints.
-         * Even then, this would not be thread safe anyway. */
-        /*vlc_spin_lock (&p_log->data.lock);*/
-        ret = p_log->data.count;
-        /*vlc_spin_unlock (&p_log->data.lock);*/
+        /* We cannot lock due to constant pointer constraints. Break them.
+         * Even then, this si not really thread safe anyway. */
+        vlc_spin_lock (&data->lock);
+        ret = data->count;
+        vlc_spin_unlock (&data->lock);
         return ret;
     }
     RAISEZERO("Invalid log object!");
@@ -145,9 +147,13 @@ void libvlc_log_clear( libvlc_log_t *p_log, libvlc_exception_t *p_e )
     if( p_log )
     {
         vlc_spin_lock (&p_log->data.lock);
+        msg_item_t *tab[p_log->data.count];
+        memcpy (tab, p_log->data.items, sizeof (tab));
         p_log->data.count = 0;
-        /* FIXME: release items */
         vlc_spin_unlock (&p_log->data.lock);
+
+        for (unsigned i = 0; i < sizeof (tab) / sizeof (tab[0]); i++)
+            msg_Release (tab[i]);
     }
     else
         RAISEVOID("Invalid log object!");
@@ -159,14 +165,16 @@ libvlc_log_iterator_t *libvlc_log_get_iterator( const libvlc_log_t *p_log, libvl
     {
         struct libvlc_log_iterator_t *p_iter =
             (struct libvlc_log_iterator_t *)malloc(sizeof(struct libvlc_log_iterator_t));
+        /* FIXME: break constant pointer constraints */
+        msg_cb_data_t *data = &((libvlc_log_t *)p_log)->data;
 
         if( !p_iter ) RAISENULL( "Out of memory" );
 
-        /*vlc_spin_lock (&p_log->data.lock);*/
-        p_iter->p_data  = &p_log->data;
+        vlc_spin_lock (&data->lock);
+        p_iter->p_data  = data;
         p_iter->i_pos   = 0;
-        p_iter->i_end   = p_log->data.count;
-        /*vlc_spin_unlock (&p_log->data.lock);*/
+        p_iter->i_end   = data->count;
+        vlc_spin_unlock (&data->lock);
 
         return p_iter;
     }
@@ -207,14 +215,14 @@ libvlc_log_message_t *libvlc_log_iterator_next( libvlc_log_iterator_t *p_iter,
     if( i_pos != p_iter->i_end )
     {
         msg_item_t *msg;
-        /*vlc_spin_lock (&p_iter->p_data->lock);*/
+        vlc_spin_lock (&p_iter->p_data->lock);
         msg = p_iter->p_data->items[i_pos];
         buffer->i_severity  = msg->i_type;
         buffer->psz_type    = msg->psz_object_type;
         buffer->psz_name    = msg->psz_module;
         buffer->psz_header  = msg->psz_header;
         buffer->psz_message = msg->psz_msg;
-        /*vlc_spin_unlock (&p_iter->p_data->lock);*/
+        vlc_spin_unlock (&p_iter->p_data->lock);
         p_iter->i_pos++;
 
         return buffer;