X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcontrol%2Frc.c;h=94c485816525fa684f07366e99b0c627ebb7d774;hb=48c2ac8c879a83c4f8737b978ca9c3232bb2e70d;hp=5b1430268cb1dec44f7eb855ef61b70eac4480c1;hpb=37fa2c8838aa53459f62522ecd9f00717a3dd8eb;p=vlc diff --git a/modules/control/rc.c b/modules/control/rc.c index 5b1430268c..94c4858165 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 @@ -27,11 +27,8 @@ *****************************************************************************/ #include -#include /* malloc(), free() */ -#include #include /* ENOMEM */ -#include #include #include @@ -99,7 +96,9 @@ 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 ); +#ifdef UPDATE_CHECK +static void checkUpdates( intf_thread_t *p_intf ); +#endif /* Status Callbacks */ static int TimeOffsetChanged( vlc_object_t *, char const *, @@ -183,17 +182,19 @@ vlc_module_begin(); set_subcategory( SUBCAT_INTERFACE_MAIN ); set_description( _("Remote control interface") ); add_bool( "rc-show-pos", 0, NULL, POS_TEXT, POS_LONGTEXT, VLC_TRUE ); -#if defined (HAVE_ISATTY) && !defined (WIN32) - add_bool( "rc-fake-tty", 0, NULL, TTY_TEXT, TTY_LONGTEXT, VLC_TRUE ); -#endif - add_string( "rc-unix", 0, NULL, UNIX_TEXT, UNIX_LONGTEXT, VLC_TRUE ); - add_string( "rc-host", 0, NULL, HOST_TEXT, HOST_LONGTEXT, VLC_TRUE ); #ifdef WIN32 add_bool( "rc-quiet", 0, NULL, QUIET_TEXT, QUIET_LONGTEXT, VLC_FALSE ); +#else +#if defined (HAVE_ISATTY) + add_bool( "rc-fake-tty", 0, NULL, TTY_TEXT, TTY_LONGTEXT, VLC_TRUE ); +#endif + add_string( "rc-unix", 0, NULL, UNIX_TEXT, UNIX_LONGTEXT, VLC_TRUE ); #endif + add_string( "rc-host", 0, NULL, HOST_TEXT, HOST_LONGTEXT, VLC_TRUE ); set_capability( "interface", 20 ); + set_callbacks( Activate, Deactivate ); vlc_module_end(); @@ -206,7 +207,8 @@ static int Activate( vlc_object_t *p_this ) char *psz_host, *psz_unix_path; int *pi_socket = NULL; -#if defined(HAVE_ISATTY) && !defined(WIN32) +#ifndef WIN32 +#if defined(HAVE_ISATTY) /* Check that stdin is a TTY */ if( !config_GetInt( p_intf, "rc-fake-tty" ) && !isatty( 0 ) ) { @@ -220,7 +222,7 @@ static int Activate( vlc_object_t *p_this ) { int i_socket; -#if !defined(AF_LOCAL) || defined(WIN32) +#ifndef AF_LOCAL msg_Warn( p_intf, "your OS doesn't support filesystem sockets" ); free( psz_unix_path ); return VLC_EGENERIC; @@ -233,7 +235,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; } @@ -252,8 +254,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; @@ -262,7 +264,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; @@ -278,8 +280,9 @@ static int Activate( vlc_object_t *p_this ) } pi_socket[0] = i_socket; pi_socket[1] = -1; -#endif +#endif /* AF_LOCAL */ } +#endif /* !WIN32 */ if( ( pi_socket == NULL ) && ( psz_host = config_GetPsz( p_intf, "rc-host" ) ) != NULL ) @@ -369,6 +372,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 ) @@ -407,6 +411,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 ) @@ -454,7 +459,7 @@ static void Run( intf_thread_t *p_intf ) if( p_intf->p_sys->hConsoleIn == INVALID_HANDLE_VALUE ) { msg_Err( p_intf, "couldn't find user input handle" ); - p_intf->b_die = VLC_TRUE; + vlc_object_kill( p_intf ); } #endif @@ -497,8 +502,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" )); } @@ -603,16 +610,23 @@ static void Run( intf_thread_t *p_intf ) char *psz_myarg = strchr( psz_mycmd, ' ' ); char *psz_msg; - *psz_myarg = '\0'; - psz_myarg ++; - - var_Command( p_input, psz_alias, psz_mycmd, psz_myarg, &psz_msg ); + if( !psz_myarg ) + { + msg_rc( "Not enough parameters." ); + } + else + { + *psz_myarg = '\0'; + psz_myarg ++; + var_Command( p_intf, psz_alias, psz_mycmd, psz_myarg, + &psz_msg ); - if( psz_msg ) - { - msg_rc( psz_msg ); - free( psz_msg ); + if( psz_msg ) + { + msg_rc( psz_msg ); + free( psz_msg ); + } } free( psz_mycmd ); } @@ -628,15 +642,15 @@ static void Run( intf_thread_t *p_intf ) psz_cmd, i_ret, vlc_error( i_ret ) ); } /* Or maybe it's a global command */ - else if( var_Type( p_intf->p_libvlc_global, psz_cmd ) & VLC_VAR_ISCOMMAND ) + else if( var_Type( p_intf->p_libvlc, psz_cmd ) & VLC_VAR_ISCOMMAND ) { vlc_value_t val; int i_ret; val.psz_string = psz_arg; /* FIXME: it's a global command, but we should pass the - * local object as an argument, not p_intf->p_libvlc_global. */ - i_ret = var_Set( p_intf->p_libvlc_global, psz_cmd, val ); + * local object as an argument, not p_intf->p_libvlc. */ + i_ret = var_Set( p_intf->p_libvlc, psz_cmd, val ); if( i_ret != 0 ) { msg_rc( "%s: returned %i (%s)", @@ -738,10 +752,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", @@ -838,8 +854,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")); @@ -872,6 +889,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")); @@ -908,9 +926,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")); @@ -1073,14 +1093,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; @@ -1332,10 +1350,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" ) ) { @@ -1389,8 +1444,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" )); @@ -1437,7 +1494,7 @@ static int Quit( vlc_object_t *p_this, char const *psz_cmd, playlist_Stop( p_playlist ); vlc_object_release( p_playlist ); } - p_this->p_libvlc->b_die = VLC_TRUE; + vlc_object_kill( p_this->p_libvlc ); return VLC_SUCCESS; } @@ -1449,7 +1506,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 ); @@ -1584,8 +1640,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 ); @@ -1605,16 +1660,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 ) { @@ -1630,9 +1683,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.; @@ -1659,6 +1717,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" ) ) { @@ -1952,7 +2015,7 @@ vlc_bool_t ReadCommand( intf_thread_t *p_intf, char *p_buffer, int *pi_size ) } else /* Standard input closed: exit */ - p_intf->b_die = VLC_TRUE; + vlc_object_kill( p_intf ); p_buffer[ *pi_size ] = 0; return VLC_TRUE; @@ -2048,116 +2111,22 @@ 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; 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_Check( p_u ); + msg_rc( "\nChecking for updates" ); + + if( update_CompareReleaseToCurrent( p_u ) == UpdateReleaseStatusNewer ) + msg_rc( "\n+----[ VLC %i.%i.%i%s ] ", p_u->release.i_major, + p_u->release.i_minor, + p_u->release.i_revision, + p_u->release.psz_extra ); + else + msg_rc( "\n+----Last version" ); update_Delete( p_u ); } +#endif