#endif
#include <vlc_common.h>
+#include <assert.h>
+#include <math.h>
#include <stdio.h>
#include <stdlib.h>
var_Change( p_input, "state", VLC_VAR_SETVALUE, &val, NULL );
/* Rate */
- var_Create( p_input, "rate", VLC_VAR_INTEGER );
- val.i_int = p_input->p->i_rate;
+ var_Create( p_input, "rate", VLC_VAR_FLOAT );
+ val.f_float = (float)INPUT_RATE_DEFAULT / (float)p_input->p->i_rate;
var_Change( p_input, "rate", VLC_VAR_SETVALUE, &val, NULL );
var_Create( p_input, "rate-slower", VLC_VAR_VOID );
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 );
val.i_time = 0;
var_Change( p_input, "length", VLC_VAR_SETVALUE, &val, NULL );
+ var_Create( p_input, "bit-rate", VLC_VAR_INTEGER );
+ var_Create( p_input, "sample-rate", VLC_VAR_INTEGER );
+
if( !p_input->b_preparsing )
{
/* Special "intf-event" variable. */
*****************************************************************************/
void input_ControlVarStop( input_thread_t *p_input )
{
- InputDelCallbacks( p_input, p_input_callbacks );
+ if( !p_input->b_preparsing )
+ InputDelCallbacks( p_input, p_input_callbacks );
if( p_input->p->i_title > 0 )
{
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 */
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");
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 ||
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
{
+ /* 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;
}
void *p_data )
{
input_thread_t *p_input = (input_thread_t*)p_this;
- vlc_value_t val, length;
VLC_UNUSED(oldval); VLC_UNUSED(p_data);
if( !strcmp( psz_cmd, "position-offset" ) )
{
- val.f_float = var_GetFloat( p_input, "position" ) + newval.f_float;
- if( val.f_float < 0.0 ) val.f_float = 0.0;
- if( val.f_float > 1.0 ) val.f_float = 1.0;
-
- input_ControlPush( p_input, INPUT_CONTROL_SET_POSITION_OFFSET, &newval );
+ float f_position = var_GetFloat( p_input, "position" ) + newval.f_float;
+ if( f_position < 0.0 )
+ f_position = 0.0;
+ else if( f_position > 1.0 )
+ f_position = 1.0;
+ var_SetFloat( p_this, "position", f_position );
}
else
{
- val.f_float = newval.f_float;
- input_ControlPush( p_input, INPUT_CONTROL_SET_POSITION, &newval );
- }
+ /* Update "length" for better intf behavour */
+ const mtime_t i_length = var_GetTime( p_input, "length" );
+ if( i_length > 0 && newval.f_float >= 0.0 && newval.f_float <= 1.0 )
+ {
+ vlc_value_t val;
- /* Update "position" for better intf behavour */
- var_Get( p_input, "length", &length );
- if( length.i_time > 0 && val.f_float >= 0.0 && val.f_float <= 1.0 )
- {
- val.i_time = length.i_time * val.f_float;
- var_Change( p_input, "time", VLC_VAR_SETVALUE, &val, NULL );
- }
+ val.i_time = i_length * newval.f_float;
+ var_Change( p_input, "time", VLC_VAR_SETVALUE, &val, NULL );
+ }
+ /* */
+ input_ControlPush( p_input, INPUT_CONTROL_SET_POSITION, &newval );
+ }
return VLC_SUCCESS;
}
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
input_thread_t *p_input = (input_thread_t*)p_this;
- vlc_value_t val, length;
VLC_UNUSED(oldval); VLC_UNUSED(p_data);
if( !strcmp( psz_cmd, "time-offset" ) )
{
- val.i_time = var_GetTime( p_input, "time" ) + newval.i_time;
- if( val.i_time < 0 ) val.i_time = 0;
- input_ControlPush( p_input, INPUT_CONTROL_SET_TIME_OFFSET, &newval );
+ mtime_t i_time = var_GetTime( p_input, "time" ) + newval.i_time;
+ if( i_time < 0 )
+ i_time = 0;
+ var_SetTime( p_this, "time", i_time );
}
else
{
- val.i_time = newval.i_time;
- input_ControlPush( p_input, INPUT_CONTROL_SET_TIME, &newval );
- }
+ /* Update "position" for better intf behavour */
+ const mtime_t i_length = var_GetTime( p_input, "length" );
+ if( i_length > 0 && newval.i_time >= 0 && newval.i_time <= i_length )
+ {
+ vlc_value_t val;
- /* Update "position" for better intf behavour */
- var_Get( p_input, "length", &length );
- if( length.i_time > 0 && val.i_time >= 0 && val.i_time <= length.i_time )
- {
- val.f_float = (double)val.i_time/(double)length.i_time;
- var_Change( p_input, "position", VLC_VAR_SETVALUE, &val, NULL );
- }
+ val.f_float = (double)newval.i_time/(double)i_length;
+ var_Change( p_input, "position", VLC_VAR_SETVALUE, &val, NULL );
+ }
+ /* */
+ input_ControlPush( p_input, INPUT_CONTROL_SET_TIME, &newval );
+ }
return VLC_SUCCESS;
}
projects / vlc / blobdiff