[vlc-devel] commit: Revert " Enable rc fastforward and rewind commands for RTSP trickplay." ( Christophe Mutricy )
git version control
git at videolan.org
Tue Nov 25 23:31:58 CET 2008
vlc | branch: 0.9-bugfix | Christophe Mutricy <xtophe at videolan.org> | Tue Nov 25 22:27:33 2008 +0000| [ee59e04674ff21a6bcc48741cea1de248b9b085f] | committer: Christophe Mutricy
Revert "Enable rc fastforward and rewind commands for RTSP trickplay."
This reverts commit 17014fad90c436ac07cb5688e71a4777a7b8398f.
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=ee59e04674ff21a6bcc48741cea1de248b9b085f
---
modules/control/rc.c | 26 ++++----------------------
1 files changed, 4 insertions(+), 22 deletions(-)
diff --git a/modules/control/rc.c b/modules/control/rc.c
index b691be6..2deed06 100644
--- a/modules/control/rc.c
+++ b/modules/control/rc.c
@@ -1088,33 +1088,15 @@ static int Input( vlc_object_t *p_this, char const *psz_cmd,
}
else if ( !strcmp( psz_cmd, "fastforward" ) )
{
- 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;
- var_SetInteger( p_input, "rate", i_rate );
- }
- else
- {
- val.i_int = config_GetInt( p_intf, "key-jump+extrashort" );
- var_Set( p_intf->p_libvlc, "key-pressed", val );
- }
+ val.i_int = config_GetInt( p_intf, "key-jump+extrashort" );
+ var_Set( p_intf->p_libvlc, "key-pressed", val );
vlc_object_release( p_input );
return VLC_SUCCESS;
}
else if ( !strcmp( psz_cmd, "rewind" ) )
{
- 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;
- var_SetInteger( p_input, "rate", i_rate );
- }
- else
- {
- val.i_int = config_GetInt( p_intf, "key-jump-extrashort" );
- var_Set( p_intf->p_libvlc, "key-pressed", val );
- }
+ val.i_int = config_GetInt( p_intf, "key-jump-extrashort" );
+ var_Set( p_intf->p_libvlc, "key-pressed", val );
vlc_object_release( p_input );
return VLC_SUCCESS;
}
More information about the vlc-devel
mailing list