[vlc-commits] Qt: InputManager: Split playback state change and item change

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Mon Jun 17 23:01:24 2013 +0200| [403869975e08ee02d5ad99c7e793498ccc455b55] | committer: Jean-Baptiste Kempf

Qt: InputManager: Split playback state change and item change

Close #8510

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 modules/gui/qt4/input_manager.cpp |   10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/modules/gui/qt4/input_manager.cpp b/modules/gui/qt4/input_manager.cpp
index 86176b7..aa87c80 100644
--- a/modules/gui/qt4/input_manager.cpp
+++ b/modules/gui/qt4/input_manager.cpp
@@ -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 );