[vlc-devel] commit: Qt4 compile fix ( Rémi Denis-Courmont )

git version control git at videolan.org
Sat Sep 27 19:50:50 CEST 2008


vlc | branch: master | Rémi Denis-Courmont <rdenis at simphalempin.com> | Sat Sep 27 20:54:00 2008 +0300| [99f52be6622c133da956b5ca732cd2a588506c30] | committer: Rémi Denis-Courmont 

Qt4 compile fix

(Untested due to other Qt4 compilation errors)

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

 modules/gui/qt4/input_manager.cpp |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/modules/gui/qt4/input_manager.cpp b/modules/gui/qt4/input_manager.cpp
index ca139f1..a01ff21 100644
--- a/modules/gui/qt4/input_manager.cpp
+++ b/modules/gui/qt4/input_manager.cpp
@@ -646,17 +646,12 @@ void MainInputManager::customEvent( QEvent *event )
 
         if( !p_input )
         {
-            QPL_LOCK;
-            p_input = THEPL->p_input;
-            if( p_input && !( !vlc_object_alive (p_input) || p_input->b_dead) )
+            p_input = playlist_CurrentInput(THEPL);
+            if( p_input )
             {
-                vlc_object_hold( p_input );
                 var_AddCallback( p_input, "state", PLItemChanged, this );
                 emit inputChanged( p_input );
             }
-            else
-                p_input = NULL;
-            QPL_UNLOCK;
         }
         vlc_mutex_unlock( &p_intf->change_lock );
     }




More information about the vlc-devel mailing list