X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fcontrol%2Frc.c;h=dbab111df25fba783f6c0ccdc5532f2d3dadadda;hb=599fbde71fba4397aa62fe81f957ee641654997c;hp=423d6dbac6639de928ac51de7d057774ea493826;hpb=5f9fc1cab05f3e0656b62ef195ac4eacad403a89;p=vlc diff --git a/modules/control/rc.c b/modules/control/rc.c index 423d6dbac6..dbab111df2 100644 --- a/modules/control/rc.c +++ b/modules/control/rc.c @@ -34,7 +34,6 @@ #include #include /* ENOMEM */ -#include #include #include @@ -48,10 +47,6 @@ #ifdef HAVE_UNISTD_H # include #endif - -#ifdef HAVE_SYS_TIME_H -# include -#endif #include #include @@ -118,14 +113,10 @@ static int Statistics ( vlc_object_t *, char const *, static int updateStatistics( intf_thread_t *, input_item_t *); /* Status Callbacks */ -static int TimeOffsetChanged( vlc_object_t *, char const *, - vlc_value_t, vlc_value_t , void * ); -static int VolumeChanged ( vlc_object_t *, char const *, - vlc_value_t, vlc_value_t, void * ); -static int StateChanged ( vlc_object_t *, char const *, - vlc_value_t, vlc_value_t, void * ); -static int RateChanged ( vlc_object_t *, char const *, - vlc_value_t, vlc_value_t, void * ); +static int VolumeChanged( vlc_object_t *, char const *, + vlc_value_t, vlc_value_t, void * ); +static int InputEvent( vlc_object_t *, char const *, + vlc_value_t, vlc_value_t, void * ); struct intf_sys_t { @@ -135,8 +126,9 @@ struct intf_sys_t /* status changes */ vlc_mutex_t status_lock; - playlist_status_t i_last_state; - playlist_t *p_playlist; + int i_last_state; + playlist_t *p_playlist; + bool b_input_buffering; #ifdef WIN32 HANDLE hConsoleIn; @@ -194,17 +186,17 @@ vlc_module_begin () set_category( CAT_INTERFACE ) set_subcategory( SUBCAT_INTERFACE_MAIN ) set_description( N_("Remote control interface") ) - add_bool( "rc-show-pos", 0, NULL, POS_TEXT, POS_LONGTEXT, true ) + add_bool( "rc-show-pos", false, NULL, POS_TEXT, POS_LONGTEXT, true ) #ifdef WIN32 - add_bool( "rc-quiet", 0, NULL, QUIET_TEXT, QUIET_LONGTEXT, false ) + add_bool( "rc-quiet", false, NULL, QUIET_TEXT, QUIET_LONGTEXT, false ) #else #if defined (HAVE_ISATTY) - add_bool( "rc-fake-tty", 0, NULL, TTY_TEXT, TTY_LONGTEXT, true ) + add_bool( "rc-fake-tty", false, NULL, TTY_TEXT, TTY_LONGTEXT, true ) #endif - add_string( "rc-unix", 0, NULL, UNIX_TEXT, UNIX_LONGTEXT, true ) + add_string( "rc-unix", NULL, NULL, UNIX_TEXT, UNIX_LONGTEXT, true ) #endif - add_string( "rc-host", 0, NULL, HOST_TEXT, HOST_LONGTEXT, true ) + add_string( "rc-host", NULL, NULL, HOST_TEXT, HOST_LONGTEXT, true ) set_capability( "interface", 20 ) @@ -223,14 +215,14 @@ static int Activate( vlc_object_t *p_this ) #ifndef WIN32 #if defined(HAVE_ISATTY) /* Check that stdin is a TTY */ - if( !config_GetInt( p_intf, "rc-fake-tty" ) && !isatty( 0 ) ) + if( !var_InheritBool( p_intf, "rc-fake-tty" ) && !isatty( 0 ) ) { msg_Warn( p_intf, "fd 0 is not a TTY" ); return VLC_EGENERIC; } #endif - psz_unix_path = config_GetPsz( p_intf, "rc-unix" ); + psz_unix_path = var_InheritString( p_intf, "rc-unix" ); if( psz_unix_path ) { int i_socket; @@ -298,7 +290,7 @@ static int Activate( vlc_object_t *p_this ) #endif /* !WIN32 */ if( ( pi_socket == NULL ) && - ( psz_host = config_GetPsz( p_intf, "rc-host" ) ) != NULL ) + ( psz_host = var_InheritString( p_intf, "rc-host" ) ) != NULL ) { vlc_url_t url; @@ -329,6 +321,7 @@ static int Activate( vlc_object_t *p_this ) p_intf->p_sys->psz_unix_path = psz_unix_path; vlc_mutex_init( &p_intf->p_sys->status_lock ); p_intf->p_sys->i_last_state = PLAYLIST_STOPPED; + p_intf->p_sys->b_input_buffering = false; /* Non-buffered stdout */ setvbuf( stdout, (char *)NULL, _IOLBF, 0 ); @@ -336,7 +329,7 @@ static int Activate( vlc_object_t *p_this ) p_intf->pf_run = Run; #ifdef WIN32 - p_intf->p_sys->b_quiet = config_GetInt( p_intf, "rc-quiet" ); + p_intf->p_sys->b_quiet = var_InheritBool( p_intf, "rc-quiet" ); if( !p_intf->p_sys->b_quiet ) { CONSOLE_INTRO_MSG; } #else CONSOLE_INTRO_MSG; @@ -446,10 +439,10 @@ static void RegisterCallbacks( intf_thread_t *p_intf ) static void Run( intf_thread_t *p_intf ) { input_thread_t * p_input = NULL; - playlist_t * p_playlist = pl_Hold( p_intf ); + playlist_t * p_playlist = pl_Get( p_intf ); char p_buffer[ MAX_LINE_LENGTH + 1 ]; - bool b_showpos = config_GetInt( p_intf, "rc-show-pos" ); + bool b_showpos = var_InheritBool( p_intf, "rc-show-pos" ); bool b_longhelp = false; int i_size = 0; @@ -465,7 +458,7 @@ static void Run( intf_thread_t *p_intf ) /* status callbacks */ /* Listen to audio volume updates */ - var_AddCallback( p_intf->p_libvlc, "volume-change", VolumeChanged, p_intf ); + var_AddCallback( p_playlist, "volume-change", VolumeChanged, p_intf ); #ifdef WIN32 /* Get the file descriptor of the console input */ @@ -486,8 +479,7 @@ static void Run( intf_thread_t *p_intf ) p_intf->p_sys->i_socket == -1 ) { p_intf->p_sys->i_socket = - net_Accept( p_intf, p_intf->p_sys->pi_socket_listen, - INTF_IDLE_SLEEP ); + net_Accept( p_intf, p_intf->p_sys->pi_socket_listen ); if( p_intf->p_sys->i_socket == -1 ) continue; } @@ -507,35 +499,21 @@ static void Run( intf_thread_t *p_intf ) msg_rc( STATUS_CHANGE "( new input: %s )", psz_uri ); free( psz_uri ); msg_rc( STATUS_CHANGE "( audio volume: %d )", - config_GetInt( p_intf, "volume" )); + (int)config_GetInt( p_intf, "volume" )); } - var_AddCallback( p_input, "state", StateChanged, p_intf ); - var_AddCallback( p_input, "rate-faster", RateChanged, p_intf ); - var_AddCallback( p_input, "rate-slower", RateChanged, p_intf ); - var_AddCallback( p_input, "rate", RateChanged, p_intf ); - var_AddCallback( p_input, "time-offset", TimeOffsetChanged, - p_intf ); - var_AddCallback( p_input, "frame-next", RateChanged, p_intf ); + var_AddCallback( p_input, "intf-event", InputEvent, p_intf ); } } else if( p_input->b_dead ) { - var_DelCallback( p_input, "state", StateChanged, p_intf ); - var_DelCallback( p_input, "rate-faster", RateChanged, p_intf ); - var_DelCallback( p_input, "rate-slower", RateChanged, p_intf ); - var_DelCallback( p_input, "rate", RateChanged, p_intf ); - var_DelCallback( p_input, "time-offset", TimeOffsetChanged, - p_intf ); - var_DelCallback( p_input, "frame-next", RateChanged, p_intf ); + var_DelCallback( p_input, "intf-event", InputEvent, p_intf ); vlc_object_release( p_input ); p_input = NULL; if( p_playlist ) { - PL_LOCK; - p_intf->p_sys->i_last_state = (int) PLAYLIST_STOPPED; + p_intf->p_sys->i_last_state = PLAYLIST_STOPPED; msg_rc( STATUS_CHANGE "( stop state: 0 )" ); - PL_UNLOCK; } } @@ -544,6 +522,8 @@ static void Run( intf_thread_t *p_intf ) { PL_LOCK; int status = playlist_Status( p_playlist ); + PL_UNLOCK; + if( p_intf->p_sys->i_last_state != status ) { if( status == PLAYLIST_STOPPED ) @@ -562,7 +542,6 @@ static void Run( intf_thread_t *p_intf ) msg_rc( STATUS_CHANGE "( pause state: 4 )" ); } } - PL_UNLOCK; } if( p_input && b_showpos ) @@ -754,45 +733,34 @@ static void Run( intf_thread_t *p_intf ) } else if( !strcmp( psz_cmd, "key" ) || !strcmp( psz_cmd, "hotkey" ) ) { - var_SetInteger( p_intf->p_libvlc, "key-pressed", - config_GetInt( p_intf, psz_arg ) ); + var_SetInteger( p_intf->p_libvlc, "key-action", + vlc_GetActionId( psz_arg ) ); } else switch( psz_cmd[0] ) { case 'f': case 'F': + { + bool fs; + + if( !strncasecmp( psz_arg, "on", 2 ) ) + var_SetBool( p_playlist, "fullscreen", fs = true ); + else if( !strncasecmp( psz_arg, "off", 3 ) ) + var_SetBool( p_playlist, "fullscreen", fs = false ); + else + fs = var_ToggleBool( p_playlist, "fullscreen" ); + if( p_input ) { - vout_thread_t *p_vout; - p_vout = input_GetVout( p_input ); - + vout_thread_t *p_vout = input_GetVout( p_input ); if( p_vout ) { - vlc_value_t val; - bool b_update = false; - var_Get( p_vout, "fullscreen", &val ); - val.b_bool = !val.b_bool; - if( !strncmp( psz_arg, "on", 2 ) - && ( val.b_bool == true ) ) - { - b_update = true; - val.b_bool = true; - } - else if( !strncmp( psz_arg, "off", 3 ) - && ( val.b_bool == false ) ) - { - b_update = true; - val.b_bool = false; - } - else if( strncmp( psz_arg, "off", 3 ) - && strncmp( psz_arg, "on", 2 ) ) - b_update = true; - if( b_update ) var_Set( p_vout, "fullscreen", val ); + var_SetBool( p_vout, "fullscreen", fs ); vlc_object_release( p_vout ); } } break; - + } case 's': case 'S': ; @@ -816,18 +784,11 @@ static void Run( intf_thread_t *p_intf ) if( p_input ) { - var_DelCallback( p_input, "state", StateChanged, p_intf ); - var_DelCallback( p_input, "rate-faster", RateChanged, p_intf ); - var_DelCallback( p_input, "rate-slower", RateChanged, p_intf ); - var_DelCallback( p_input, "rate", RateChanged, p_intf ); - var_DelCallback( p_input, "time-offset", TimeOffsetChanged, p_intf ); - var_DelCallback( p_input, "frame-next", RateChanged, p_intf ); + var_DelCallback( p_input, "intf-event", InputEvent, p_intf ); vlc_object_release( p_input ); } - pl_Release( p_intf ); - - var_DelCallback( p_intf->p_libvlc, "volume-change", VolumeChanged, p_intf ); + var_DelCallback( p_playlist, "volume-change", VolumeChanged, p_intf ); vlc_restorecancel( canc ); } @@ -931,26 +892,6 @@ static void Help( intf_thread_t *p_intf, bool b_longhelp) /******************************************************************** * Status callback routines ********************************************************************/ -static int TimeOffsetChanged( vlc_object_t *p_this, char const *psz_cmd, - vlc_value_t oldval, vlc_value_t newval, void *p_data ) -{ - VLC_UNUSED(p_this); VLC_UNUSED(psz_cmd); - VLC_UNUSED(oldval); VLC_UNUSED(newval); - intf_thread_t *p_intf = (intf_thread_t*)p_data; - input_thread_t *p_input = - playlist_CurrentInput( p_intf->p_sys->p_playlist ); - - if( p_input ) - { - vlc_mutex_lock( &p_intf->p_sys->status_lock ); - msg_rc( STATUS_CHANGE "( time-offset: %"PRId64"s )", - (var_GetTime( p_input, "time-offset" )/1000000) ); - vlc_mutex_unlock( &p_intf->p_sys->status_lock ); - vlc_object_release( p_input ); - } - return VLC_SUCCESS; -} - static int VolumeChanged( vlc_object_t *p_this, char const *psz_cmd, vlc_value_t oldval, vlc_value_t newval, void *p_data ) { @@ -959,61 +900,95 @@ static int VolumeChanged( vlc_object_t *p_this, char const *psz_cmd, vlc_mutex_lock( &p_intf->p_sys->status_lock ); msg_rc( STATUS_CHANGE "( audio volume: %d )", - config_GetInt( p_this, "volume") ); + (int)config_GetInt( p_this, "volume") ); vlc_mutex_unlock( &p_intf->p_sys->status_lock ); return VLC_SUCCESS; } -static int StateChanged( vlc_object_t *p_this, char const *psz_cmd, - vlc_value_t oldval, vlc_value_t newval, void *p_data ) +static void StateChanged( intf_thread_t *p_intf, input_thread_t *p_input ) { - VLC_UNUSED(p_this); VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval); - intf_thread_t *p_intf = (intf_thread_t*)p_data; - playlist_t *p_playlist = p_intf->p_sys->p_playlist; - int i_status; - char cmd[6]; + playlist_t *p_playlist = p_intf->p_sys->p_playlist; PL_LOCK; - i_status = playlist_Status( p_playlist ); + const int i_status = playlist_Status( p_playlist ); PL_UNLOCK; + /* */ + const char *psz_cmd; switch( i_status ) { case PLAYLIST_STOPPED: - strcpy( cmd, "stop" ); + psz_cmd = "stop"; break; case PLAYLIST_RUNNING: - strcpy( cmd, "play" ); + psz_cmd = "play"; break; case PLAYLIST_PAUSED: - strcpy( cmd, "pause" ); + psz_cmd = "pause"; break; default: - cmd[0] = '\0'; - } /* var_GetInteger( p_input, "state" ) */ - vlc_mutex_lock( &p_intf->p_sys->status_lock ); - msg_rc( STATUS_CHANGE "( %s state: %d ): %s", cmd, newval.i_int, - ppsz_input_state[ newval.i_int ] ); + psz_cmd = ""; + break; + } + /* */ + const int i_state = var_GetInteger( p_input, "state" ); + + vlc_mutex_lock( &p_intf->p_sys->status_lock ); + msg_rc( STATUS_CHANGE "( %s state: %d ): %s", psz_cmd, + i_state, ppsz_input_state[i_state] ); + vlc_mutex_unlock( &p_intf->p_sys->status_lock ); +} +static void RateChanged( intf_thread_t *p_intf, + input_thread_t *p_input ) +{ + vlc_mutex_lock( &p_intf->p_sys->status_lock ); + msg_rc( STATUS_CHANGE "( new rate: %.3f )", + var_GetFloat( p_input, "rate" ) ); + vlc_mutex_unlock( &p_intf->p_sys->status_lock ); +} +static void PositionChanged( intf_thread_t *p_intf, + input_thread_t *p_input ) +{ + vlc_mutex_lock( &p_intf->p_sys->status_lock ); + if( p_intf->p_sys->b_input_buffering ) + msg_rc( STATUS_CHANGE "( time: %"PRId64"s )", + (var_GetTime( p_input, "time" )/1000000) ); + p_intf->p_sys->b_input_buffering = false; + vlc_mutex_unlock( &p_intf->p_sys->status_lock ); +} +static void CacheChanged( intf_thread_t *p_intf ) +{ + vlc_mutex_lock( &p_intf->p_sys->status_lock ); + p_intf->p_sys->b_input_buffering = true; vlc_mutex_unlock( &p_intf->p_sys->status_lock ); - return VLC_SUCCESS; } -static int RateChanged( vlc_object_t *p_this, char const *psz_cmd, - vlc_value_t oldval, vlc_value_t newval, void *p_data ) +static int InputEvent( vlc_object_t *p_this, char const *psz_cmd, + vlc_value_t oldval, vlc_value_t newval, void *p_data ) { - VLC_UNUSED(p_this); VLC_UNUSED(psz_cmd); - VLC_UNUSED(oldval); VLC_UNUSED(newval); - intf_thread_t *p_intf = (intf_thread_t*)p_data; - input_thread_t *p_input = playlist_CurrentInput( p_intf->p_sys->p_playlist ); + VLC_UNUSED(psz_cmd); + VLC_UNUSED(oldval); + input_thread_t *p_input = (input_thread_t*)p_this; + intf_thread_t *p_intf = p_data; - if( p_input ) + switch( newval.i_int ) { - vlc_mutex_lock( &p_intf->p_sys->status_lock ); - msg_rc( STATUS_CHANGE "( new rate: %d )", - var_GetInteger( p_input, "rate" ) ); - vlc_mutex_unlock( &p_intf->p_sys->status_lock ); - vlc_object_release( p_input ); + case INPUT_EVENT_STATE: + case INPUT_EVENT_DEAD: + StateChanged( p_intf, p_input ); + break; + case INPUT_EVENT_RATE: + RateChanged( p_intf, p_input ); + break; + case INPUT_EVENT_POSITION: + PositionChanged( p_intf, p_input ); + break; + case INPUT_EVENT_CACHE: + CacheChanged( p_intf ); + break; + default: + break; } return VLC_SUCCESS; } @@ -1065,9 +1040,9 @@ static int Input( vlc_object_t *p_this, char const *psz_cmd, { if( var_GetBool( p_input, "can-rate" ) ) { - 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 ); + float f_rate = var_GetFloat( p_input, "rate" ); + f_rate = (f_rate < 0) ? -f_rate : f_rate * 2; + var_SetFloat( p_input, "rate", f_rate ); } else { @@ -1079,9 +1054,9 @@ static int Input( vlc_object_t *p_this, char const *psz_cmd, { 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 ); + float f_rate = var_GetFloat( p_input, "rate" ); + f_rate = (f_rate > 0) ? -f_rate : f_rate * 2; + var_SetFloat( p_input, "rate", f_rate ); } else { @@ -1101,7 +1076,7 @@ static int Input( vlc_object_t *p_this, char const *psz_cmd, } else if ( !strcmp( psz_cmd, "normal" ) ) { - var_SetInteger( p_input, "rate", INPUT_RATE_DEFAULT ); + var_SetFloat( p_input, "rate", 1. ); i_error = VLC_SUCCESS; } else if ( !strcmp( psz_cmd, "frame" ) ) @@ -1209,10 +1184,12 @@ static int Input( vlc_object_t *p_this, char const *psz_cmd, for ( i = 0; i < val.p_list->i_count; i++ ) { if ( i_value == val.p_list->p_values[i].i_int ) - msg_rc( "| %i - %s *", val.p_list->p_values[i].i_int, + msg_rc( "| %"PRId64" - %s *", + val.p_list->p_values[i].i_int, text.p_list->p_values[i].psz_string ); else - msg_rc( "| %i - %s", val.p_list->p_values[i].i_int, + msg_rc( "| %"PRId64" - %s", + val.p_list->p_values[i].i_int, text.p_list->p_values[i].psz_string ); } var_FreeList( &val, &text ); @@ -1349,6 +1326,7 @@ static int Playlist( vlc_object_t *p_this, char const *psz_cmd, } else if (!strcmp( psz_cmd, "goto" ) ) { + PL_LOCK; int i_pos = atoi( newval.psz_string ); /* The playlist stores 2 times the same item: onelevel & category */ int i_size = p_playlist->items.i_size / 2; @@ -1361,11 +1339,12 @@ static int Playlist( vlc_object_t *p_this, char const *psz_cmd, p_item = p_parent = p_playlist->items.p_elems[i_pos*2-1]; while( p_parent->p_parent ) p_parent = p_parent->p_parent; - playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, pl_Unlocked, + playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, pl_Locked, p_parent, p_item ); } else msg_rc( _("Playlist has only %d elements"), i_size ); + PL_UNLOCK; } else if( !strcmp( psz_cmd, "stop" ) ) { @@ -1419,8 +1398,10 @@ static int Playlist( vlc_object_t *p_this, char const *psz_cmd, else if( !strcmp( psz_cmd, "sort" )) { + PL_LOCK; playlist_RecursiveNodeSort( p_playlist, p_playlist->p_root_onelevel, SORT_ARTIST, ORDER_NORMAL ); + PL_UNLOCK; } else if( !strcmp( psz_cmd, "status" ) ) { @@ -1433,10 +1414,12 @@ static int Playlist( vlc_object_t *p_this, char const *psz_cmd, msg_rc( STATUS_CHANGE "( new input: %s )", psz_uri ); free( psz_uri ); msg_rc( STATUS_CHANGE "( audio volume: %d )", - config_GetInt( p_intf, "volume" )); + (int)config_GetInt( p_intf, "volume" )); PL_LOCK; - switch( playlist_Status(p_playlist) ) + int status = playlist_Status(p_playlist); + PL_UNLOCK; + switch( status ) { case PLAYLIST_STOPPED: msg_rc( STATUS_CHANGE "( stop state: 5 )" ); @@ -1451,7 +1434,6 @@ static int Playlist( vlc_object_t *p_this, char const *psz_cmd, msg_rc( STATUS_CHANGE "( unknown state: -1 )" ); break; } - PL_UNLOCK; vlc_object_release( p_input ); } } @@ -1573,12 +1555,12 @@ static int VolumeMove( vlc_object_t *p_this, char const *psz_cmd, if ( !strcmp(psz_cmd, "volup") ) { - if ( aout_VolumeUp( p_this, i_nb_steps, &i_volume ) < 0 ) + if ( aout_VolumeUp( p_intf->p_sys->p_playlist, i_nb_steps, &i_volume ) < 0 ) i_error = VLC_EGENERIC; } else { - if ( aout_VolumeDown( p_this, i_nb_steps, &i_volume ) < 0 ) + if ( aout_VolumeDown( p_intf->p_sys->p_playlist, i_nb_steps, &i_volume ) < 0 ) i_error = VLC_EGENERIC; } osd_Volume( p_this ); @@ -1597,7 +1579,7 @@ static int VideoConfig( vlc_object_t *p_this, char const *psz_cmd, playlist_CurrentInput( p_intf->p_sys->p_playlist ); vout_thread_t * p_vout; const char * psz_variable = NULL; - int i_error; + int i_error = VLC_SUCCESS; if( !p_input ) return VLC_ENOOBJ; @@ -1643,7 +1625,7 @@ static int VideoConfig( vlc_object_t *p_this, char const *psz_cmd, } else if( !strcmp( psz_cmd, "snapshot" ) ) { - i_error = var_SetBool( p_vout, psz_variable, true ); + var_TriggerCallback( p_vout, psz_variable ); } else { @@ -1711,8 +1693,6 @@ static int VideoConfig( vlc_object_t *p_this, char const *psz_cmd, msg_rc( "+----[ end of %s ]", val_name.psz_string ); free( val_name.psz_string ); - - i_error = VLC_SUCCESS; } vlc_object_release( p_vout ); return i_error; @@ -1783,10 +1763,10 @@ static int AudioConfig( vlc_object_t *p_this, char const *psz_cmd, for ( i = 0; i < val.p_list->i_count; i++ ) { if ( i_value == val.p_list->p_values[i].i_int ) - msg_rc( "| %i - %s *", val.p_list->p_values[i].i_int, + msg_rc( "| %"PRId64" - %s *", val.p_list->p_values[i].i_int, text.p_list->p_values[i].psz_string ); else - msg_rc( "| %i - %s", val.p_list->p_values[i].i_int, + msg_rc( "| %"PRId64" - %s", val.p_list->p_values[i].i_int, text.p_list->p_values[i].psz_string ); } var_FreeList( &val, &text ); @@ -1871,7 +1851,7 @@ static int Menu( vlc_object_t *p_this, char const *psz_cmd, static int Statistics ( vlc_object_t *p_this, char const *psz_cmd, vlc_value_t oldval, vlc_value_t newval, void *p_data ) { - VLC_UNUSED(oldval); VLC_UNUSED(newval); VLC_UNUSED(p_data); + VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval); VLC_UNUSED(newval); VLC_UNUSED(p_data); intf_thread_t *p_intf = (intf_thread_t*)p_this; input_thread_t *p_input = playlist_CurrentInput( p_intf->p_sys->p_playlist ); @@ -1879,20 +1859,7 @@ static int Statistics ( vlc_object_t *p_this, char const *psz_cmd, if( !p_input ) return VLC_ENOOBJ; - if( !strcmp( psz_cmd, "stats" ) ) - { - vlc_mutex_lock( &input_GetItem(p_input)->lock ); - updateStatistics( p_intf, input_GetItem(p_input) ); - vlc_mutex_unlock( &input_GetItem(p_input)->lock ); - } - /* - * sanity check - */ - else - { - msg_rc("%s", _("Unknown command!") ); - } - + updateStatistics( p_intf, input_GetItem(p_input) ); vlc_object_release( p_input ); return VLC_SUCCESS; } @@ -1901,48 +1868,55 @@ static int updateStatistics( intf_thread_t *p_intf, input_item_t *p_item ) { if( !p_item ) return VLC_EGENERIC; + vlc_mutex_lock( &p_item->lock ); vlc_mutex_lock( &p_item->p_stats->lock ); msg_rc( "+----[ begin of statistical info ]" ); /* Input */ msg_rc("%s", _("+-[Incoming]")); - msg_rc(_("| input bytes read : %8.0f kB"), - (float)(p_item->p_stats->i_read_bytes)/1000 ); + msg_rc(_("| input bytes read : %8.0f KiB"), + (float)(p_item->p_stats->i_read_bytes)/1024 ); msg_rc(_("| input bitrate : %6.0f kb/s"), (float)(p_item->p_stats->f_input_bitrate)*8000 ); - msg_rc(_("| demux bytes read : %8.0f kB"), - (float)(p_item->p_stats->i_demux_read_bytes)/1000 ); + msg_rc(_("| demux bytes read : %8.0f KiB"), + (float)(p_item->p_stats->i_demux_read_bytes)/1024 ); msg_rc(_("| demux bitrate : %6.0f kb/s"), (float)(p_item->p_stats->f_demux_bitrate)*8000 ); + msg_rc(_("| demux corrupted : %5"PRIi64), + p_item->p_stats->i_demux_corrupted ); + msg_rc(_("| discontinuities : %5"PRIi64), + p_item->p_stats->i_demux_discontinuity ); msg_rc("|"); /* Video */ msg_rc("%s", _("+-[Video Decoding]")); - msg_rc(_("| video decoded : %5i"), + msg_rc(_("| video decoded : %5"PRIi64), p_item->p_stats->i_decoded_video ); - msg_rc(_("| frames displayed : %5i"), + msg_rc(_("| frames displayed : %5"PRIi64), p_item->p_stats->i_displayed_pictures ); - msg_rc(_("| frames lost : %5i"), + msg_rc(_("| frames lost : %5"PRIi64), p_item->p_stats->i_lost_pictures ); msg_rc("|"); /* Audio*/ msg_rc("%s", _("+-[Audio Decoding]")); - msg_rc(_("| audio decoded : %5i"), + msg_rc(_("| audio decoded : %5"PRIi64), p_item->p_stats->i_decoded_audio ); - msg_rc(_("| buffers played : %5i"), + msg_rc(_("| buffers played : %5"PRIi64), p_item->p_stats->i_played_abuffers ); - msg_rc(_("| buffers lost : %5i"), + msg_rc(_("| buffers lost : %5"PRIi64), p_item->p_stats->i_lost_abuffers ); msg_rc("|"); /* Sout */ msg_rc("%s", _("+-[Streaming]")); - msg_rc(_("| packets sent : %5i"), p_item->p_stats->i_sent_packets ); - msg_rc(_("| bytes sent : %8.0f kB"), - (float)(p_item->p_stats->i_sent_bytes)/1000 ); + msg_rc(_("| packets sent : %5"PRIi64), + p_item->p_stats->i_sent_packets ); + msg_rc(_("| bytes sent : %8.0f KiB"), + (float)(p_item->p_stats->i_sent_bytes)/1024 ); msg_rc(_("| sending bitrate : %6.0f kb/s"), (float)(p_item->p_stats->f_send_bitrate*8)*1000 ); msg_rc("|"); msg_rc( "+----[ end of statistical info ]" ); vlc_mutex_unlock( &p_item->p_stats->lock ); + vlc_mutex_unlock( &p_item->lock ); return VLC_SUCCESS; } @@ -2121,7 +2095,7 @@ static input_item_t *parse_MRL( intf_thread_t *p_intf, char *psz_mrl ) else if( *psz_item ) { i_options++; - ppsz_options = realloc( ppsz_options, i_options * sizeof(char *) ); + ppsz_options = xrealloc( ppsz_options, i_options * sizeof(char *) ); ppsz_options[i_options - 1] = &psz_item[1]; }