vlc | branch: master | Rémi Denis-Courmont <r...@remlab.net> | Fri Nov 14 19:36:10 2014 +0200| [5e0690ee45f07fdbc747edc753755a63cc745ff8] | committer: Rémi Denis-Courmont
input: remove tautologies > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5e0690ee45f07fdbc747edc753755a63cc745ff8 --- src/input/input.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/input/input.c b/src/input/input.c index 8b96803..ba6c5b8 100644 --- a/src/input/input.c +++ b/src/input/input.c @@ -1656,9 +1656,7 @@ static bool Control( input_thread_t *p_input, break; } - float f_pos = val.f_float; - if( i_type != INPUT_CONTROL_SET_POSITION ) - f_pos += var_GetFloat( p_input, "position" ); + float f_pos = val.f_float += var_GetFloat( p_input, "position" ); if( f_pos < 0.f ) f_pos = 0.f; else if( f_pos > 1.f ) @@ -1693,10 +1691,7 @@ static bool Control( input_thread_t *p_input, break; } - i_time = val.i_time; - if( i_type != INPUT_CONTROL_SET_TIME ) - i_time += var_GetTime( p_input, "time" ); - + i_time = val.i_time + var_GetTime( p_input, "time" ); if( i_time < 0 ) i_time = 0; _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits