From dbc2edaca2d8d2412c6c197124c4c8788c3fc5d6 Mon Sep 17 00:00:00 2001 From: Laurent Aimar Date: Fri, 28 May 2010 21:50:18 +0200 Subject: [PATCH] Simplify up/down subtitle hotkey. --- modules/control/hotkeys.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/modules/control/hotkeys.c b/modules/control/hotkeys.c index b1444d7bae..31e1895a15 100644 --- a/modules/control/hotkeys.c +++ b/modules/control/hotkeys.c @@ -783,21 +783,15 @@ static int PutAction( intf_thread_t *p_intf, int i_action ) _( "Subtitle delay %i ms" ), (int)(i_delay/1000) ); } - else if( i_action == ACTIONID_SUBPOS_DOWN ) + else if( i_action == ACTIONID_SUBPOS_DOWN || + i_action == ACTIONID_SUBPOS_UP ) { - int i_pos = var_GetInteger( p_input, "sub-margin" ); - --i_pos; - var_SetInteger( p_input, "sub-margin", i_pos ); - ClearChannels( p_intf, p_vout ); - DisplayMessage( p_vout, SPU_DEFAULT_CHANNEL, - _( "Subtitle position %i px" ), - (int)(i_pos) ); - } - else if( i_action == ACTIONID_SUBPOS_UP ) - { - int i_pos = var_GetInteger( p_input, "sub-margin" ); - ++i_pos; - var_SetInteger( p_input, "sub-margin", i_pos ); + int i_pos; + if( i_action == ACTIONID_SUBPOS_DOWN ) + i_pos = var_DecInteger( p_input, "sub-margin" ); + else + i_pos = var_IncInteger( p_input, "sub-margin" ); + ClearChannels( p_intf, p_vout ); DisplayMessage( p_vout, SPU_DEFAULT_CHANNEL, _( "Subtitle position %i px" ), -- 2.39.2