Commit d4f549f7 authored by Derk-Jan Hartman's avatar Derk-Jan Hartman

core: fix time-offset and position-offset callbacks

When using the hotkeys to seek, each offset seek was executed twice. The bahavior of INPUT_CONTROL_SET_TIME_OFFSET has changed, and these callbacks did not account for that yet.

This closes #2820
(cherry picked from commit 4db53934)
Signed-off-by: default avatarDerk-Jan Hartman <hartman@videolan.org>
parent cac12428
...@@ -585,12 +585,11 @@ static int PositionCallback( vlc_object_t *p_this, char const *psz_cmd, ...@@ -585,12 +585,11 @@ static int PositionCallback( vlc_object_t *p_this, char const *psz_cmd,
if( !strcmp( psz_cmd, "position-offset" ) ) if( !strcmp( psz_cmd, "position-offset" ) )
{ {
input_ControlPush( p_input, INPUT_CONTROL_SET_POSITION_OFFSET, &newval );
val.f_float = var_GetFloat( p_input, "position" ) + newval.f_float; val.f_float = var_GetFloat( p_input, "position" ) + newval.f_float;
if( val.f_float < 0.0 ) val.f_float = 0.0; if( val.f_float < 0.0 ) val.f_float = 0.0;
if( val.f_float > 1.0 ) val.f_float = 1.0; if( val.f_float > 1.0 ) val.f_float = 1.0;
var_Change( p_input, "position", VLC_VAR_SETVALUE, &val, NULL );
input_ControlPush( p_input, INPUT_CONTROL_SET_POSITION_OFFSET, &newval );
} }
else else
{ {
...@@ -618,11 +617,9 @@ static int TimeCallback( vlc_object_t *p_this, char const *psz_cmd, ...@@ -618,11 +617,9 @@ static int TimeCallback( vlc_object_t *p_this, char const *psz_cmd,
if( !strcmp( psz_cmd, "time-offset" ) ) if( !strcmp( psz_cmd, "time-offset" ) )
{ {
input_ControlPush( p_input, INPUT_CONTROL_SET_TIME_OFFSET, &newval );
val.i_time = var_GetTime( p_input, "time" ) + newval.i_time; val.i_time = var_GetTime( p_input, "time" ) + newval.i_time;
if( val.i_time < 0 ) val.i_time = 0; if( val.i_time < 0 ) val.i_time = 0;
/* TODO maybe test against i_length ? */ input_ControlPush( p_input, INPUT_CONTROL_SET_TIME_OFFSET, &newval );
var_Change( p_input, "time", VLC_VAR_SETVALUE, &val, NULL );
} }
else else
{ {
......
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