]> git.sesse.net Git - vlc/commitdiff
Qt4 compile fix
authorRémi Denis-Courmont <rdenis@simphalempin.com>
Sat, 27 Sep 2008 17:54:00 +0000 (20:54 +0300)
committerRémi Denis-Courmont <rdenis@simphalempin.com>
Sat, 27 Sep 2008 17:54:24 +0000 (20:54 +0300)
(Untested due to other Qt4 compilation errors)

modules/gui/qt4/input_manager.cpp

index ca139f1b9767ef3e68e32ff373c8483494591129..a01ff210be86f29504c8e9854ae41416a0471c65 100644 (file)
@@ -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 );
     }