]> git.sesse.net Git - vlc/commitdiff
Qt: InputManager: Split playback state change and item change
authorFrancois Cartegnie <fcvlcdev@free.fr>
Mon, 17 Jun 2013 21:01:24 +0000 (23:01 +0200)
committerJean-Baptiste Kempf <jb@videolan.org>
Mon, 17 Jun 2013 21:01:24 +0000 (23:01 +0200)
Close #8510

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
modules/gui/qt4/input_manager.cpp

index 86176b7142a609bbf4d139e31e29898571d16f70..aa87c808c2572a4938cf8b0aa6263deed45a643a 100644 (file)
@@ -209,11 +209,7 @@ void InputManager::customEvent( QEvent *event )
         }
         break;
     case IMEvent::ItemStateChanged:
-        // TODO: Fusion with above state
         UpdateStatus();
-        // UpdateName();
-        // UpdateNavigation(); This shouldn't be useful now
-        // UpdateTeletext(); Same
         break;
     case IMEvent::NameChanged:
         UpdateName();
@@ -274,15 +270,11 @@ void InputManager::customEvent( QEvent *event )
 inline void InputManager::addCallbacks()
 {
     var_AddCallback( p_input, "intf-event", InputEvent, this );
-    if( !p_intf->p_sys->b_isDialogProvider )
-        var_AddCallback( p_input, "state", PLItemChanged, THEMIM );
 }
 
 /* Delete the callbacks on Input. Self explanatory */
 inline void InputManager::delCallbacks()
 {
-    if( !p_intf->p_sys->b_isDialogProvider )
-        var_DelCallback( p_input, "state", PLItemChanged, THEMIM );
     var_DelCallback( p_input, "intf-event", InputEvent, this );
 }
 
@@ -1192,7 +1184,7 @@ bool MainInputManager::hasEmptyPlaylist()
  * Static callbacks for MIM *
  ****************************/
 static int PLItemChanged( vlc_object_t *p_this, const char *psz_var,
-                        vlc_value_t oldval, vlc_value_t, void *param )
+                        vlc_value_t oldval, vlc_value_t val, void *param )
 {
     VLC_UNUSED( p_this ); VLC_UNUSED( psz_var ); VLC_UNUSED( oldval );