[vlc-devel] commit: Revert " Add can-rate to distinguish between normal rate control and negative playback direction ." (Christophe Mutricy )

[git version control]

vlc | branch: 0.9-bugfix | Christophe Mutricy <xtophe at videolan.org> | Tue Nov 25 22:27:24 2008 +0000| [99913ba2d397d00bcd0487f7044697a81bc0c099] | committer: Christophe Mutricy 

Revert "Add can-rate to distinguish between normal rate control and negative playback direction."

This reverts commit db41a5c20d4a75f9a7473ba8d649e9a3509b8a5c.

New features that are not self-contained and modify src/ are not
welcomed in -bugfix branches without pre-existent consensus.

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

 modules/control/rc.c |    2 +-
 src/input/input.c    |    2 --
 src/input/var.c      |    3 ---
 3 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/modules/control/rc.c b/modules/control/rc.c
index a321114..b691be6 100644
--- a/modules/control/rc.c
+++ b/modules/control/rc.c
@@ -1088,7 +1088,7 @@ static int Input( vlc_object_t *p_this, char const *psz_cmd,
     }
     else if ( !strcmp( psz_cmd, "fastforward" ) )
     {
-        if( var_GetBool( p_input, "can-rate" ) )
+        if( var_GetBool( p_input, "can-rewind" ) )
         {
             int i_rate = var_GetInteger( p_input, "rate" );
             i_rate = (i_rate < 0) ? -i_rate : i_rate * 2;
diff --git a/src/input/input.c b/src/input/input.c
index c119222..f0b773a 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -2203,7 +2203,6 @@ static int InputSourceInit( input_thread_t *p_input,
                             &in->b_can_pause ) )
             in->b_can_pause = false;
         var_SetBool( p_input, "can-pause", in->b_can_pause );
-        var_SetBool( p_input, "can-rate", in->b_can_rate_control );
         var_SetBool( p_input, "can-rewind", !in->b_rescale_ts );
 
         int ret = demux_Control( in->p_demux, DEMUX_CAN_SEEK,
@@ -2291,7 +2290,6 @@ static int InputSourceInit( input_thread_t *p_input,
                              &in->b_can_pause );
 
             var_SetBool( p_input, "can-pause", in->b_can_pause );
-            var_SetBool( p_input, "can-rate", in->b_can_rate_control );
             var_SetBool( p_input, "can-rewind", !in->b_rescale_ts );
 
             access_Control( in->p_access, ACCESS_CAN_SEEK,
diff --git a/src/input/var.c b/src/input/var.c
index ddad123..fb495df 100644
--- a/src/input/var.c
+++ b/src/input/var.c
@@ -473,9 +473,6 @@ void input_ConfigVarInit ( input_thread_t *p_input )
     val.b_bool = true; /* Fixed later*/
     var_Change( p_input, "can-pause", VLC_VAR_SETVALUE, &val, NULL );
 
-    var_Create( p_input, "can-rate", VLC_VAR_BOOL );
-    var_SetBool( p_input, "can-rate", false );
-
     var_Create( p_input, "can-rewind", VLC_VAR_BOOL );
     val.b_bool = false;
     var_Change( p_input, "can-rewind", VLC_VAR_SETVALUE, &val, NULL );