[vlc-devel] commit: Fixed "position/time-offset" behaviour. (Laurent Aimar )

[git version control]

vlc | branch: 1.0-bugfix | Laurent Aimar <fenrir at videolan.org> | Sun Jun 14 20:33:36 2009 +0200| [e51f28c28137db27ef987369f5f2960b751a7ed9] | committer: Jean-Baptiste Kempf 

Fixed "position/time-offset" behaviour.

It fixes the regression when doing close jumps.
(cherry picked from commit f607feaed6bd6e84a56fa55d0e180d44abc2ac46)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e51f28c28137db27ef987369f5f2960b751a7ed9
---

 src/input/var.c |   62 ++++++++++++++++++++++++++++--------------------------
 1 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/src/input/var.c b/src/input/var.c
index 38aac2d..fcad811 100644
--- a/src/input/var.c
+++ b/src/input/var.c
@@ -580,31 +580,32 @@ 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_value_t val, length;
     VLC_UNUSED(oldval); VLC_UNUSED(p_data);
 
     if( !strcmp( psz_cmd, "position-offset" ) )
     {
-        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 > 1.0 ) val.f_float = 1.0;
-
-        input_ControlPush( p_input, INPUT_CONTROL_SET_POSITION_OFFSET, &newval );
+        float f_position = var_GetFloat( p_input, "position" ) + newval.f_float;
+        if( f_position < 0.0 )
+            f_position = 0.0;
+        else if( f_position > 1.0 )
+            f_position = 1.0;
+        var_SetFloat( p_this, "position", f_position );
     }
     else
     {
-        val.f_float = newval.f_float;
-        input_ControlPush( p_input, INPUT_CONTROL_SET_POSITION, &newval );
-    }
+        /* Update "length" for better intf behavour */
+        const mtime_t i_length = var_GetTime( p_input, "length" );
+        if( i_length > 0 && newval.f_float >= 0.0 && newval.f_float <= 1.0 )
+        {
+            vlc_value_t val;
 
-    /* Update "position" for better intf behavour */
-    var_Get( p_input, "length", &length );
-    if( length.i_time > 0 && val.f_float >= 0.0 && val.f_float <= 1.0 )
-    {
-        val.i_time = length.i_time * val.f_float;
-        var_Change( p_input, "time", VLC_VAR_SETVALUE, &val, NULL );
-    }
+            val.i_time = 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;
 }
 
@@ -612,29 +613,30 @@ static int TimeCallback( vlc_object_t *p_this, char const *psz_cmd,
                          vlc_value_t oldval, vlc_value_t newval, void *p_data )
 {
     input_thread_t *p_input = (input_thread_t*)p_this;
-    vlc_value_t val, length;
     VLC_UNUSED(oldval); VLC_UNUSED(p_data);
 
     if( !strcmp( psz_cmd, "time-offset" ) )
     {
-        val.i_time = var_GetTime( p_input, "time" ) + newval.i_time;
-        if( val.i_time < 0 ) val.i_time = 0;
-        input_ControlPush( p_input, INPUT_CONTROL_SET_TIME_OFFSET, &newval );
+        mtime_t i_time = var_GetTime( p_input, "time" ) + newval.i_time;
+        if( i_time < 0 )
+            i_time = 0;
+        var_SetTime( p_this, "time", i_time );
     }
     else
     {
-        val.i_time = newval.i_time;
-        input_ControlPush( p_input, INPUT_CONTROL_SET_TIME, &newval );
-    }
+        /* Update "position" for better intf behavour */
+        const mtime_t i_length = var_GetTime( p_input, "length" );
+        if( i_length > 0 && newval.i_time >= 0 && newval.i_time <= i_length )
+        {
+            vlc_value_t val;
 
-    /* Update "position" for better intf behavour */
-    var_Get( p_input, "length", &length );
-    if( length.i_time > 0 && val.i_time >= 0 && val.i_time <= length.i_time )
-    {
-        val.f_float = (double)val.i_time/(double)length.i_time;
-        var_Change( p_input, "position", VLC_VAR_SETVALUE, &val, NULL );
-    }
+            val.f_float = (double)newval.i_time/(double)i_length;
+            var_Change( p_input, "position", VLC_VAR_SETVALUE, &val, NULL );
+        }
 
+        /* */
+        input_ControlPush( p_input, INPUT_CONTROL_SET_TIME, &newval );
+    }
     return VLC_SUCCESS;
 }