input: set OSD message when changing rate via hotkeys to display the current rate...

[vlc] / src / input / var.c

diff --git a/src/input/var.c b/src/input/var.c
index bc5e47b008d71bf5dc012c7e2813e3915b3fd70c..4e7b712be8d37f50b7b7cab0c0599f7d1f3fa591 100644 (file)
--- 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>
 
@@ -216,6 +218,8 @@ void input_ControlVarInit ( input_thread_t *p_input )
     text.psz_string = _("Subtitles Track");
     var_Change( p_input, "spu-es", VLC_VAR_SETTEXT, &text, NULL );
 
+    var_Create( p_input, "sub-margin", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+
     /* Special read only objects variables for intf */
     var_Create( p_input, "bookmarks", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
 
@@ -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 ||
@@ -563,20 +568,67 @@ static int RateCallback( vlc_object_t *p_this, char const *psz_cmd,
     input_thread_t *p_input = (input_thread_t*)p_this;
     VLC_UNUSED(oldval); VLC_UNUSED(p_data);
 
-    /* Problem with this way: the "rate" variable is update after the input thread do the change */
+    static const int ppi_factor[][2] = {
+        {1,64}, {1,32}, {1,16}, {1,8}, {1,4}, {1,3}, {1,2}, {2,3},
+        {1,1},
+        {3,2}, {2,1}, {3,1}, {4,1}, {8,1}, {16,1}, {32,1}, {64,1},
+        {0,0}
+    };
+
+    int i;
+    int i_idx;
+    float f_rate = var_GetFloat( p_input, "rate" );
+    float f_sign = f_rate >= 0 ? +1. : -1.;
+    float f_error;
+
+    /* Determine the factor closest to the current rate */
+    f_error = 1E20;
+    i_idx = -1;
+    for( i = 0; ppi_factor[i][0] != 0; i++ )
+    {
+        const float f_test_r = (float)ppi_factor[i][0] / ppi_factor[i][1];
+        const float f_test_e = fabs( fabs( f_rate ) - f_test_r );
+        if( f_test_e < f_error )
+        {
+            i_idx = i;
+            f_error = f_test_e;
+        }
+    }
+
+    assert( i_idx >= 0 && ppi_factor[i_idx][0] != 0 );
+
+    float f_new_rate;
+    const float f_rate_min = (float)INPUT_RATE_DEFAULT / INPUT_RATE_MAX;
+    const float f_rate_max = (float)INPUT_RATE_DEFAULT / INPUT_RATE_MIN;
+
     if( !strcmp( psz_cmd, "rate-slower" ) )
     {
-        input_ControlPush( p_input, INPUT_CONTROL_SET_RATE_SLOWER, NULL );
+        if( i_idx > 0 )
+            f_new_rate = (float)ppi_factor[i_idx-1][0] / ppi_factor[i_idx-1][1];
+        else
+            f_new_rate = f_rate_min;
+        f_new_rate *= f_sign;
+
+        var_SetFloat( p_input, "rate", f_new_rate );
     }
     else if( !strcmp( psz_cmd, "rate-faster" ) )
     {
-        input_ControlPush( p_input, INPUT_CONTROL_SET_RATE_FASTER, NULL );
+        if( ppi_factor[i_idx+1][0] > 0 )
+            f_new_rate = (float)ppi_factor[i_idx+1][0] / ppi_factor[i_idx+1][1];
+        else
+            f_new_rate = f_rate_max;
+        f_new_rate *= f_sign;
+
+        var_SetFloat( p_input, "rate", f_new_rate );
     }
     else
     {
-        int i_rate = INPUT_RATE_DEFAULT / newval.f_float;
+        /* Problem with this way: the "rate" variable is updated after the
+         * input thread did the change */
+        newval.i_int = INPUT_RATE_DEFAULT / newval.f_float;
         input_ControlPush( p_input, INPUT_CONTROL_SET_RATE, &newval );
     }
+
     return VLC_SUCCESS;
 }