From b296f18c024a7d890e0d1cd655725d1e7f32ea17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= Date: Wed, 15 Jun 2016 22:32:12 +0300 Subject: [PATCH] input: remove unused "position-offset" variable --- include/vlc_input.h | 2 +- src/input/var.c | 34 ++++++++++------------------------ 2 files changed, 11 insertions(+), 25 deletions(-) diff --git a/include/vlc_input.h b/include/vlc_input.h index 16a6a49cbe..22f3dfaa19 100644 --- a/include/vlc_input.h +++ b/include/vlc_input.h @@ -272,7 +272,7 @@ struct input_thread_t * The read-write variables are: * - state (\see input_state_e) * - rate - * - position, position-offset + * - position * - time, time-offset * - title, next-title, prev-title * - chapter, next-chapter, next-chapter-prev diff --git a/src/input/var.c b/src/input/var.c index 437c614b66..f3eca1db44 100644 --- a/src/input/var.c +++ b/src/input/var.c @@ -91,7 +91,6 @@ static const vlc_input_callback_t p_input_callbacks[] = CALLBACK( "state", StateCallback ), CALLBACK( "rate", RateCallback ), CALLBACK( "position", PositionCallback ), - CALLBACK( "position-offset", PositionCallback ), CALLBACK( "time", TimeCallback ), CALLBACK( "time-offset", TimeOffsetCallback ), CALLBACK( "bookmark", BookmarkCallback ), @@ -146,7 +145,6 @@ void input_ControlVarInit ( input_thread_t *p_input ) /* Position */ var_Create( p_input, "position", VLC_VAR_FLOAT ); - var_Create( p_input, "position-offset", VLC_VAR_FLOAT ); /* Time */ var_Create( p_input, "time", VLC_VAR_INTEGER ); @@ -586,32 +584,20 @@ static int PositionCallback( vlc_object_t *p_this, char const *psz_cmd, void *p_data ) { input_thread_t *p_input = (input_thread_t*)p_this; - VLC_UNUSED(oldval); VLC_UNUSED(p_data); - if( !strcmp( psz_cmd, "position-offset" ) ) + VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval); VLC_UNUSED(p_data); + + /* Update "length" for better intf behaviour */ + const int64_t i_length = var_GetInteger( p_input, "length" ); + if( i_length > 0 && newval.f_float >= 0.f && newval.f_float <= 1.f ) { - float f_position = var_GetFloat( p_input, "position" ) + newval.f_float; - if( f_position < 0.f ) - f_position = 0.f; - else if( f_position > 1.f ) - f_position = 1.f; - var_SetFloat( p_this, "position", f_position ); - } - else - { - /* Update "length" for better intf behaviour */ - const int64_t i_length = var_GetInteger( p_input, "length" ); - if( i_length > 0 && newval.f_float >= 0.f && newval.f_float <= 1.f ) - { - vlc_value_t val; + vlc_value_t val; - val.i_int = i_length * newval.f_float; - var_Change( p_input, "time", VLC_VAR_SETVALUE, &val, NULL ); - } - - /* */ - input_ControlPush( p_input, INPUT_CONTROL_SET_POSITION, &newval ); + val.i_int = i_length * newval.f_float; + var_Change( p_input, "time", VLC_VAR_SETVALUE, &val, NULL ); } + + input_ControlPush( p_input, INPUT_CONTROL_SET_POSITION, &newval ); return VLC_SUCCESS; }