Commit b430b4c2 authored by Zoran Turalija's avatar Zoran Turalija Committed by Jean-Baptiste Kempf

hotkeys: Delay subtitle track only if it exists and is enabled.

In ACTIONID_SUBDELAY_UP/DOWN, do not delay subtitle if there is none,
or if subtitle has been currently disabled.
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent cb7bffb2
...@@ -444,12 +444,26 @@ static int PutAction( intf_thread_t *p_intf, int i_action ) ...@@ -444,12 +444,26 @@ static int PutAction( intf_thread_t *p_intf, int i_action )
int diff = (i_action == ACTIONID_SUBDELAY_UP) ? 50000 : -50000; int diff = (i_action == ACTIONID_SUBDELAY_UP) ? 50000 : -50000;
if( p_input ) if( p_input )
{ {
vlc_value_t val, list, list2;
int i_count;
var_Get( p_input, "spu-es", &val );
var_Change( p_input, "spu-es", VLC_VAR_GETCHOICES,
&list, &list2 );
i_count = list.p_list->i_count;
if( i_count < 1 || val.i_int < 0 )
{
DisplayMessage( p_vout, _("Subtitle delay: No active subtitle") );
var_FreeList( &list, &list2 );
break;
}
int64_t i_delay = var_GetTime( p_input, "spu-delay" ) + diff; int64_t i_delay = var_GetTime( p_input, "spu-delay" ) + diff;
var_SetTime( p_input, "spu-delay", i_delay ); var_SetTime( p_input, "spu-delay", i_delay );
ClearChannels( p_intf, p_vout ); ClearChannels( p_intf, p_vout );
DisplayMessage( p_vout, _( "Subtitle delay %i ms" ), DisplayMessage( p_vout, _( "Subtitle delay %i ms" ),
(int)(i_delay/1000) ); (int)(i_delay/1000) );
var_FreeList( &list, &list2 );
} }
break; break;
} }
......
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