X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcontrol%2Frc.c;h=5be18fa1a53c422ea31369fa9cb03f1c8be83ecf;hb=a82fd8f9dd412c48d3989bb5ae99c4153edd9ea8;hp=4d1df45ab05e993a53fa8d6c8dad5815b5d24203;hpb=c90be618be0423fc9277ac77dbad2f09f0605017;p=vlc diff --git a/modules/control/rc.c b/modules/control/rc.c index 4d1df45ab0..5be18fa1a5 100644 --- a/modules/control/rc.c +++ b/modules/control/rc.c @@ -1,7 +1,7 @@ /***************************************************************************** * rc.c : remote control stdin/stdout module for vlc ***************************************************************************** - * Copyright (C) 2004 - 2005 the VideoLAN team + * Copyright (C) 2004-2007 the VideoLAN team * $Id$ * * Author: Peter Surda @@ -25,13 +25,13 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif -#include /* malloc(), free() */ -#include +#include #include /* ENOMEM */ -#include #include #include @@ -99,7 +99,13 @@ static int AudioConfig ( vlc_object_t *, char const *, vlc_value_t, vlc_value_t, void * ); static int Menu ( vlc_object_t *, char const *, vlc_value_t, vlc_value_t, void * ); -static void checkUpdates( intf_thread_t *p_intf, char *psz_arg ); +static int Statistics ( vlc_object_t *, char const *, + vlc_value_t, vlc_value_t, void * ); + +static int updateStatistics( intf_thread_t *, input_item_t *); +#ifdef UPDATE_CHECK +static void checkUpdates( intf_thread_t *p_intf ); +#endif /* Status Callbacks */ static int TimeOffsetChanged( vlc_object_t *, char const *, @@ -120,6 +126,7 @@ struct intf_sys_t /* status changes */ vlc_mutex_t status_lock; playlist_status_t i_last_state; + vlc_bool_t b_statistics; #ifdef WIN32 HANDLE hConsoleIn; @@ -127,10 +134,7 @@ struct intf_sys_t #endif }; -#ifdef HAVE_VARIADIC_MACROS -# define msg_rc( psz_format, args... ) \ - __msg_rc( p_intf, psz_format, ## args ) -#endif +#define msg_rc( ... ) __msg_rc( p_intf, __VA_ARGS__ ) static void __msg_rc( intf_thread_t *p_intf, const char *psz_fmt, ... ) { @@ -195,6 +199,7 @@ vlc_module_begin(); add_string( "rc-host", 0, NULL, HOST_TEXT, HOST_LONGTEXT, VLC_TRUE ); set_capability( "interface", 20 ); + set_callbacks( Activate, Deactivate ); vlc_module_end(); @@ -235,7 +240,7 @@ static int Activate( vlc_object_t *p_this ) if( (i_socket = socket( AF_LOCAL, SOCK_STREAM, 0 ) ) < 0 ) { - msg_Warn( p_intf, "can't open socket: %s", strerror(errno) ); + msg_Warn( p_intf, "can't open socket: %m" ); free( psz_unix_path ); return VLC_EGENERIC; } @@ -254,8 +259,8 @@ static int Activate( vlc_object_t *p_this ) if (bind (i_socket, (struct sockaddr *)&addr, sizeof (addr))) { - msg_Err (p_intf, "cannot bind UNIX socket at %s: %s", - psz_unix_path, strerror (errno)); + msg_Err (p_intf, "cannot bind UNIX socket at %s: %m", + psz_unix_path); free (psz_unix_path); net_Close (i_socket); return VLC_EGENERIC; @@ -264,7 +269,7 @@ static int Activate( vlc_object_t *p_this ) if( listen( i_socket, 1 ) ) { - msg_Warn( p_intf, "can't listen on socket: %s", strerror(errno)); + msg_Warn( p_intf, "can't listen on socket: %m"); free( psz_unix_path ); net_Close( i_socket ); return VLC_EGENERIC; @@ -319,6 +324,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_intf->p_sys->status_lock ); p_intf->p_sys->i_last_state = PLAYLIST_STOPPED; + p_intf->p_sys->b_statistics = VLC_FALSE; /* Non-buffered stdout */ setvbuf( stdout, (char *)NULL, _IOLBF, 0 ); @@ -372,6 +378,7 @@ static void RegisterCallbacks( intf_thread_t *p_intf ) ADD( "add", STRING, Playlist ) ADD( "repeat", STRING, Playlist ) ADD( "loop", STRING, Playlist ) + ADD( "random", STRING, Playlist ) ADD( "enqueue", STRING, Playlist ) ADD( "playlist", VOID, Playlist ) ADD( "sort", VOID, Playlist ) @@ -410,6 +417,7 @@ static void RegisterCallbacks( intf_thread_t *p_intf ) ADD( "vratio", STRING, VideoConfig ) ADD( "vcrop", STRING, VideoConfig ) ADD( "vzoom", STRING, VideoConfig ) + ADD( "snapshot", VOID, VideoConfig ) /* audio commands */ ADD( "volume", STRING, Volume ) @@ -418,6 +426,9 @@ static void RegisterCallbacks( intf_thread_t *p_intf ) ADD( "adev", STRING, AudioConfig ) ADD( "achan", STRING, AudioConfig ) + /* misc menu commands */ + ADD( "stats", BOOL, Statistics ) + #undef ADD } @@ -500,8 +511,10 @@ static void Run( intf_thread_t *p_intf ) { if( !p_input->b_dead || !p_input->b_die ) { - msg_rc( STATUS_CHANGE "( new input: %s )", - input_GetItem(p_input)->psz_uri ); + char *psz_uri = + input_item_GetURI( input_GetItem( p_input ) ); + msg_rc( STATUS_CHANGE "( new input: %s )", psz_uri ); + free( psz_uri ); msg_rc( STATUS_CHANGE "( audio volume: %d )", config_GetInt( p_intf, "volume" )); } @@ -570,10 +583,16 @@ 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? */ if( !b_complete ) continue; - /* Skip heading spaces */ psz_cmd = p_buffer; while( *psz_cmd == ' ' ) @@ -748,10 +767,12 @@ static void Run( intf_thread_t *p_intf ) Help( p_intf, b_longhelp ); } +#ifdef UPDATE_CHECK else if( !strcmp( psz_cmd, "check-updates" ) ) { - checkUpdates( p_intf, psz_arg ); + checkUpdates( p_intf ); } +#endif else if( !strcmp( psz_cmd, "key" ) || !strcmp( psz_cmd, "hotkey" ) ) { var_SetInteger( p_intf->p_libvlc, "key-pressed", @@ -848,8 +869,9 @@ static void Help( intf_thread_t *p_intf, vlc_bool_t b_longhelp) msg_rc(_("| prev . . . . . . . . . . . . previous playlist item")); msg_rc(_("| goto . . . . . . . . . . . . . . goto item at index")); msg_rc(_("| repeat [on|off] . . . . toggle playlist item repeat")); - msg_rc(_("| loop [on|off] . . . . . . toggle playlist item loop")); - msg_rc(_("| clear . . . . . . . . . . . . . clear the playlist")); + msg_rc(_("| loop [on|off] . . . . . . . . . toggle playlist loop")); + msg_rc(_("| random [on|off] . . . . . . . toggle random jumping")); + msg_rc(_("| clear . . . . . . . . . . . . . . clear the playlist")); msg_rc(_("| status . . . . . . . . . . . current playlist status")); msg_rc(_("| title [X] . . . . . . set/get title in current item")); msg_rc(_("| title_n . . . . . . . . next title in current item")); @@ -867,6 +889,7 @@ static void Help( intf_thread_t *p_intf, vlc_bool_t b_longhelp) msg_rc(_("| normal . . . . . . . . . . normal playing of stream")); msg_rc(_("| f [on|off] . . . . . . . . . . . . toggle fullscreen")); msg_rc(_("| info . . . . . information about the current stream")); + msg_rc(_("| stats . . . . . . . . show statistical information")); msg_rc(_("| get_time . . seconds elapsed since stream's beginning")); msg_rc(_("| is_playing . . . . 1 if a stream plays, 0 otherwise")); msg_rc(_("| get_title . . . . . the title of the current stream")); @@ -882,6 +905,7 @@ static void Help( intf_thread_t *p_intf, vlc_bool_t b_longhelp) msg_rc(_("| vratio [X] . . . . . . . set/get video aspect ratio")); msg_rc(_("| vcrop [X] . . . . . . . . . . . set/get video crop")); msg_rc(_("| vzoom [X] . . . . . . . . . . . set/get video zoom")); + msg_rc(_("| snapshot . . . . . . . . . . . . take video snapshot")); msg_rc(_("| strack [X] . . . . . . . . . set/get subtitles track")); msg_rc(_("| key [hotkey name] . . . . . . simulate hotkey press")); msg_rc(_("| menu . . [on|off|up|down|left|right|select] use menu")); @@ -918,9 +942,11 @@ static void Help( intf_thread_t *p_intf, vlc_bool_t b_longhelp) msg_rc(_("| @name mosaic-cols #. . . . . . . . . . .number of cols")); msg_rc(_("| @name mosaic-order id(,id)* . . . . order of pictures ")); msg_rc(_("| @name mosaic-keep-aspect-ratio {0,1} . . .aspect ratio")); +#ifdef UPDATE_CHECK msg_rc( "| "); msg_rc(_("| check-updates [newer] [equal] [older]\n" "| [undef] [info] [source] [binary] [plugin]")); +#endif msg_rc( "| "); } msg_rc(_("| help . . . . . . . . . . . . . . . this help message")); @@ -978,21 +1004,20 @@ static int StateChanged( vlc_object_t *p_this, char const *psz_cmd, p_playlist = vlc_object_find( p_input, VLC_OBJECT_PLAYLIST, FIND_PARENT ); if( p_playlist ) { - char cmd[5] = ""; + char cmd[6]; switch( p_playlist->status.i_status ) { case PLAYLIST_STOPPED: - strncpy( &cmd[0], "stop", 4); - cmd[4] = '\0'; + strcpy( cmd, "stop" ); break; case PLAYLIST_RUNNING: - strncpy( &cmd[0], "play", 4); - cmd[4] = '\0'; + strcpy( cmd, "play" ); break; case PLAYLIST_PAUSED: - strncpy( &cmd[0], "pause", 5); - cmd[5] = '\0'; + strcpy( cmd, "pause" ); break; + default: + cmd[0] = '\0'; } /* var_GetInteger( p_input, "state" ) */ msg_rc( STATUS_CHANGE "( %s state: %d )", &cmd[0], newval.i_int ); vlc_object_release( p_playlist ); @@ -1083,14 +1108,12 @@ static int Input( vlc_object_t *p_this, char const *psz_cmd, } else if ( !strcmp( psz_cmd, "faster" ) ) { - val.b_bool = VLC_TRUE; var_Set( p_input, "rate-faster", val ); vlc_object_release( p_input ); return VLC_SUCCESS; } else if ( !strcmp( psz_cmd, "slower" ) ) { - val.b_bool = VLC_TRUE; var_Set( p_input, "rate-slower", val ); vlc_object_release( p_input ); return VLC_SUCCESS; @@ -1342,10 +1365,47 @@ static int Playlist( vlc_object_t *p_this, char const *psz_cmd, } msg_rc( "Setting loop to %d", val.b_bool ); } + else if( !strcmp( psz_cmd, "random" ) ) + { + vlc_bool_t b_update = VLC_TRUE; + + var_Get( p_playlist, "random", &val ); + + if( strlen( newval.psz_string ) > 0 ) + { + if ( ( !strncmp( newval.psz_string, "on", 2 ) && ( val.b_bool == VLC_TRUE ) ) || + ( !strncmp( newval.psz_string, "off", 3 ) && ( val.b_bool == VLC_FALSE ) ) ) + { + b_update = VLC_FALSE; + } + } + + if ( b_update ) + { + val.b_bool = !val.b_bool; + var_Set( p_playlist, "random", val ); + } + msg_rc( "Setting random to %d", val.b_bool ); + } else if (!strcmp( psz_cmd, "goto" ) ) { - msg_rc( _("goto is deprecated" ) ); - msg_Err( p_playlist, "goto is deprecated" ); + 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; + + if( i_pos <= 0 ) + msg_rc( _("Error: `goto' needs an argument greater than zero.") ); + else if( i_pos <= i_size ) + { + playlist_item_t *p_item, *p_parent; + 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, VLC_TRUE, + p_parent, p_item ); + } + else + msg_rc( _("Playlist has only %d elements"), i_size ); } else if( !strcmp( psz_cmd, "stop" ) ) { @@ -1399,8 +1459,10 @@ static int Playlist( vlc_object_t *p_this, char const *psz_cmd, if( p_playlist->p_input ) { /* Replay the current state of the system. */ - msg_rc( STATUS_CHANGE "( new input: %s )", - input_GetItem(p_playlist->p_input)->psz_uri ); + char *psz_uri = + input_item_GetURI( input_GetItem( p_playlist->p_input ) ); + msg_rc( STATUS_CHANGE "( new input: %s )", psz_uri ); + free( psz_uri ); msg_rc( STATUS_CHANGE "( audio volume: %d )", config_GetInt( p_intf, "volume" )); @@ -1459,7 +1521,6 @@ static int Intf( vlc_object_t *p_this, char const *psz_cmd, p_newintf = intf_Create( p_this->p_libvlc, newval.psz_string, 0, NULL ); if( p_newintf ) { - p_newintf->b_block = VLC_FALSE; if( intf_RunThread( p_newintf ) ) { vlc_object_detach( p_newintf ); @@ -1594,8 +1655,7 @@ static int VideoConfig( vlc_object_t *p_this, char const *psz_cmd, intf_thread_t *p_intf = (intf_thread_t*)p_this; input_thread_t *p_input = NULL; vout_thread_t * p_vout; - const char * psz_variable; - vlc_value_t val_name; + const char * psz_variable = NULL; int i_error; p_input = vlc_object_find( p_this, VLC_OBJECT_INPUT, FIND_ANYWHERE ); @@ -1615,16 +1675,14 @@ static int VideoConfig( vlc_object_t *p_this, char const *psz_cmd, { psz_variable = "aspect-ratio"; } - else /* if( !strcmp( psz_cmd, "vzoom" ) ) */ + else if( !strcmp( psz_cmd, "vzoom" ) ) { psz_variable = "zoom"; } - - - /* Get the descriptive name of the variable */ - var_Change( p_vout, psz_variable, VLC_VAR_GETTEXT, - &val_name, NULL ); - if( !val_name.psz_string ) val_name.psz_string = strdup(psz_variable); + else if( !strcmp( psz_cmd, "snapshot" ) ) + { + psz_variable = "video-snapshot"; + } if( newval.psz_string && *newval.psz_string ) { @@ -1640,9 +1698,14 @@ static int VideoConfig( vlc_object_t *p_this, char const *psz_cmd, i_error = var_Set( p_vout, psz_variable, newval ); } } + else if( !strcmp( psz_cmd, "snapshot" ) ) + { + i_error = var_Set( p_vout, psz_variable, newval ); + } else { /* get */ + vlc_value_t val_name; vlc_value_t val, text; int i; float f_value = 0.; @@ -1669,6 +1732,11 @@ static int VideoConfig( vlc_object_t *p_this, char const *psz_cmd, return VLC_EGENERIC; } + /* Get the descriptive name of the variable */ + var_Change( p_vout, psz_variable, VLC_VAR_GETTEXT, + &val_name, NULL ); + if( !val_name.psz_string ) val_name.psz_string = strdup(psz_variable); + msg_rc( "+----[ %s ]", val_name.psz_string ); if( !strcmp( psz_variable, "zoom" ) ) { @@ -1861,6 +1929,88 @@ static int Menu( vlc_object_t *p_this, char const *psz_cmd, return i_error; } +static int Statistics ( vlc_object_t *p_this, char const *psz_cmd, + vlc_value_t oldval, vlc_value_t newval, void *p_data ) +{ + intf_thread_t *p_intf = (intf_thread_t*)p_this; + input_thread_t *p_input = NULL; + int i_error; + + p_input = vlc_object_find( p_this, VLC_OBJECT_INPUT, FIND_ANYWHERE ); + if( !p_input ) + return VLC_ENOOBJ; + + if( !strcmp( psz_cmd, "stats" ) ) + { + p_intf->p_sys->b_statistics = !p_intf->p_sys->b_statistics; + if( p_intf->p_sys->b_statistics ) + msg_rc(_("statistics update on")); + else + msg_rc(_("statistics update off")); + } + /* + * sanity check + */ + else + { + msg_rc(_("Unknown command!") ); + } + + vlc_object_release( p_input ); + i_error = VLC_SUCCESS; + return i_error; +} + +static int updateStatistics( intf_thread_t *p_intf, input_item_t *p_item ) +{ + if( !p_item ) return VLC_EGENERIC; + + vlc_mutex_lock( &p_item->p_stats->lock ); + msg_rc( "+----[ begin of statistical info ]" ); + + /* Input */ + msg_rc(_("+-[Incoming]")); + msg_rc(_("| input bytes read : %8.0f kB"), + (float)(p_item->p_stats->i_read_bytes)/1000 ); + 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 bitrate : %6.0f kb/s"), + (float)(p_item->p_stats->f_demux_bitrate)*8000 ); + msg_rc("|"); + /* Video */ + msg_rc(_("+-[Video Decoding]")); + msg_rc(_("| video decoded : %5i"), + p_item->p_stats->i_decoded_video ); + msg_rc(_("| frames displayed : %5i"), + p_item->p_stats->i_displayed_pictures ); + msg_rc(_("| frames lost : %5i"), + p_item->p_stats->i_lost_pictures ); + msg_rc("|"); + /* Audio*/ + msg_rc(_("+-[Audio Decoding]")); + msg_rc(_("| audio decoded : %5i"), + p_item->p_stats->i_decoded_audio ); + msg_rc(_("| buffers played : %5i"), + p_item->p_stats->i_played_abuffers ); + msg_rc(_("| buffers lost : %5i"), + p_item->p_stats->i_lost_abuffers ); + msg_rc("|"); + /* Sout */ + msg_rc(_("+-[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(_("| 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 ); + + return VLC_SUCCESS; +} + #ifdef WIN32 vlc_bool_t ReadWin32( intf_thread_t *p_intf, char *p_buffer, int *pi_size ) { @@ -2058,116 +2208,15 @@ static input_item_t *parse_MRL( intf_thread_t *p_intf, char *psz_mrl ) /***************************************************************************** * checkUpdates : check for updates ****************************************************************************/ -static void checkUpdates( intf_thread_t *p_intf, char *psz_arg ) +#ifdef UPDATE_CHECK +static void checkUpdates( intf_thread_t *p_intf ) { - update_iterator_t *p_uit; + /*TODO: - modify this to delete p_update to avoid a memory leak ! + - complete the function wich is not working obiously ! update_t *p_u = update_New( p_intf ); - if( p_u == NULL ) return; - p_uit = update_iterator_New( p_u ); - if( p_uit ) - { - int s = 0, t = 0; - - if( strstr( psz_arg, "newer" ) ) - s |= UPDATE_RELEASE_STATUS_NEWER; - if( strstr( psz_arg, "equal" ) ) - s |= UPDATE_RELEASE_STATUS_EQUAL; - if( strstr( psz_arg, "older" ) ) - s |= UPDATE_RELEASE_STATUS_OLDER; - if( s ) p_uit->i_rs = s; - else p_uit->i_rs = UPDATE_RELEASE_STATUS_NEWER; - - if( strstr( psz_arg, "undef" ) ) - t |= UPDATE_FILE_TYPE_UNDEF; - if( strstr( psz_arg, "info" ) ) - t |= UPDATE_FILE_TYPE_INFO; - if( strstr( psz_arg, "source" ) ) - t |= UPDATE_FILE_TYPE_SOURCE; - if( strstr( psz_arg, "binary" ) ) - t |= UPDATE_FILE_TYPE_BINARY; - if( strstr( psz_arg, "plugin" ) ) - t |= UPDATE_FILE_TYPE_PLUGIN; - if( t ) p_uit->i_t = t; - - update_Check( p_u, VLC_FALSE ); - update_iterator_Action( p_uit, UPDATE_MIRROR ); - msg_rc( "\nUsing mirror: %s (%s) [%s]", - p_uit->mirror.psz_name, - p_uit->mirror.psz_location, - p_uit->mirror.psz_type ); - while( (s = update_iterator_Action( p_uit, UPDATE_FILE )) != UPDATE_FAIL ) - { - char *psz_tmp; - if( s & UPDATE_RELEASE ) - { - switch( p_uit->release.i_status ) - { - case UPDATE_RELEASE_STATUS_OLDER: - psz_tmp = strdup( "older" ); - break; - case UPDATE_RELEASE_STATUS_EQUAL: - psz_tmp = strdup( "equal" ); - break; - case UPDATE_RELEASE_STATUS_NEWER: - psz_tmp = strdup( "newer" ); - break; - default: - psz_tmp = strdup( "?!?" ); - break; - } - msg_rc( "\n+----[ VLC %s %s (%s) ] ", - p_uit->release.psz_version, - p_uit->release.psz_svn_revision, - psz_tmp ); - free( psz_tmp ); - } - switch( p_uit->file.i_type ) - { - case UPDATE_FILE_TYPE_UNDEF: - psz_tmp = strdup( "undef" ); - break; - case UPDATE_FILE_TYPE_INFO: - psz_tmp = strdup( "info" ); - break; - case UPDATE_FILE_TYPE_SOURCE: - psz_tmp = strdup( "source" ); - break; - case UPDATE_FILE_TYPE_BINARY: - psz_tmp = strdup( "binary" ); - break; - case UPDATE_FILE_TYPE_PLUGIN: - psz_tmp = strdup( "plugin" ); - break; - default: - psz_tmp = strdup( "?!?" ); - break; - } - msg_rc( "| %s (%s)", p_uit->file.psz_description, psz_tmp ); - free( psz_tmp ); - if( p_uit->file.l_size ) - { - if( p_uit->file.l_size > 1024 * 1024 * 1024 ) - asprintf( &psz_tmp, "(%ld GB)", - p_uit->file.l_size / (1024*1024*1024) ); - if( p_uit->file.l_size > 1024 * 1024 ) - asprintf( &psz_tmp, "(%ld MB)", - p_uit->file.l_size / (1024*1024) ); - else if( p_uit->file.l_size > 1024 ) - asprintf( &psz_tmp, "(%ld kB)", - p_uit->file.l_size / 1024 ); - else - asprintf( &psz_tmp, "(%ld B)", p_uit->file.l_size ); - } - else - { - psz_tmp = strdup( "" ); - } - msg_rc( "| %s %s", p_uit->file.psz_url, psz_tmp ); - msg_rc( "+----" ); - free( psz_tmp ); - } - msg_rc( "" ); - update_iterator_Delete( p_uit ); - } - update_Delete( p_u ); + var_AddCallback( p_intf->p_libvlc, "update-notify", updatesCallback, p_intf ); + + msg_rc( "\nChecking for updates" ); + update_Check( p_u );*/ } +#endif