Skip to content

V
vlc-2-2
Commit fca9baf0 authored by Derk-Jan Hartman's avatar Derk-Jan Hartman
Browse files
Options

* ./src/input/input_ext_intf.c 

  - FASTER and SLOWER now take into account the current rate.
parent 4238a153
Show whitespace changes
Inline Side-by-side
Showing with 29 additions and 21 deletions
src/input/input_ext-intf.c
View file @ fca9baf0
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* input_ext-intf.c: services to the interface * input_ext-intf.c: services to the interface
***************************************************************************** *****************************************************************************
* Copyright (C) 1998-2001 VideoLAN * Copyright (C) 1998-2001 VideoLAN
* $Id: input_ext-intf.c,v 1.46 2002/12/25 23:39:01 sam Exp $ * $Id: input_ext-intf.c,v 1.47 2003/01/21 14:15:05 hartman Exp $
* *
* Authors: Christophe Massiot <massiot@via.ecp.fr> * Authors: Christophe Massiot <massiot@via.ecp.fr>
* *
...@@ -74,52 +74,60 @@ void __input_SetStatus( vlc_object_t * p_this, int i_mode ) ...@@ -74,52 +74,60 @@ void __input_SetStatus( vlc_object_t * p_this, int i_mode )
/* If we are already going too fast, go back to default rate */ /* If we are already going too fast, go back to default rate */
if( p_input->stream.control.i_rate * 8 <= DEFAULT_RATE ) if( p_input->stream.control.i_rate * 8 <= DEFAULT_RATE )
{ {
p_input->stream.i_new_status = PLAYING_S; msg_Dbg( p_input, "can not play any faster" );
msg_Dbg( p_input, "playing at normal rate" );
} }
else else
{ {
p_input->stream.i_new_status = FORWARD_S; p_input->stream.i_new_status = FORWARD_S;
if( p_input->stream.control.i_rate < DEFAULT_RATE
&& p_input->stream.control.i_status == FORWARD_S )
{
p_input->stream.i_new_rate = p_input->stream.i_new_rate =
p_input->stream.control.i_rate / 2; p_input->stream.control.i_rate / 2;
}
else if ( p_input->stream.i_new_rate < DEFAULT_RATE )
{ {
p_input->stream.i_new_rate = DEFAULT_RATE / 2;
}
msg_Dbg( p_input, "playing at %i:1 fast forward", msg_Dbg( p_input, "playing at %i:1 fast forward",
DEFAULT_RATE / p_input->stream.i_new_rate ); DEFAULT_RATE / p_input->stream.i_new_rate );
} }
else if ( p_input->stream.i_new_rate > DEFAULT_RATE )
{
msg_Dbg( p_input, "playing at 1:%i slow motion",
p_input->stream.i_new_rate / DEFAULT_RATE );
}
else if ( p_input->stream.i_new_rate == DEFAULT_RATE )
{
p_input->stream.i_new_status = PLAYING_S;
msg_Dbg( p_input, "playing at normal rate" );
}
}
break; break;
case INPUT_STATUS_SLOWER: case INPUT_STATUS_SLOWER:
/* If we are already going too slow, go back to default rate */ /* If we are already going too slow, go back to default rate */
if( p_input->stream.control.i_rate >= 8 * DEFAULT_RATE ) if( p_input->stream.control.i_rate >= 8 * DEFAULT_RATE )
{ {
p_input->stream.i_new_status = PLAYING_S; msg_Dbg( p_input, "can not play any slower" );
msg_Dbg( p_input, "playing at normal rate" );
} }
else else
{ {
p_input->stream.i_new_status = FORWARD_S; p_input->stream.i_new_status = FORWARD_S;
if( p_input->stream.control.i_rate > DEFAULT_RATE
&& p_input->stream.control.i_status == FORWARD_S )
{
p_input->stream.i_new_rate = p_input->stream.i_new_rate =
p_input->stream.control.i_rate * 2; p_input->stream.control.i_rate * 2;
}
else if ( p_input->stream.i_new_rate < DEFAULT_RATE )
{ {
p_input->stream.i_new_rate = DEFAULT_RATE * 2; msg_Dbg( p_input, "playing at %i:1 fast forward",
DEFAULT_RATE / p_input->stream.i_new_rate );
} }
else if ( p_input->stream.i_new_rate > DEFAULT_RATE )
{
msg_Dbg( p_input, "playing at 1:%i slow motion", msg_Dbg( p_input, "playing at 1:%i slow motion",
p_input->stream.i_new_rate / DEFAULT_RATE ); p_input->stream.i_new_rate / DEFAULT_RATE );
} }
else if ( p_input->stream.i_new_rate == DEFAULT_RATE )
{
p_input->stream.i_new_status = PLAYING_S;
msg_Dbg( p_input, "playing at normal rate" );
}
}
break; break;
default: default:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment