Commit 40386997 authored by Francois Cartegnie's avatar Francois Cartegnie Committed by Jean-Baptiste Kempf

Qt: InputManager: Split playback state change and item change

Close #8510
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent bb89f76a
...@@ -209,11 +209,7 @@ void InputManager::customEvent( QEvent *event ) ...@@ -209,11 +209,7 @@ void InputManager::customEvent( QEvent *event )
} }
break; break;
case IMEvent::ItemStateChanged: case IMEvent::ItemStateChanged:
// TODO: Fusion with above state
UpdateStatus(); UpdateStatus();
// UpdateName();
// UpdateNavigation(); This shouldn't be useful now
// UpdateTeletext(); Same
break; break;
case IMEvent::NameChanged: case IMEvent::NameChanged:
UpdateName(); UpdateName();
...@@ -274,15 +270,11 @@ void InputManager::customEvent( QEvent *event ) ...@@ -274,15 +270,11 @@ void InputManager::customEvent( QEvent *event )
inline void InputManager::addCallbacks() inline void InputManager::addCallbacks()
{ {
var_AddCallback( p_input, "intf-event", InputEvent, this ); 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 */ /* Delete the callbacks on Input. Self explanatory */
inline void InputManager::delCallbacks() 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 ); var_DelCallback( p_input, "intf-event", InputEvent, this );
} }
...@@ -1192,7 +1184,7 @@ bool MainInputManager::hasEmptyPlaylist() ...@@ -1192,7 +1184,7 @@ bool MainInputManager::hasEmptyPlaylist()
* Static callbacks for MIM * * Static callbacks for MIM *
****************************/ ****************************/
static int PLItemChanged( vlc_object_t *p_this, const char *psz_var, 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 ); VLC_UNUSED( p_this ); VLC_UNUSED( psz_var ); VLC_UNUSED( oldval );
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment