X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Finput%2Fvar.c;h=92e738f2917752d7ce4891a1fe67e412222dbaec;hb=063895670b30de910d13a46942b3c902b36205b1;hp=bc5e47b008d71bf5dc012c7e2813e3915b3fd70c;hpb=e87dd9f0fd57a2eeef76225d4a35065c0db1849b;p=vlc

diff --git a/src/input/var.c b/src/input/var.c
index bc5e47b008..92e738f291 100644
--- a/src/input/var.c
+++ b/src/input/var.c
@@ -29,6 +29,8 @@
 #endif
 
 #include <vlc_common.h>
+#include <assert.h>
+#include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -41,6 +43,8 @@ static int StateCallback   ( vlc_object_t *p_this, char const *psz_cmd,
                              vlc_value_t oldval, vlc_value_t newval, void * );
 static int RateCallback    ( vlc_object_t *p_this, char const *psz_cmd,
                              vlc_value_t oldval, vlc_value_t newval, void * );
+static int RateOffsetCallback( vlc_object_t *p_this, char const *psz_cmd,
+                             vlc_value_t oldval, vlc_value_t newval, void * );
 static int PositionCallback( vlc_object_t *p_this, char const *psz_cmd,
                              vlc_value_t oldval, vlc_value_t newval, void * );
 static int TimeCallback    ( vlc_object_t *p_this, char const *psz_cmd,
@@ -86,8 +90,8 @@ static const vlc_input_callback_t p_input_callbacks[] =
 {
     CALLBACK( "state", StateCallback ),
     CALLBACK( "rate", RateCallback ),
-    CALLBACK( "rate-slower", RateCallback ),
-    CALLBACK( "rate-faster", RateCallback ),
+    CALLBACK( "rate-slower", RateOffsetCallback ),
+    CALLBACK( "rate-faster", RateOffsetCallback ),
     CALLBACK( "position", PositionCallback ),
     CALLBACK( "position-offset", PositionCallback ),
     CALLBACK( "time", TimeCallback ),
@@ -174,7 +178,7 @@ void input_ControlVarInit ( input_thread_t *p_input )
     var_Change( p_input, "program", VLC_VAR_SETTEXT, &text, NULL );
 
     /* Programs */
-    var_Create( p_input, "programs", VLC_VAR_LIST | VLC_VAR_DOINHERIT );
+    var_Create( p_input, "programs", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
     text.psz_string = _("Programs");
     var_Change( p_input, "programs", VLC_VAR_SETTEXT, &text, NULL );
 
@@ -357,7 +361,7 @@ void input_ControlVarNavigation( input_thread_t *p_input )
 void input_ControlVarTitle( input_thread_t *p_input, int i_title )
 {
     input_title_t *t = p_input->p->title[i_title];
-    vlc_value_t val, text;
+    vlc_value_t text;
     int  i;
 
     /* Create/Destroy command variables */
@@ -366,7 +370,7 @@ void input_ControlVarTitle( input_thread_t *p_input, int i_title )
         var_Destroy( p_input, "next-chapter" );
         var_Destroy( p_input, "prev-chapter" );
     }
-    else if( var_Get( p_input, "next-chapter", &val ) != VLC_SUCCESS )
+    else if( var_Type( p_input, "next-chapter" ) == 0 )
     {
         var_Create( p_input, "next-chapter", VLC_VAR_VOID );
         text.psz_string = _("Next chapter");
@@ -383,6 +387,7 @@ void input_ControlVarTitle( input_thread_t *p_input, int i_title )
     var_Change( p_input, "chapter", VLC_VAR_CLEARCHOICES, NULL, NULL );
     for( i = 0; i <  t->i_seekpoint; i++ )
     {
+        vlc_value_t val;
         val.i_int = i;
 
         if( t->seekpoint[i]->psz_name == NULL ||
@@ -561,21 +566,55 @@ static int RateCallback( 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_UNUSED(oldval); VLC_UNUSED(p_data);
+    VLC_UNUSED(oldval); VLC_UNUSED(p_data); VLC_UNUSED(psz_cmd);
 
-    /* Problem with this way: the "rate" variable is update after the input thread do the change */
-    if( !strcmp( psz_cmd, "rate-slower" ) )
-    {
-        input_ControlPush( p_input, INPUT_CONTROL_SET_RATE_SLOWER, NULL );
-    }
-    else if( !strcmp( psz_cmd, "rate-faster" ) )
+    newval.i_int = INPUT_RATE_DEFAULT / newval.f_float;
+    input_ControlPush( p_input, INPUT_CONTROL_SET_RATE, &newval );
+
+    return VLC_SUCCESS;
+}
+
+static int RateOffsetCallback( 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_UNUSED(oldval); VLC_UNUSED(p_data); VLC_UNUSED(newval);
+
+    static const float pf_rate[] = {
+        1.0/64, 1.0/32, 1.0/16, 1.0/8, 1.0/4, 1.0/3, 1.0/2, 2.0/3,
+        1.0/1,
+        3.0/2, 2.0/1, 3.0/1, 4.0/1, 8.0/1, 16.0/1, 32.0/1, 64.0/1,
+    };
+    const unsigned i_rate_count = sizeof(pf_rate)/sizeof(*pf_rate);
+
+    const float f_rate = var_GetFloat( p_input, "rate" );
+
+    /* Determine the factor closest to the current rate */
+    float f_error;
+    int i_idx;
+    for( unsigned i = 0; i < i_rate_count; i++ )
     {
-        input_ControlPush( p_input, INPUT_CONTROL_SET_RATE_FASTER, NULL );
+        const float f_test_e = fabs( fabs( f_rate ) - pf_rate[i] );
+        if( i == 0 || f_test_e < f_error )
+        {
+            i_idx = i;
+            f_error = f_test_e;
+        }
     }
-    else
+    assert( i_idx < (int)i_rate_count );
+
+    /* */
+    i_idx += strcmp( psz_cmd, "rate-faster" ) == 0 ? 1 : -1;
+    if( i_idx >= 0 && i_idx < (int)i_rate_count )
     {
-        int i_rate = INPUT_RATE_DEFAULT / newval.f_float;
-        input_ControlPush( p_input, INPUT_CONTROL_SET_RATE, &newval );
+        const float f_rate_min = (float)INPUT_RATE_DEFAULT / INPUT_RATE_MAX;
+        const float f_rate_max = (float)INPUT_RATE_DEFAULT / INPUT_RATE_MIN;
+        const float f_sign = f_rate >= 0 ? +1. : -1.;
+
+        var_SetFloat( p_input, "rate",
+                      f_sign * __MAX( __MIN( pf_rate[i_idx],
+                                             f_rate_max ),
+                                      f_rate_min ) );
     }
     return VLC_SUCCESS;
 }