mirror of
https://code.videolan.org/videolan/vlc
synced 2024-09-12 13:44:56 +02:00
input: remove unused "position-offset" variable
This commit is contained in:
parent
848f58d62d
commit
b296f18c02
@ -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
|
||||
|
@ -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,19 +584,9 @@ 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" ) )
|
||||
{
|
||||
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
|
||||
{
|
||||
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 )
|
||||
@ -609,9 +597,7 @@ static int PositionCallback( vlc_object_t *p_this, char const *psz_cmd,
|
||||
var_Change( p_input, "time", VLC_VAR_SETVALUE, &val, NULL );
|
||||
}
|
||||
|
||||
/* */
|
||||
input_ControlPush( p_input, INPUT_CONTROL_SET_POSITION, &newval );
|
||||
}
|
||||
return VLC_SUCCESS;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user