[vlc-devel] commit: Compile fix (not functional) ( Rémi Denis-Courmont )

git version control git at videolan.org
Tue Oct 14 21:44:25 CEST 2008


vlc | branch: master | Rémi Denis-Courmont <rdenis at simphalempin.com> | Tue Oct 14 22:43:45 2008 +0300| [0756eecebc41a2751c787466d2d754cfebdf85ab] | committer: Rémi Denis-Courmont 

Compile fix (not functional)

I don't quite understand why Qt4 would subscribe to messages all the
time rather than only when the dialog is on.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0756eecebc41a2751c787466d2d754cfebdf85ab
---

 modules/gui/qt4/dialogs/messages.cpp |    2 ++
 modules/gui/qt4/qt4.cpp              |    4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/gui/qt4/dialogs/messages.cpp b/modules/gui/qt4/dialogs/messages.cpp
index 5abd1a8..57f6b1c 100644
--- a/modules/gui/qt4/dialogs/messages.cpp
+++ b/modules/gui/qt4/dialogs/messages.cpp
@@ -134,6 +134,7 @@ void MessagesDialog::updateTab( int index )
 
 void MessagesDialog::updateLog()
 {
+#if 0
     msg_subscription_t *p_sub = p_intf->p_sys->p_sub;
     int i_start;
 
@@ -196,6 +197,7 @@ void MessagesDialog::updateLog()
         p_sub->i_start = i_start;
         vlc_mutex_unlock( p_sub->p_lock );
     }
+#endif
 }
 
 void MessagesDialog::buildTree( QTreeWidgetItem *parentItem,
diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index d9ad200..ac00b62 100755
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -264,7 +264,7 @@ 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_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 +298,7 @@ static void Close( vlc_object_t *p_this )
     }
 
     vlc_object_release( p_intf->p_sys->p_playlist );
-    msg_Unsubscribe( p_intf, p_intf->p_sys->p_sub );
+    //msg_Unsubscribe( p_intf->p_sys->p_sub );
     free( p_intf->p_sys );
 }
 




More information about the vlc-devel mailing list