[vlc-devel] commit: Qt4: restore message dialog ( Rémi Denis-Courmont )
git version control
git at videolan.org
Sun Oct 19 18:21:26 CEST 2008
vlc | branch: master | Rémi Denis-Courmont <rdenis at simphalempin.com> | Sun Oct 19 19:20:56 2008 +0300| [f70a9052bd0d5613fecc77d8d3f6a01c0f8636c5] | committer: Rémi Denis-Courmont
Qt4: restore message dialog
(bug at exit due to more generic problems with #2226 and #2227)
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f70a9052bd0d5613fecc77d8d3f6a01c0f8636c5
---
modules/gui/qt4/dialogs/messages.cpp | 126 +++++++++++++++++-----------------
modules/gui/qt4/dialogs/messages.hpp | 7 ++-
modules/gui/qt4/qt4.cpp | 3 -
modules/gui/qt4/qt4.hpp | 1 -
4 files changed, 69 insertions(+), 68 deletions(-)
diff --git a/modules/gui/qt4/dialogs/messages.cpp b/modules/gui/qt4/dialogs/messages.cpp
index 6de4b86..46aa53b 100644
--- a/modules/gui/qt4/dialogs/messages.cpp
+++ b/modules/gui/qt4/dialogs/messages.cpp
@@ -39,9 +39,16 @@
#include <QTreeWidget>
#include <QTreeWidgetItem>
#include <QHeaderView>
+#include <QMutex>
MessagesDialog *MessagesDialog::instance = NULL;
+struct msg_cb_data_t
+{
+ MessagesDialog *self;
+ QMutex lock; /**< protects MessagesDialog::messages */
+};
+
MessagesDialog::MessagesDialog( intf_thread_t *_p_intf)
: QVLCFrame( _p_intf )
{
@@ -64,7 +71,6 @@ MessagesDialog::MessagesDialog( intf_thread_t *_p_intf)
msgLayout->addWidget( messages, 0, 0, 1, 0 );
mainTab->addTab( msgWidget, qtr( "Messages" ) );
- // ON_TIMEOUT( updateLog() );
/* Modules tree */
@@ -109,8 +115,21 @@ MessagesDialog::MessagesDialog( intf_thread_t *_p_intf)
/* General action */
readSettings( "Messages", QSize( 600, 450 ) );
+
+
+ /* Hook up to LibVLC messaging */
+ cb_data = new msg_cb_data_t;
+ cb_data->self = this;
+ sub = msg_Subscribe (_p_intf->p_libvlc, sinkMessage, cb_data);
}
+MessagesDialog::~MessagesDialog ()
+{
+ writeSettings( "messages" );
+ msg_Unsubscribe (sub);
+ delete cb_data;
+};
+
void MessagesDialog::updateTab( int index )
{
/* Second tab : modules tree */
@@ -132,72 +151,53 @@ void MessagesDialog::updateTab( int index )
}
}
-void MessagesDialog::updateLog()
+void MessagesDialog::sinkMessage (msg_cb_data_t *data, msg_item_t *item,
+ unsigned overruns)
+{
+ MessagesDialog *self = data->self;
+ QMutexLocker locker (&data->lock);
+
+ self->sinkMessage (item, overruns);
+}
+
+void MessagesDialog::sinkMessage (msg_item_t *item, unsigned)
{
-#if 0
- msg_subscription_t *p_sub = p_intf->p_sys->p_sub;
- int i_start;
+ if ((item->i_type == VLC_MSG_WARN && verbosityBox->value() < 1)
+ || (item->i_type == VLC_MSG_DBG && verbosityBox->value() < 2 ))
+ return;
- vlc_mutex_lock( p_sub->p_lock );
- int i_stop = *p_sub->pi_stop;
- vlc_mutex_unlock( p_sub->p_lock );
+ messages->textCursor().movePosition( QTextCursor::End );
+ messages->setFontItalic( true );
+ messages->setTextColor( "darkBlue" );
+ messages->insertPlainText( qfu( item->psz_module ) );
- if( p_sub->i_start != i_stop )
+ switch (item->i_type)
{
- messages->textCursor().movePosition( QTextCursor::End );
-
- for( i_start = p_sub->i_start;
- i_start != i_stop;
- i_start = (i_start+1) % VLC_MSG_QSIZE )
- {
- if( p_sub->p_msg[i_start].i_type == VLC_MSG_INFO ||
- p_sub->p_msg[i_start].i_type == VLC_MSG_ERR ||
- p_sub->p_msg[i_start].i_type == VLC_MSG_WARN &&
- verbosityBox->value() >= 1 ||
- p_sub->p_msg[i_start].i_type == VLC_MSG_DBG &&
- verbosityBox->value() >= 2 )
- {
- messages->setFontItalic( true );
- messages->setTextColor( "darkBlue" );
- messages->insertPlainText( qfu( p_sub->p_msg[i_start].psz_module ) );
- }
- else
- continue;
-
- switch( p_sub->p_msg[i_start].i_type )
- {
- case VLC_MSG_INFO:
- messages->setTextColor( "blue" );
- messages->insertPlainText( " info: " );
- break;
- case VLC_MSG_ERR:
- messages->setTextColor( "red" );
- messages->insertPlainText( " error: " );
- break;
- case VLC_MSG_WARN:
- messages->setTextColor( "green" );
- messages->insertPlainText( " warning: " );
- break;
- case VLC_MSG_DBG:
- default:
- messages->setTextColor( "grey" );
- messages->insertPlainText( " debug: " );
- break;
- }
-
- /* Add message Regular black Font */
- messages->setFontItalic( false );
- messages->setTextColor( "black" );
- messages->insertPlainText( qfu(p_sub->p_msg[i_start].psz_msg) );
- messages->insertPlainText( "\n" );
- }
- messages->ensureCursorVisible();
-
- vlc_mutex_lock( p_sub->p_lock );
- p_sub->i_start = i_start;
- vlc_mutex_unlock( p_sub->p_lock );
+ case VLC_MSG_INFO:
+ messages->setTextColor( "blue" );
+ messages->insertPlainText( " info: " );
+ break;
+ case VLC_MSG_ERR:
+ messages->setTextColor( "red" );
+ messages->insertPlainText( " error: " );
+ break;
+ case VLC_MSG_WARN:
+ messages->setTextColor( "green" );
+ messages->insertPlainText( " warning: " );
+ break;
+ case VLC_MSG_DBG:
+ default:
+ messages->setTextColor( "grey" );
+ messages->insertPlainText( " debug: " );
+ break;
}
-#endif
+
+ /* Add message Regular black Font */
+ messages->setFontItalic( false );
+ messages->setTextColor( "black" );
+ messages->insertPlainText( qfu(item->psz_msg) );
+ messages->insertPlainText( "\n" );
+ messages->ensureCursorVisible();
}
void MessagesDialog::buildTree( QTreeWidgetItem *parentItem,
@@ -242,6 +242,7 @@ void MessagesDialog::updateTree()
void MessagesDialog::clear()
{
+ QMutexLocker locker (&cb_data->lock);
messages->clear();
}
@@ -264,6 +265,7 @@ bool MessagesDialog::save()
}
QTextStream out( &file );
+ QMutexLocker locker (&cb_data->lock);
out << messages->toPlainText() << "\n";
return true;
diff --git a/modules/gui/qt4/dialogs/messages.hpp b/modules/gui/qt4/dialogs/messages.hpp
index 4ca1b17..b4cc521 100644
--- a/modules/gui/qt4/dialogs/messages.hpp
+++ b/modules/gui/qt4/dialogs/messages.hpp
@@ -51,7 +51,7 @@ public:
instance = NULL;
}
- virtual ~MessagesDialog(){ writeSettings( "messages" ); };
+ virtual ~MessagesDialog();
private:
MessagesDialog( intf_thread_t * );
@@ -63,10 +63,13 @@ private:
QTreeWidget *modulesTree;
QPushButton *clearUpdateButton;
QPushButton *saveLogButton;
+ msg_subscription_t *sub;
+ msg_cb_data_t *cb_data;
+ static void sinkMessage (msg_cb_data_t *, msg_item_t *, unsigned);
+ void sinkMessage (msg_item_t *item, unsigned);
private slots:
void updateTab( int );
- void updateLog();
void clearOrUpdate();
bool save();
private:
diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index 26a9d2e..2340a0d 100755
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -263,8 +263,6 @@ static int Open( vlc_object_t *p_this )
/* Access to the playlist */
p_intf->p_sys->p_playlist = pl_Hold( p_intf );
- /* Listen to the messages */
- //p_intf->p_sys->p_sub = msg_Subscribe( p_intf->p_libvlc, NULL, NULL );
/* one settings to rule them all */
var_Create( p_this, "window_widget", VLC_VAR_ADDRESS );
@@ -298,7 +296,6 @@ static void Close( vlc_object_t *p_this )
}
vlc_object_release( p_intf->p_sys->p_playlist );
- //msg_Unsubscribe( p_intf->p_sys->p_sub );
free( p_intf->p_sys );
}
diff --git a/modules/gui/qt4/qt4.hpp b/modules/gui/qt4/qt4.hpp
index 41df230..e4adaba 100755
--- a/modules/gui/qt4/qt4.hpp
+++ b/modules/gui/qt4/qt4.hpp
@@ -72,7 +72,6 @@ struct intf_sys_t
bool b_isDialogProvider;
playlist_t *p_playlist;
- msg_subscription_t *p_sub; ///< Subscription to the message bank
VideoWidget *p_video;
More information about the vlc-devel
mailing list