Skip to content

V
vlc-1.1
Commit 2c5cd248 authored by Jean-Paul Saman's avatar Jean-Paul Saman
Browse files
Options

Simplify rc stats command

parent daebd34f
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 14 deletions
modules/control/rc.c
View file @ 2c5cd248
...@@ -126,7 +126,6 @@ struct intf_sys_t ...@@ -126,7 +126,6 @@ struct intf_sys_t
/* status changes */ /* status changes */
vlc_mutex_t status_lock; vlc_mutex_t status_lock;
playlist_status_t i_last_state; playlist_status_t i_last_state;
vlc_bool_t b_statistics;
#ifdef WIN32 #ifdef WIN32
HANDLE hConsoleIn; HANDLE hConsoleIn;
...@@ -324,7 +323,6 @@ static int Activate( vlc_object_t *p_this ) ...@@ -324,7 +323,6 @@ static int Activate( vlc_object_t *p_this )
p_intf->p_sys->psz_unix_path = psz_unix_path; p_intf->p_sys->psz_unix_path = psz_unix_path;
vlc_mutex_init( p_intf, &p_intf->p_sys->status_lock ); vlc_mutex_init( p_intf, &p_intf->p_sys->status_lock );
p_intf->p_sys->i_last_state = PLAYLIST_STOPPED; p_intf->p_sys->i_last_state = PLAYLIST_STOPPED;
p_intf->p_sys->b_statistics = VLC_FALSE;
/* Non-buffered stdout */ /* Non-buffered stdout */
setvbuf( stdout, (char *)NULL, _IOLBF, 0 ); setvbuf( stdout, (char *)NULL, _IOLBF, 0 );
...@@ -583,13 +581,6 @@ static void Run( intf_thread_t *p_intf ) ...@@ -583,13 +581,6 @@ static void Run( intf_thread_t *p_intf )
} }
} }
if( p_input && p_intf->p_sys->b_statistics )
{
vlc_mutex_lock( &input_GetItem(p_input)->lock );
updateStatistics( p_intf, input_GetItem(p_input) );
vlc_mutex_unlock( &input_GetItem(p_input)->lock );
}
/* Is there something to do? */ /* Is there something to do? */
if( !b_complete ) continue; if( !b_complete ) continue;
...@@ -1959,11 +1950,9 @@ static int Statistics ( vlc_object_t *p_this, char const *psz_cmd, ...@@ -1959,11 +1950,9 @@ static int Statistics ( vlc_object_t *p_this, char const *psz_cmd,
if( !strcmp( psz_cmd, "stats" ) ) if( !strcmp( psz_cmd, "stats" ) )
{ {
p_intf->p_sys->b_statistics = !p_intf->p_sys->b_statistics; vlc_mutex_lock( &input_GetItem(p_input)->lock );
if( p_intf->p_sys->b_statistics ) updateStatistics( p_intf, input_GetItem(p_input) );
msg_rc(_("statistics update on")); vlc_mutex_unlock( &input_GetItem(p_input)->lock );
else
msg_rc(_("statistics update off"));
} }
/* /*
* sanity check * sanity check
......
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