]> git.sesse.net Git - vlc/blobdiff - modules/gui/qt4/input_manager.cpp
qt4_menus: missing undef.
[vlc] / modules / gui / qt4 / input_manager.cpp
index 13149bd6a744b487db83b95342a6b9588ff2498b..52503540cae5d59ab0b08a54f278a9b4aef7e3a6 100644 (file)
@@ -664,8 +664,8 @@ void InputManager::sectionPrev()
     if( hasInput() )
     {
         int i_type = var_Type( p_input, "next-chapter" );
-        var_SetBool( p_input, (i_type & VLC_VAR_TYPE) != 0 ?
-                            "prev-chapter":"prev-title", true );
+        var_SetVoid( p_input, (i_type & VLC_VAR_TYPE) != 0 ?
+                            "prev-chapter":"prev-title" );
     }
 }
 
@@ -674,8 +674,8 @@ void InputManager::sectionNext()
     if( hasInput() )
     {
         int i_type = var_Type( p_input, "next-chapter" );
-        var_SetBool( p_input, (i_type & VLC_VAR_TYPE) != 0 ?
-                            "next-chapter":"next-title", true );
+        var_SetVoid( p_input, (i_type & VLC_VAR_TYPE) != 0 ?
+                            "next-chapter":"next-title" );
     }
 }
 
@@ -939,14 +939,12 @@ void MainInputManager::customEvent( QEvent *event )
     /* Should be PLItemChanged Event */
     if( !p_intf->p_sys->b_isDialogProvider )
     {
-        vlc_mutex_lock( &p_intf->change_lock );
         if( p_input && ( p_input->b_dead || !vlc_object_alive (p_input) ) )
         {
-            emit inputChanged( NULL );
+            emit inputChanged( p_input );
             var_DelCallback( p_input, "state", PLItemChanged, this );
             vlc_object_release( p_input );
             p_input = NULL;
-            vlc_mutex_unlock( &p_intf->change_lock );
             return;
         }
 
@@ -959,7 +957,6 @@ void MainInputManager::customEvent( QEvent *event )
                 emit inputChanged( p_input );
             }
         }
-        vlc_mutex_unlock( &p_intf->change_lock );
     }
     else
     {