X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcontrol%2Frc.c;h=c4409152cc0cbee036fd5deb7630723d8381df4a;hb=8c432e88f6a512ce6723965256d2a37a5ee39c23;hp=2d4d4bf0053c6fb862c4edcfda0e03250931188c;hpb=a1e597bf0072e2466e137277ec9ff0562c8d0a8e;p=vlc diff --git a/modules/control/rc.c b/modules/control/rc.c index 2d4d4bf005..c4409152cc 100644 --- a/modules/control/rc.c +++ b/modules/control/rc.c @@ -25,6 +25,8 @@ /***************************************************************************** * Preamble *****************************************************************************/ +#include + #include /* malloc(), free() */ #include @@ -33,12 +35,12 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include #include +#include +#include #ifdef HAVE_UNISTD_H # include @@ -49,8 +51,10 @@ #endif #include -#include "vlc_error.h" -#include "network.h" +#include +#include "vlc_url.h" + +#include #if defined(AF_UNIX) && !defined(AF_LOCAL) # define AF_LOCAL AF_UNIX @@ -75,14 +79,12 @@ static void RegisterCallbacks( intf_thread_t * ); static vlc_bool_t ReadCommand( intf_thread_t *, char *, int * ); -static playlist_item_t *parse_MRL( intf_thread_t *, char * ); +static input_item_t *parse_MRL( intf_thread_t *, char * ); static int Input ( vlc_object_t *, char const *, vlc_value_t, vlc_value_t, void * ); static int Playlist ( vlc_object_t *, char const *, vlc_value_t, vlc_value_t, void * ); -static int Other ( vlc_object_t *, char const *, - vlc_value_t, vlc_value_t, void * ); static int Quit ( vlc_object_t *, char const *, vlc_value_t, vlc_value_t, void * ); static int Intf ( vlc_object_t *, char const *, @@ -91,10 +93,13 @@ static int Volume ( vlc_object_t *, char const *, vlc_value_t, vlc_value_t, void * ); static int VolumeMove ( vlc_object_t *, char const *, vlc_value_t, vlc_value_t, void * ); +static int VideoConfig ( vlc_object_t *, char const *, + vlc_value_t, vlc_value_t, void * ); 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 ); /* Status Callbacks */ static int TimeOffsetChanged( vlc_object_t *, char const *, @@ -127,14 +132,14 @@ struct intf_sys_t __msg_rc( p_intf, psz_format, ## args ) #endif -void __msg_rc( intf_thread_t *p_intf, const char *psz_fmt, ... ) +static void __msg_rc( intf_thread_t *p_intf, const char *psz_fmt, ... ) { va_list args; va_start( args, psz_fmt ); if( p_intf->p_sys->i_socket == -1 ) { - vprintf( psz_fmt, args ); + utf8_vfprintf( stdout, psz_fmt, args ); printf( "\r\n" ); } else @@ -175,18 +180,19 @@ void __msg_rc( intf_thread_t *p_intf, const char *psz_fmt, ... ) vlc_module_begin(); set_shortname( _("RC")); set_category( CAT_INTERFACE ); - set_subcategory( SUBCAT_INTERFACE_GENERAL ); + set_subcategory( SUBCAT_INTERFACE_MAIN ); set_description( _("Remote control interface") ); add_bool( "rc-show-pos", 0, NULL, POS_TEXT, POS_LONGTEXT, VLC_TRUE ); -#ifdef 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 ); - 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 ); @@ -198,11 +204,11 @@ vlc_module_end(); static int Activate( vlc_object_t *p_this ) { intf_thread_t *p_intf = (intf_thread_t*)p_this; - playlist_t *p_playlist; 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 ) ) { @@ -216,13 +222,12 @@ 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; #else struct sockaddr_un addr; - int i_ret; memset( &addr, 0, sizeof(struct sockaddr_un) ); @@ -239,17 +244,25 @@ static int Activate( vlc_object_t *p_this ) strncpy( addr.sun_path, psz_unix_path, sizeof( addr.sun_path ) ); addr.sun_path[sizeof( addr.sun_path ) - 1] = '\0'; - if( (i_ret = bind( i_socket, (struct sockaddr*)&addr, - sizeof(struct sockaddr_un) ) ) < 0 ) + if (bind (i_socket, (struct sockaddr *)&addr, sizeof (addr)) + && (errno == EADDRINUSE) + && connect (i_socket, (struct sockaddr *)&addr, sizeof (addr)) + && (errno == ECONNREFUSED)) { - msg_Warn( p_intf, "couldn't bind socket to address: %s", - strerror(errno) ); - free( psz_unix_path ); - net_Close( i_socket ); - return VLC_EGENERIC; + msg_Info (p_intf, "Removing dead UNIX socket: %s", psz_unix_path); + unlink (psz_unix_path); + + 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)); + free (psz_unix_path); + net_Close (i_socket); + return VLC_EGENERIC; + } } - if( ( i_ret = listen( i_socket, 1 ) ) < 0 ) + if( listen( i_socket, 1 ) ) { msg_Warn( p_intf, "can't listen on socket: %s", strerror(errno)); free( psz_unix_path ); @@ -267,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 ) @@ -277,7 +291,7 @@ static int Activate( vlc_object_t *p_this ) vlc_UrlParse( &url, psz_host, 0 ); - msg_Dbg( p_intf, "base %s port %d", url.psz_host, url.i_port ); + msg_Dbg( p_intf, "base: %s, port: %d", url.psz_host, url.i_port ); pi_socket = net_ListenTCP(p_this, url.psz_host, url.i_port); if( pi_socket == NULL ) @@ -318,18 +332,7 @@ static int Activate( vlc_object_t *p_this ) CONSOLE_INTRO_MSG; #endif - /* Force "no-view" mode */ - p_playlist = (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); - if( p_playlist ) - { - vlc_mutex_lock( &p_playlist->object_lock ); - p_playlist->status.i_view = -1; - vlc_mutex_unlock( &p_playlist->object_lock ); - vlc_object_release( p_playlist ); - } - - msg_rc( _("Remote control interface initialized, `h' for help") ); + msg_rc( _("Remote control interface initialized. Type `help' for help.") ); return VLC_SUCCESS; } @@ -350,7 +353,7 @@ static void Deactivate( vlc_object_t *p_this ) #endif free( p_intf->p_sys->psz_unix_path ); } - vlc_mutex_destroy( &p_intf->p_sys->status_lock ); + vlc_mutex_destroy( &p_intf->p_sys->status_lock ); free( p_intf->p_sys ); } @@ -360,147 +363,62 @@ static void Deactivate( vlc_object_t *p_this ) static void RegisterCallbacks( intf_thread_t *p_intf ) { /* Register commands that will be cleaned up upon object destruction */ - var_Create( p_intf, "quit", VLC_VAR_VOID | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "quit", Quit, NULL ); - var_Create( p_intf, "intf", VLC_VAR_STRING | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "intf", Intf, NULL ); - - var_Create( p_intf, "add", VLC_VAR_STRING | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "add", Playlist, NULL ); - var_Create( p_intf, "playlist", VLC_VAR_VOID | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "playlist", Playlist, NULL ); - var_Create( p_intf, "play", VLC_VAR_VOID | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "play", Playlist, NULL ); - var_Create( p_intf, "stop", VLC_VAR_VOID | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "stop", Playlist, NULL ); - var_Create( p_intf, "clear", VLC_VAR_VOID | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "clear", Playlist, NULL ); - var_Create( p_intf, "prev", VLC_VAR_VOID | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "prev", Playlist, NULL ); - var_Create( p_intf, "next", VLC_VAR_VOID | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "next", Playlist, NULL ); - var_Create( p_intf, "goto", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "goto", Playlist, NULL ); - var_Create( p_intf, "status", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "status", Playlist, NULL ); - - /* marquee on the fly items */ - var_Create( p_intf, "marq-marquee", VLC_VAR_VOID | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "marq-marquee", Other, NULL ); - var_Create( p_intf, "marq-x", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "marq-x", Other, NULL ); - var_Create( p_intf, "marq-y", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "marq-y", Other, NULL ); - var_Create( p_intf, "marq-position", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "marq-position", Other, NULL ); - var_Create( p_intf, "marq-color", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "marq-color", Other, NULL ); - var_Create( p_intf, "marq-opacity", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "marq-opacity", Other, NULL ); - var_Create( p_intf, "marq-timeout", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "marq-timeout", Other, NULL ); - var_Create( p_intf, "marq-size", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "marq-size", Other, NULL ); - - var_Create( p_intf, "mosaic-alpha", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "mosaic-alpha", Other, NULL ); - var_Create( p_intf, "mosaic-height", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "mosaic-height", Other, NULL ); - var_Create( p_intf, "mosaic-width", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "mosaic-width", Other, NULL ); - var_Create( p_intf, "mosaic-xoffset", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "mosaic-xoffset", Other, NULL ); - var_Create( p_intf, "mosaic-yoffset", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "mosaic-yoffset", Other, NULL ); - var_Create( p_intf, "mosaic-align", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "mosaic-align", Other, NULL ); - var_Create( p_intf, "mosaic-vborder", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "mosaic-vborder", Other, NULL ); - var_Create( p_intf, "mosaic-hborder", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "mosaic-hborder", Other, NULL ); - var_Create( p_intf, "mosaic-position", - VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "mosaic-position", Other, NULL ); - var_Create( p_intf, "mosaic-rows", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "mosaic-rows", Other, NULL ); - var_Create( p_intf, "mosaic-cols", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "mosaic-cols", Other, NULL ); - var_Create( p_intf, "mosaic-keep-aspect-ratio", - VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "mosaic-keep-aspect-ratio", Other, NULL ); - - /* time on the fly items */ - var_Create( p_intf, "time-format", VLC_VAR_VOID | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "time-format", Other, NULL ); - var_Create( p_intf, "time-x", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "time-x", Other, NULL ); - var_Create( p_intf, "time-y", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "time-y", Other, NULL ); - var_Create( p_intf, "time-position", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "time-position", Other, NULL ); - var_Create( p_intf, "time-color", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "time-color", Other, NULL ); - var_Create( p_intf, "time-opacity", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "time-opacity", Other, NULL ); - var_Create( p_intf, "time-size", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "time-size", Other, NULL ); - - /* logo on the fly items */ - var_Create( p_intf, "logo-file", VLC_VAR_VOID | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "logo-file", Other, NULL ); - var_Create( p_intf, "logo-x", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "logo-x", Other, NULL ); - var_Create( p_intf, "logo-y", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "logo-y", Other, NULL ); - var_Create( p_intf, "logo-position", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "logo-position", Other, NULL ); - var_Create( p_intf, "logo-transparency", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "logo-transparency", Other, NULL ); +#define ADD( name, type, target ) \ + var_Create( p_intf, name, VLC_VAR_ ## type | VLC_VAR_ISCOMMAND ); \ + var_AddCallback( p_intf, name, target, NULL ); + ADD( "quit", VOID, Quit ) + ADD( "intf", STRING, Intf ) + + ADD( "add", STRING, Playlist ) + ADD( "repeat", STRING, Playlist ) + ADD( "loop", STRING, Playlist ) + ADD( "enqueue", STRING, Playlist ) + ADD( "playlist", VOID, Playlist ) + ADD( "sort", VOID, Playlist ) + ADD( "play", VOID, Playlist ) + ADD( "stop", VOID, Playlist ) + ADD( "clear", VOID, Playlist ) + ADD( "prev", VOID, Playlist ) + ADD( "next", VOID, Playlist ) + ADD( "goto", INTEGER, Playlist ) + ADD( "status", INTEGER, Playlist ) /* OSD menu commands */ - var_Create( p_intf, "menu", VLC_VAR_STRING | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "menu", Menu, NULL ); + ADD( "menu", STRING, Menu ) /* DVD commands */ - var_Create( p_intf, "pause", VLC_VAR_VOID | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "pause", Input, NULL ); - var_Create( p_intf, "seek", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "seek", Input, NULL ); - var_Create( p_intf, "title", VLC_VAR_STRING | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "title", Input, NULL ); - var_Create( p_intf, "title_n", VLC_VAR_VOID | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "title_n", Input, NULL ); - var_Create( p_intf, "title_p", VLC_VAR_VOID | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "title_p", Input, NULL ); - var_Create( p_intf, "chapter", VLC_VAR_STRING | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "chapter", Input, NULL ); - var_Create( p_intf, "chapter_n", VLC_VAR_VOID | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "chapter_n", Input, NULL ); - var_Create( p_intf, "chapter_p", VLC_VAR_VOID | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "chapter_p", Input, NULL ); - - var_Create( p_intf, "fastforward", VLC_VAR_VOID | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "fastforward", Input, NULL ); - var_Create( p_intf, "rewind", VLC_VAR_VOID | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "rewind", Input, NULL ); - var_Create( p_intf, "faster", VLC_VAR_VOID | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "faster", Input, NULL ); - var_Create( p_intf, "slower", VLC_VAR_VOID | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "slower", Input, NULL ); - var_Create( p_intf, "normal", VLC_VAR_VOID | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "normal", Input, NULL ); + ADD( "pause", VOID, Input ) + ADD( "seek", INTEGER, Input ) + ADD( "title", STRING, Input ) + ADD( "title_n", VOID, Input ) + ADD( "title_p", VOID, Input ) + ADD( "chapter", STRING, Input ) + ADD( "chapter_n", VOID, Input ) + ADD( "chapter_p", VOID, Input ) + + ADD( "fastforward", VOID, Input ) + ADD( "rewind", VOID, Input ) + ADD( "faster", VOID, Input ) + ADD( "slower", VOID, Input ) + ADD( "normal", VOID, Input ) + + ADD( "atrack", STRING, Input ) + ADD( "vtrack", STRING, Input ) + ADD( "strack", STRING, Input ) + + /* video commands */ + ADD( "vratio", STRING, VideoConfig ) + ADD( "vcrop", STRING, VideoConfig ) + ADD( "vzoom", STRING, VideoConfig ) /* audio commands */ - var_Create( p_intf, "volume", VLC_VAR_STRING | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "volume", Volume, NULL ); - var_Create( p_intf, "volup", VLC_VAR_STRING | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "volup", VolumeMove, NULL ); - var_Create( p_intf, "voldown", VLC_VAR_STRING | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "voldown", VolumeMove, NULL ); - var_Create( p_intf, "adev", VLC_VAR_STRING | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "adev", AudioConfig, NULL ); - var_Create( p_intf, "achan", VLC_VAR_STRING | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "achan", AudioConfig, NULL ); + ADD( "volume", STRING, Volume ) + ADD( "volup", STRING, VolumeMove ) + ADD( "voldown", STRING, VolumeMove ) + ADD( "adev", STRING, AudioConfig ) + ADD( "achan", STRING, AudioConfig ) + +#undef ADD } /***************************************************************************** @@ -531,19 +449,19 @@ static void Run( intf_thread_t *p_intf ) /* status callbacks */ /* Listen to audio volume updates */ - var_AddCallback( p_intf->p_vlc, "volume-change", VolumeChanged, p_intf ); + var_AddCallback( p_intf->p_libvlc, "volume-change", VolumeChanged, p_intf ); #ifdef WIN32 /* Get the file descriptor of the console input */ p_intf->p_sys->hConsoleIn = GetStdHandle(STD_INPUT_HANDLE); if( p_intf->p_sys->hConsoleIn == INVALID_HANDLE_VALUE ) { - msg_Err( p_intf, "Couldn't open STD_INPUT_HANDLE" ); - p_intf->b_die = VLC_TRUE; + msg_Err( p_intf, "couldn't find user input handle" ); + vlc_object_kill( p_intf ); } #endif - while( !p_intf->b_die ) + while( !intf_ShouldDie( p_intf ) ) { char *psz_cmd, *psz_arg; vlc_bool_t b_complete; @@ -552,7 +470,9 @@ 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, 0 ); + net_Accept( p_intf, p_intf->p_sys->pi_socket_listen, + INTF_IDLE_SLEEP ); + if( p_intf->p_sys->i_socket == -1 ) continue; } b_complete = ReadCommand( p_intf, p_buffer, &i_size ); @@ -580,14 +500,17 @@ static void Run( intf_thread_t *p_intf ) { if( !p_input->b_dead || !p_input->b_die ) { - msg_rc( STATUS_CHANGE "( New input: %s )", p_input->input.p_item->psz_uri ); - msg_rc( STATUS_CHANGE "( audio volume: %d )", config_GetInt( p_intf, "volume" )); + msg_rc( STATUS_CHANGE "( new input: %s )", + input_GetItem(p_input)->psz_uri ); + msg_rc( STATUS_CHANGE "( audio volume: %d )", + 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, "time-offset", TimeOffsetChanged, + p_intf ); } } else if( p_input->b_dead ) @@ -596,7 +519,8 @@ static void Run( intf_thread_t *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, "time-offset", TimeOffsetChanged, + p_intf ); vlc_object_release( p_input ); p_input = NULL; @@ -619,13 +543,15 @@ static void Run( intf_thread_t *p_intf ) p_intf->p_sys->i_last_state = PLAYLIST_STOPPED; msg_rc( STATUS_CHANGE "( stop state: 0 )" ); } - else if( (p_intf->p_sys->i_last_state != p_playlist->status.i_status) && + else if( + (p_intf->p_sys->i_last_state != p_playlist->status.i_status) && (p_playlist->status.i_status == PLAYLIST_RUNNING) ) { p_intf->p_sys->i_last_state = p_playlist->status.i_status; msg_rc( STATUS_CHANGE "( play state: 1 )" ); } - else if( (p_intf->p_sys->i_last_state != p_playlist->status.i_status) && + else if( + (p_intf->p_sys->i_last_state != p_playlist->status.i_status) && (p_playlist->status.i_status == PLAYLIST_PAUSED) ) { p_intf->p_sys->i_last_state = p_playlist->status.i_status; @@ -671,8 +597,37 @@ static void Run( intf_thread_t *p_intf ) psz_arg = ""; } + /* module specfic commands: @ */ + if( *psz_cmd == '@' && *psz_arg ) + { + /* Parse miscellaneous commands */ + char *psz_alias = psz_cmd + 1; + char *psz_mycmd = strdup( psz_arg ); + char *psz_myarg = strchr( psz_mycmd, ' ' ); + char *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 ); + } + } + free( psz_mycmd ); + } /* If the user typed a registered local command, try it */ - if( var_Type( p_intf, psz_cmd ) & VLC_VAR_ISCOMMAND ) + else if( var_Type( p_intf, psz_cmd ) & VLC_VAR_ISCOMMAND ) { vlc_value_t val; int i_ret; @@ -683,15 +638,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, psz_cmd ) & VLC_VAR_ISCOMMAND ) + else if( var_Type( p_intf->p_libvlc_global, 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. */ - i_ret = var_Set( p_intf->p_libvlc, psz_cmd, val ); + * local object as an argument, not p_intf->p_libvlc_global. */ + i_ret = var_Set( p_intf->p_libvlc_global, psz_cmd, val ); if( i_ret != 0 ) { msg_rc( "%s: returned %i (%s)", @@ -712,11 +667,11 @@ static void Run( intf_thread_t *p_intf ) if( p_input ) { int i, j; - vlc_mutex_lock( &p_input->input.p_item->lock ); - for ( i = 0; i < p_input->input.p_item->i_categories; i++ ) + vlc_mutex_lock( &input_GetItem(p_input)->lock ); + for ( i = 0; i < input_GetItem(p_input)->i_categories; i++ ) { - info_category_t *p_category = - p_input->input.p_item->pp_categories[i]; + info_category_t *p_category = input_GetItem(p_input) + ->pp_categories[i]; msg_rc( "+----[ %s ]", p_category->psz_name ); msg_rc( "| " ); @@ -729,7 +684,7 @@ static void Run( intf_thread_t *p_intf ) msg_rc( "| " ); } msg_rc( "+----[ end of stream info ]" ); - vlc_mutex_unlock( &p_input->input.p_item->lock ); + vlc_mutex_unlock( &input_GetItem(p_input)->lock ); } else { @@ -781,7 +736,7 @@ static void Run( intf_thread_t *p_intf ) } else { - msg_rc( "%s", p_input->input.p_item->psz_name ); + msg_rc( "%s", input_GetItem(p_input)->psz_name ); } } else if( !strcmp( psz_cmd, "longhelp" ) || !strncmp( psz_cmd, "h", 1 ) @@ -793,6 +748,15 @@ static void Run( intf_thread_t *p_intf ) Help( p_intf, b_longhelp ); } + else if( !strcmp( psz_cmd, "check-updates" ) ) + { + checkUpdates( p_intf, psz_arg ); + } + else if( !strcmp( psz_cmd, "key" ) || !strcmp( psz_cmd, "hotkey" ) ) + { + var_SetInteger( p_intf->p_libvlc, "key-pressed", + config_GetInt( p_intf, psz_arg ) ); + } else switch( psz_cmd[0] ) { case 'f': @@ -809,17 +773,20 @@ static void Run( intf_thread_t *p_intf ) vlc_bool_t b_update = VLC_FALSE; var_Get( p_vout, "fullscreen", &val ); val.b_bool = !val.b_bool; - if( !strncmp(psz_arg, "on", 2) && (val.b_bool == VLC_TRUE) ) + if( !strncmp( psz_arg, "on", 2 ) + && ( val.b_bool == VLC_TRUE ) ) { b_update = VLC_TRUE; val.b_bool = VLC_TRUE; } - else if( !strncmp(psz_arg, "off", 3) && (val.b_bool == VLC_FALSE) ) + else if( !strncmp( psz_arg, "off", 3 ) + && ( val.b_bool == VLC_FALSE ) ) { b_update = VLC_TRUE; val.b_bool = VLC_FALSE; } - else if( strncmp(psz_arg, "off", 3) && strncmp(psz_arg, "on", 2) ) + else if( strncmp( psz_arg, "off", 3 ) + && strncmp( psz_arg, "on", 2 ) ) b_update = VLC_TRUE; if( b_update ) var_Set( p_vout, "fullscreen", val ); vlc_object_release( p_vout ); @@ -837,7 +804,7 @@ static void Run( intf_thread_t *p_intf ) break; default: - msg_rc(_("unknown command `%s', type `help' for help"), psz_cmd); + msg_rc(_("Unknown command `%s'. Type `help' for help."), psz_cmd); break; } @@ -865,90 +832,101 @@ static void Run( intf_thread_t *p_intf ) p_playlist = NULL; } - var_DelCallback( p_intf->p_vlc, "volume-change", VolumeChanged, p_intf ); + var_DelCallback( p_intf->p_libvlc, "volume-change", VolumeChanged, p_intf ); } static void Help( intf_thread_t *p_intf, vlc_bool_t b_longhelp) { msg_rc(_("+----[ Remote control commands ]")); msg_rc( "| "); - msg_rc(_("| add XYZ . . . . . . . . . . add XYZ to playlist")); - msg_rc(_("| playlist . . . show items currently in playlist")); - msg_rc(_("| play . . . . . . . . . . . . . . . . play stream")); - msg_rc(_("| stop . . . . . . . . . . . . . . . . stop stream")); - msg_rc(_("| next . . . . . . . . . . . . next playlist item")); - msg_rc(_("| prev . . . . . . . . . . previous playlist item")); - msg_rc(_("| goto . . . . . . . . . . . . goto item at index")); - 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")); - msg_rc(_("| title_p . . . . previous title in current item")); - msg_rc(_("| chapter [X] . . set/get chapter in current item")); - msg_rc(_("| chapter_n . . . . next chapter in current item")); - msg_rc(_("| chapter_p . . previous chapter in current item")); + msg_rc(_("| add XYZ . . . . . . . . . . . . add XYZ to playlist")); + msg_rc(_("| enqueue XYZ . . . . . . . . . queue XYZ to playlist")); + msg_rc(_("| playlist . . . . . show items currently in playlist")); + msg_rc(_("| play . . . . . . . . . . . . . . . . . . play stream")); + msg_rc(_("| stop . . . . . . . . . . . . . . . . . . stop stream")); + msg_rc(_("| next . . . . . . . . . . . . . . next playlist item")); + 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(_("| status . . . . . . . . . . . current playlist status")); + msg_rc(_("| title [X] . . . . . . set/get title in current item")); + msg_rc(_("| title_n . . . . . . . . next title in current item")); + msg_rc(_("| title_p . . . . . . previous title in current item")); + msg_rc(_("| chapter [X] . . . . set/get chapter in current item")); + msg_rc(_("| chapter_n . . . . . . next chapter in current item")); + msg_rc(_("| chapter_p . . . . previous chapter in current item")); msg_rc( "| "); - msg_rc(_("| seek X . seek in seconds, for instance `seek 12'")); - msg_rc(_("| pause . . . . . . . . . . . . . . toggle pause")); - msg_rc(_("| fastforward . . . . . . . set to maximum rate")); - msg_rc(_("| rewind . . . . . . . . . . set to minimum rate")); - msg_rc(_("| faster . . . . . . . . faster playing of stream")); - msg_rc(_("| slower . . . . . . . . slower playing of stream")); - msg_rc(_("| normal . . . . . . . . normal playing of stream")); - msg_rc(_("| f [on|off] . . . . . . . . . . toggle fullscreen")); - msg_rc(_("| info . . . information about the current stream")); + msg_rc(_("| seek X . . . seek in seconds, for instance `seek 12'")); + msg_rc(_("| pause . . . . . . . . . . . . . . . . toggle pause")); + msg_rc(_("| fastforward . . . . . . . . . set to maximum rate")); + msg_rc(_("| rewind . . . . . . . . . . . . set to minimum rate")); + msg_rc(_("| faster . . . . . . . . . . faster playing of stream")); + msg_rc(_("| slower . . . . . . . . . . slower playing of stream")); + msg_rc(_("| normal . . . . . . . . . . normal playing of stream")); + msg_rc(_("| f [on|off] . . . . . . . . . . . . toggle fullscreen")); + msg_rc(_("| info . . . . . information about the current stream")); + 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")); + msg_rc(_("| get_length . . . . the length of the current stream")); msg_rc( "| "); - msg_rc(_("| volume [X] . . . . . . . . set/get audio volume")); - msg_rc(_("| volup [X] . . . . . raise audio volume X steps")); - msg_rc(_("| voldown [X] . . . . lower audio volume X steps")); - msg_rc(_("| adev [X] . . . . . . . . . set/get audio device")); - msg_rc(_("| achan [X]. . . . . . . . set/get audio channels")); - msg_rc(_("| menu [on|off|up|down|left|right|select] use menu")); + msg_rc(_("| volume [X] . . . . . . . . . . set/get audio volume")); + msg_rc(_("| volup [X] . . . . . . . raise audio volume X steps")); + msg_rc(_("| voldown [X] . . . . . . lower audio volume X steps")); + msg_rc(_("| adev [X] . . . . . . . . . . . set/get audio device")); + msg_rc(_("| achan [X]. . . . . . . . . . set/get audio channels")); + msg_rc(_("| atrack [X] . . . . . . . . . . . set/get audio track")); + msg_rc(_("| vtrack [X] . . . . . . . . . . . set/get video track")); + 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(_("| 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")); msg_rc( "| "); if (b_longhelp) { - msg_rc(_("| marq-marquee STRING . . overlay STRING in video")); - msg_rc(_("| marq-x X . . . . . . . . . . . .offset from left")); - msg_rc(_("| marq-y Y . . . . . . . . . . . . offset from top")); - msg_rc(_("| marq-position #. . . .relative position control")); - msg_rc(_("| marq-color # . . . . . . . . . . font color, RGB")); - msg_rc(_("| marq-opacity # . . . . . . . . . . . . . opacity")); - msg_rc(_("| marq-timeout T. . . . . . . . . . timeout, in ms")); - msg_rc(_("| marq-size # . . . . . . . . font size, in pixels")); + msg_rc(_("| @name marq-marquee STRING . . overlay STRING in video")); + msg_rc(_("| @name marq-x X . . . . . . . . . . . .offset from left")); + msg_rc(_("| @name marq-y Y . . . . . . . . . . . . offset from top")); + msg_rc(_("| @name marq-position #. . . .relative position control")); + msg_rc(_("| @name marq-color # . . . . . . . . . . font color, RGB")); + msg_rc(_("| @name marq-opacity # . . . . . . . . . . . . . opacity")); + msg_rc(_("| @name marq-timeout T. . . . . . . . . . timeout, in ms")); + msg_rc(_("| @name marq-size # . . . . . . . . font size, in pixels")); msg_rc( "| "); - msg_rc(_("| time-format STRING . . . overlay STRING in video")); - msg_rc(_("| time-x X . . . . . . . . . . . .offset from left")); - msg_rc(_("| time-y Y . . . . . . . . . . . . offset from top")); - msg_rc(_("| time-position #. . . . . . . . relative position")); - msg_rc(_("| time-color # . . . . . . . . . . font color, RGB")); - msg_rc(_("| time-opacity # . . . . . . . . . . . . . opacity")); - msg_rc(_("| time-size # . . . . . . . . font size, in pixels")); + msg_rc(_("| @name logo-file STRING . . .the overlay file path/name")); + msg_rc(_("| @name logo-x X . . . . . . . . . . . .offset from left")); + msg_rc(_("| @name logo-y Y . . . . . . . . . . . . offset from top")); + msg_rc(_("| @name logo-position #. . . . . . . . relative position")); + msg_rc(_("| @name logo-transparency #. . . . . . . . .transparency")); msg_rc( "| "); - msg_rc(_("| logo-file STRING . . . the overlay file path/name")); - msg_rc(_("| logo-x X . . . . . . . . . . . .offset from left")); - msg_rc(_("| logo-y Y . . . . . . . . . . . . offset from top")); - msg_rc(_("| logo-position #. . . . . . . . relative position")); - msg_rc(_("| logo-transparency #. . . . . . . . .transparency")); + msg_rc(_("| @name mosaic-alpha # . . . . . . . . . . . . . . alpha")); + msg_rc(_("| @name mosaic-height #. . . . . . . . . . . . . .height")); + msg_rc(_("| @name mosaic-width # . . . . . . . . . . . . . . width")); + msg_rc(_("| @name mosaic-xoffset # . . . .top left corner position")); + msg_rc(_("| @name mosaic-yoffset # . . . .top left corner position")); + msg_rc(_("| @name mosaic-offsets x,y(,x,y)*. . . . list of offsets")); + msg_rc(_("| @name mosaic-align 0..2,4..6,8..10. . .mosaic alignment")); + msg_rc(_("| @name mosaic-vborder # . . . . . . . . vertical border")); + msg_rc(_("| @name mosaic-hborder # . . . . . . . horizontal border")); + msg_rc(_("| @name mosaic-position {0=auto,1=fixed} . . . .position")); + msg_rc(_("| @name mosaic-rows #. . . . . . . . . . .number of rows")); + 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")); msg_rc( "| "); - msg_rc(_("| mosaic-alpha # . . . . . . . . . . . . . . alpha")); - msg_rc(_("| mosaic-height #. . . . . . . . . . . . . .height")); - msg_rc(_("| mosaic-width # . . . . . . . . . . . . . . width")); - msg_rc(_("| mosaic-xoffset # . . . .top left corner position")); - msg_rc(_("| mosaic-yoffset # . . . .top left corner position")); - msg_rc(_("| mosaic-align 0..2,4..6,8..10. . .mosaic alignment")); - msg_rc(_("| mosaic-vborder # . . . . . . . . vertical border")); - msg_rc(_("| mosaic-hborder # . . . . . . . horizontal border")); - msg_rc(_("| mosaic-position {0=auto,1=fixed} . . . .position")); - msg_rc(_("| mosaic-rows #. . . . . . . . . . .number of rows")); - msg_rc(_("| mosaic-cols #. . . . . . . . . . .number of cols")); - msg_rc(_("| mosaic-keep-aspect-ratio {0,1} . . .aspect ratio")); + msg_rc(_("| check-updates [newer] [equal] [older]\n" + "| [undef] [info] [source] [binary] [plugin]")); msg_rc( "| "); } - msg_rc(_("| help . . . . . . . . . . . . . this help message")); - msg_rc(_("| longhelp . . . . . . . . . a longer help message")); - msg_rc(_("| logout . . . . . exit (if in socket connection)")); - msg_rc(_("| quit . . . . . . . . . . . . . . . . . quit vlc")); + msg_rc(_("| help . . . . . . . . . . . . . . . this help message")); + msg_rc(_("| longhelp . . . . . . . . . . . a longer help message")); + msg_rc(_("| logout . . . . . . . exit (if in socket connection)")); + msg_rc(_("| quit . . . . . . . . . . . . . . . . . . . quit vlc")); msg_rc( "| "); msg_rc(_("+----[ end of help ]")); } @@ -966,7 +944,8 @@ static int TimeOffsetChanged( vlc_object_t *p_this, char const *psz_cmd, p_input = vlc_object_find( p_intf, VLC_OBJECT_INPUT, FIND_ANYWHERE ); if( p_input ) { - msg_rc( STATUS_CHANGE "( time-offset: %d )", var_GetInteger( p_input, "time-offset" ) ); + msg_rc( STATUS_CHANGE "( time-offset: %d )", + var_GetInteger( p_input, "time-offset" ) ); vlc_object_release( p_input ); } vlc_mutex_unlock( &p_intf->p_sys->status_lock ); @@ -979,7 +958,8 @@ static int VolumeChanged( vlc_object_t *p_this, char const *psz_cmd, intf_thread_t *p_intf = (intf_thread_t*)p_data; vlc_mutex_lock( &p_intf->p_sys->status_lock ); - msg_rc( STATUS_CHANGE "( audio volume: %d )", config_GetInt( p_this, "volume") ); + msg_rc( STATUS_CHANGE "( audio volume: %d )", + config_GetInt( p_this, "volume") ); vlc_mutex_unlock( &p_intf->p_sys->status_lock ); return VLC_SUCCESS; } @@ -1033,7 +1013,8 @@ static int RateChanged( vlc_object_t *p_this, char const *psz_cmd, p_input = vlc_object_find( p_intf, VLC_OBJECT_INPUT, FIND_ANYWHERE ); if( p_input ) { - msg_rc( STATUS_CHANGE "( new rate: %d )", var_GetInteger( p_input, "rate" ) ); + msg_rc( STATUS_CHANGE "( new rate: %d )", + var_GetInteger( p_input, "rate" ) ); vlc_object_release( p_input ); } vlc_mutex_unlock( &p_intf->p_sys->status_lock ); @@ -1057,7 +1038,7 @@ static int Input( vlc_object_t *p_this, char const *psz_cmd, if( ( ( val.i_int == PAUSE_S ) || ( val.i_int == PLAYLIST_PAUSED ) ) && ( strcmp( psz_cmd, "pause" ) != 0 ) ) { - msg_rc( _("press menu select or pause to continue") ); + msg_rc( _("Press menu select or pause to continue.") ); vlc_object_release( p_input ); return VLC_EGENERIC; } @@ -1066,7 +1047,7 @@ static int Input( vlc_object_t *p_this, char const *psz_cmd, if( !strcmp( psz_cmd, "pause" ) ) { val.i_int = config_GetInt( p_intf, "key-play-pause" ); - var_Set( p_intf->p_vlc, "key-pressed", val ); + var_Set( p_intf->p_libvlc, "key-pressed", val ); vlc_object_release( p_input ); return VLC_SUCCESS; } @@ -1075,7 +1056,7 @@ static int Input( vlc_object_t *p_this, char const *psz_cmd, if( strlen( newval.psz_string ) > 0 && newval.psz_string[strlen( newval.psz_string ) - 1] == '%' ) { - val.f_float = (float)atoi( newval.psz_string ) / 100.0; + val.f_float = (float)atof( newval.psz_string ) / 100.0; var_Set( p_input, "position", val ); } else @@ -1089,14 +1070,14 @@ static int Input( vlc_object_t *p_this, char const *psz_cmd, else if ( !strcmp( psz_cmd, "fastforward" ) ) { val.i_int = config_GetInt( p_intf, "key-jump+extrashort" ); - var_Set( p_intf->p_vlc, "key-pressed", val ); + var_Set( p_intf->p_libvlc, "key-pressed", val ); vlc_object_release( p_input ); return VLC_SUCCESS; } else if ( !strcmp( psz_cmd, "rewind" ) ) { val.i_int = config_GetInt( p_intf, "key-jump-extrashort" ); - var_Set( p_intf->p_vlc, "key-pressed", val ); + var_Set( p_intf->p_libvlc, "key-pressed", val ); vlc_object_release( p_input ); return VLC_SUCCESS; } @@ -1141,7 +1122,7 @@ static int Input( vlc_object_t *p_this, char const *psz_cmd, var_Get( p_input, "chapter", &val ); var_Change( p_input, "chapter", VLC_VAR_GETCHOICES, &val_list, NULL ); - msg_rc( "Currently playing chapter %d/%d", + msg_rc( "Currently playing chapter %d/%d.", val.i_int, val_list.p_list->i_count ); var_Change( p_this, "chapter", VLC_VAR_FREELIST, &val_list, NULL ); @@ -1180,7 +1161,7 @@ static int Input( vlc_object_t *p_this, char const *psz_cmd, var_Get( p_input, "title", &val ); var_Change( p_input, "title", VLC_VAR_GETCHOICES, &val_list, NULL ); - msg_rc( "Currently playing title %d/%d", + msg_rc( "Currently playing title %d/%d.", val.i_int, val_list.p_list->i_count ); var_Change( p_this, "title", VLC_VAR_FREELIST, &val_list, NULL ); @@ -1200,6 +1181,81 @@ static int Input( vlc_object_t *p_this, char const *psz_cmd, vlc_object_release( p_input ); return VLC_SUCCESS; } + else if( !strcmp( psz_cmd, "atrack" ) + || !strcmp( psz_cmd, "vtrack" ) + || !strcmp( psz_cmd, "strack" ) ) + { + const char *psz_variable; + vlc_value_t val_name; + int i_error; + + if( !strcmp( psz_cmd, "atrack" ) ) + { + psz_variable = "audio-es"; + } + else if( !strcmp( psz_cmd, "vtrack" ) ) + { + psz_variable = "video-es"; + } + else + { + psz_variable = "spu-es"; + } + + /* Get the descriptive name of the variable */ + var_Change( p_input, psz_variable, VLC_VAR_GETTEXT, + &val_name, NULL ); + if( !val_name.psz_string ) val_name.psz_string = strdup(psz_variable); + + if( newval.psz_string && *newval.psz_string ) + { + /* set */ + vlc_value_t val; + val.i_int = atoi( newval.psz_string ); + + i_error = var_Set( p_input, psz_variable, val ); + } + else + { + /* get */ + vlc_value_t val, text; + int i, i_value; + + if ( var_Get( p_input, psz_variable, &val ) < 0 ) + { + vlc_object_release( p_input ); + return VLC_EGENERIC; + } + i_value = val.i_int; + + if ( var_Change( p_input, psz_variable, + VLC_VAR_GETLIST, &val, &text ) < 0 ) + { + vlc_object_release( p_input ); + return VLC_EGENERIC; + } + + msg_rc( "+----[ %s ]", val_name.psz_string ); + 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, + text.p_list->p_values[i].psz_string ); + else + msg_rc( "| %i - %s", val.p_list->p_values[i].i_int, + text.p_list->p_values[i].psz_string ); + } + var_Change( p_input, psz_variable, VLC_VAR_FREELIST, + &val, &text ); + msg_rc( "+----[ end of %s ]", val_name.psz_string ); + + if( val_name.psz_string ) free( val_name.psz_string ); + + i_error = VLC_SUCCESS; + } + vlc_object_release( p_input ); + return i_error; + } /* Never reached. */ vlc_object_release( p_input ); @@ -1210,26 +1266,23 @@ static int Playlist( vlc_object_t *p_this, char const *psz_cmd, vlc_value_t oldval, vlc_value_t newval, void *p_data ) { vlc_value_t val; - intf_thread_t *p_intf = (intf_thread_t*)p_this; - playlist_t *p_playlist; - p_playlist = vlc_object_find( p_this, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); - if( !p_playlist ) - { - return VLC_ENOOBJ; - } + intf_thread_t *p_intf = (intf_thread_t*)p_this; + playlist_t *p_playlist = pl_Yield( p_this ); + PL_LOCK; if( p_playlist->p_input ) { - vlc_value_t val; var_Get( p_playlist->p_input, "state", &val ); - if( ( val.i_int == PAUSE_S ) || ( val.i_int == PLAYLIST_PAUSED ) ) { - msg_rc( _("press menu select or pause to continue") ); + if( ( val.i_int == PAUSE_S ) || ( val.i_int == PLAYLIST_PAUSED ) ) + { + msg_rc( _("Type 'menu select' or 'pause' to continue.") ); vlc_object_release( p_playlist ); + PL_UNLOCK; return VLC_EGENERIC; } } + PL_UNLOCK; /* Parse commands that require a playlist */ if( !strcmp( psz_cmd, "prev" ) ) @@ -1242,29 +1295,57 @@ static int Playlist( vlc_object_t *p_this, char const *psz_cmd, } else if( !strcmp( psz_cmd, "play" ) ) { - if( p_playlist->p_input ) + msg_Warn( p_playlist, "play" ); + playlist_Play( p_playlist ); + } + else if( !strcmp( psz_cmd, "repeat" ) ) + { + vlc_bool_t b_update = VLC_TRUE; + + var_Get( p_playlist, "repeat", &val ); + + if( strlen( newval.psz_string ) > 0 ) { - vlc_value_t val; - - var_Get( p_playlist->p_input, "rate", &val ); - if( val.i_int != INPUT_RATE_DEFAULT ) + if ( ( !strncmp( newval.psz_string, "on", 2 ) && ( val.b_bool == VLC_TRUE ) ) || + ( !strncmp( newval.psz_string, "off", 3 ) && ( val.b_bool == VLC_FALSE ) ) ) { - val.i_int = INPUT_RATE_DEFAULT; - var_Set( p_playlist->p_input, "rate", val ); + b_update = VLC_FALSE; } - else + } + + if ( b_update ) + { + val.b_bool = !val.b_bool; + var_Set( p_playlist, "repeat", val ); + } + msg_rc( "Setting repeat to %d", val.b_bool ); + } + else if( !strcmp( psz_cmd, "loop" ) ) + { + vlc_bool_t b_update = VLC_TRUE; + + var_Get( p_playlist, "loop", &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 ) ) ) { - playlist_Play( p_playlist ); + b_update = VLC_FALSE; } } + + if ( b_update ) + { + val.b_bool = !val.b_bool; + var_Set( p_playlist, "loop", val ); + } + msg_rc( "Setting loop to %d", val.b_bool ); } else if (!strcmp( psz_cmd, "goto" ) ) { - if( strlen( newval.psz_string ) > 0) - { - val.i_int = atoi( newval.psz_string ); - playlist_Goto( p_playlist, val.i_int); - } + msg_rc( _("goto is deprecated" ) ); + msg_Err( p_playlist, "goto is deprecated" ); } else if( !strcmp( psz_cmd, "stop" ) ) { @@ -1273,46 +1354,55 @@ static int Playlist( vlc_object_t *p_this, char const *psz_cmd, else if( !strcmp( psz_cmd, "clear" ) ) { playlist_Stop( p_playlist ); - vlc_mutex_lock( &p_playlist->object_lock ); - playlist_Clear( p_playlist ); - vlc_mutex_unlock( &p_playlist->object_lock ); + playlist_Clear( p_playlist, VLC_FALSE ); } else if( !strcmp( psz_cmd, "add" ) && newval.psz_string && *newval.psz_string ) { - playlist_item_t *p_item = parse_MRL( p_intf, newval.psz_string ); + input_item_t *p_item = parse_MRL( p_intf, newval.psz_string ); if( p_item ) { - msg_rc( "trying to add %s to playlist", newval.psz_string ); - playlist_AddItem( p_playlist, p_item, - PLAYLIST_GO|PLAYLIST_APPEND, PLAYLIST_END ); + msg_rc( "Trying to add %s to playlist.", newval.psz_string ); + playlist_AddInput( p_playlist, p_item, + PLAYLIST_GO|PLAYLIST_APPEND, PLAYLIST_END, VLC_TRUE, + VLC_FALSE ); } } - else if( !strcmp( psz_cmd, "playlist" ) ) + else if( !strcmp( psz_cmd, "enqueue" ) && + newval.psz_string && *newval.psz_string ) { - int i; + input_item_t *p_item = parse_MRL( p_intf, newval.psz_string ); - for ( i = 0; i < p_playlist->i_size; i++ ) - { - msg_rc( "|%s%s %s|%s|", i == p_playlist->i_index ? "*" : " ", - p_playlist->pp_items[i]->input.psz_name, - p_playlist->pp_items[i]->input.psz_uri, - p_playlist->pp_items[i]->i_parents > 0 ? - p_playlist->pp_items[i]->pp_parents[0]->p_parent->input.psz_name : "" ); - } - if ( i == 0 ) + if( p_item ) { - msg_rc( "| no entries" ); + msg_rc( "trying to enqueue %s to playlist", newval.psz_string ); + playlist_AddInput( p_playlist, p_item, + PLAYLIST_APPEND, PLAYLIST_END, VLC_TRUE, + VLC_FALSE); } } + else if( !strcmp( psz_cmd, "playlist" ) ) + { + msg_Dbg( p_playlist, "Dumping category" ); + playlist_NodeDump( p_playlist, p_playlist->p_root_category, 0 ); + msg_Dbg( p_playlist, "Dumping Onelevel" ); + playlist_NodeDump( p_playlist, p_playlist->p_root_onelevel, 0 ); + } + else if( !strcmp( psz_cmd, "sort" )) + { + playlist_RecursiveNodeSort( p_playlist, p_playlist->p_root_onelevel, + SORT_ARTIST, ORDER_NORMAL ); + } else if( !strcmp( psz_cmd, "status" ) ) { if( p_playlist->p_input ) { /* Replay the current state of the system. */ - msg_rc( STATUS_CHANGE "( New input: %s )", p_playlist->p_input->input.p_item->psz_uri ); - msg_rc( STATUS_CHANGE "( audio volume: %d )", config_GetInt( p_intf, "volume" )); + msg_rc( STATUS_CHANGE "( new input: %s )", + input_GetItem(p_playlist->p_input)->psz_uri ); + msg_rc( STATUS_CHANGE "( audio volume: %d )", + config_GetInt( p_intf, "volume" )); vlc_mutex_lock( &p_playlist->object_lock ); switch( p_playlist->status.i_status ) @@ -1346,320 +1436,6 @@ static int Playlist( vlc_object_t *p_this, char const *psz_cmd, return VLC_SUCCESS; } -static int Other( 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; - vlc_object_t *p_playlist; - vlc_value_t val; - vlc_object_t *p_input; - - p_playlist = vlc_object_find( p_this, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE ); - if( !p_playlist ) - { - return VLC_ENOOBJ; - } - - p_input = vlc_object_find( p_this, VLC_OBJECT_INPUT, FIND_ANYWHERE ); - if( !p_input ) - { - vlc_object_release( p_playlist ); - return VLC_ENOOBJ; - } - - if( p_input ) - { - var_Get( p_input, "state", &val ); - if( ( val.i_int == PAUSE_S ) || ( val.i_int == PLAYLIST_PAUSED ) ) - { - msg_rc( _("press pause to continue") ); - vlc_object_release( p_playlist ); - vlc_object_release( p_input ); - return VLC_EGENERIC; - } - } - - /* Parse miscellaneous commands */ - if( !strcmp( psz_cmd, "marq-marquee" ) ) - { - if( strlen( newval.psz_string ) > 0 ) - { - val.psz_string = newval.psz_string; - var_Set( p_input->p_libvlc, "marq-marquee", val ); - } - else - { - val.psz_string = ""; - var_Set( p_input->p_libvlc, "marq-marquee", val); - } - } - else if( !strcmp( psz_cmd, "marq-x" ) ) - { - if( strlen( newval.psz_string ) > 0) - { - val.i_int = atoi( newval.psz_string ); - var_Set( p_input->p_libvlc, "marq-x", val ); - } - } - else if( !strcmp( psz_cmd, "marq-y" ) ) - { - if( strlen( newval.psz_string ) > 0) - { - val.i_int = atoi( newval.psz_string ); - var_Set( p_input->p_libvlc, "marq-y", val ); - } - } - else if( !strcmp( psz_cmd, "marq-position" ) ) - { - if( strlen( newval.psz_string ) > 0) - { - val.i_int = atoi( newval.psz_string ); - var_Set( p_input->p_libvlc, "marq-position", val ); - } - } - else if( !strcmp( psz_cmd, "marq-color" ) ) - { - if( strlen( newval.psz_string ) > 0) - { - val.i_int = strtol( newval.psz_string, NULL, 0 ); - var_Set( p_input->p_libvlc, "marq-color", val ); - } - } - else if( !strcmp( psz_cmd, "marq-opacity" ) ) - { - if( strlen( newval.psz_string ) > 0) - { - val.i_int = strtol( newval.psz_string, NULL, 0 ); - var_Set( p_input->p_libvlc, "marq-opacity", val ); - } - } - else if( !strcmp( psz_cmd, "marq-size" ) ) - { - if( strlen( newval.psz_string ) > 0) - { - val.i_int = atoi( newval.psz_string ); - var_Set( p_input->p_libvlc, "marq-size", val ); - } - } - else if( !strcmp( psz_cmd, "marq-timeout" ) ) - { - if( strlen( newval.psz_string ) > 0) - { - val.i_int = atoi( newval.psz_string ); - var_Set( p_input, "marq-timeout", val ); - } - } - else if( !strcmp( psz_cmd, "mosaic-alpha" ) ) - { - if( strlen( newval.psz_string ) > 0) - { - val.i_int = atoi( newval.psz_string ); - var_Set( p_input->p_libvlc, "mosaic-alpha", val ); - } - } - else if( !strcmp( psz_cmd, "mosaic-height" ) ) - { - if( strlen( newval.psz_string ) > 0) - { - val.i_int = atoi( newval.psz_string ); - var_Set( p_input->p_libvlc, "mosaic-height", val ); - } - } - else if( !strcmp( psz_cmd, "mosaic-width" ) ) - { - if( strlen( newval.psz_string ) > 0) - { - val.i_int = atoi( newval.psz_string ); - var_Set( p_input->p_libvlc, "mosaic-width", val ); - } - } - else if( !strcmp( psz_cmd, "mosaic-xoffset" ) ) - { - if( strlen( newval.psz_string ) > 0) - { - val.i_int = atoi( newval.psz_string ); - var_Set( p_input->p_libvlc, "mosaic-xoffset", val ); - } - } - else if( !strcmp( psz_cmd, "mosaic-yoffset" ) ) - { - if( strlen( newval.psz_string ) > 0) - { - val.i_int = atoi( newval.psz_string ); - var_Set( p_input->p_libvlc, "mosaic-yoffset", val ); - } - } - else if( !strcmp( psz_cmd, "mosaic-align" ) ) - { - if( strlen( newval.psz_string ) > 0 ) - { - val.i_int = atoi( newval.psz_string ); - var_Set( p_input->p_libvlc, "mosaic-align", val ); - } - } - else if( !strcmp( psz_cmd, "mosaic-vborder" ) ) - { - if( strlen( newval.psz_string ) > 0) - { - val.i_int = atoi( newval.psz_string ); - var_Set( p_input->p_libvlc, "mosaic-vborder", val ); - } - } - else if( !strcmp( psz_cmd, "mosaic-hborder" ) ) - { - if( strlen( newval.psz_string ) > 0) - { - val.i_int = atoi( newval.psz_string ); - var_Set( p_input->p_libvlc, "mosaic-hborder", val ); - } - } - else if( !strcmp( psz_cmd, "mosaic-position" ) ) - { - if( strlen( newval.psz_string ) > 0) - { - val.i_int = atoi( newval.psz_string ); - var_Set( p_input->p_libvlc, "mosaic-position", val ); - } - } - else if( !strcmp( psz_cmd, "mosaic-rows" ) ) - { - if( strlen( newval.psz_string ) > 0) - { - val.i_int = atoi( newval.psz_string ); - var_Set( p_input->p_libvlc, "mosaic-rows", val ); - } - } - else if( !strcmp( psz_cmd, "mosaic-cols" ) ) - { - if( strlen( newval.psz_string ) > 0) - { - val.i_int = atoi( newval.psz_string ); - var_Set( p_input->p_libvlc, "mosaic-cols", val ); - } - } - else if( !strcmp( psz_cmd, "mosaic-keep-aspect-ratio" ) ) - { - if( strlen( newval.psz_string ) > 0) - { - val.i_int = atoi( newval.psz_string ); - var_Set( p_input->p_libvlc, "mosaic-keep-aspect-ratio", val ); - } - } - else if( !strcmp( psz_cmd, "time-format" ) ) - { - if( strlen( newval.psz_string ) > 0 ) - { - val.psz_string = newval.psz_string; - var_Set( p_input->p_libvlc, "time-format", val ); - } - else - { - val.psz_string = ""; - var_Set( p_input->p_libvlc, "time-format", val); - } - } - else if( !strcmp( psz_cmd, "time-x" ) ) - { - if( strlen( newval.psz_string ) > 0) - { - val.i_int = atoi( newval.psz_string ); - var_Set( p_input->p_libvlc, "time-x", val ); - } - } - else if( !strcmp( psz_cmd, "time-y" ) ) - { - if( strlen( newval.psz_string ) > 0) - { - val.i_int = atoi( newval.psz_string ); - var_Set( p_input->p_libvlc, "time-y", val ); - } - } - else if( !strcmp( psz_cmd, "time-position" ) ) - { - if( strlen( newval.psz_string ) > 0) - { - val.i_int = atoi( newval.psz_string ); - var_Set( p_input->p_libvlc, "time-position", val ); - } - } - else if( !strcmp( psz_cmd, "time-color" ) ) - { - if( strlen( newval.psz_string ) > 0) - { - val.i_int = strtol( newval.psz_string, NULL, 0 ); - var_Set( p_input->p_libvlc, "time-color", val ); - } - } - else if( !strcmp( psz_cmd, "time-opacity" ) ) - { - if( strlen( newval.psz_string ) > 0) - { - val.i_int = strtol( newval.psz_string, NULL, 0 ); - var_Set( p_input->p_libvlc, "time-opacity", val ); - } - } - else if( !strcmp( psz_cmd, "time-size" ) ) - { - if( strlen( newval.psz_string ) > 0) - { - val.i_int = atoi( newval.psz_string ); - var_Set( p_input->p_libvlc, "time-size", val ); - } - } - else if( !strcmp( psz_cmd, "logo-file" ) ) - { - if( strlen( newval.psz_string ) > 0 ) - { - val.psz_string = newval.psz_string; - var_Set( p_input->p_libvlc, "logo-file", val ); - } - } - else if( !strcmp( psz_cmd, "logo-x" ) ) - { - if( strlen( newval.psz_string ) > 0) - { - val.i_int = atoi( newval.psz_string ); - var_Set( p_input->p_libvlc, "logo-x", val ); - } - } - else if( !strcmp( psz_cmd, "logo-y" ) ) - { - if( strlen( newval.psz_string ) > 0) - { - val.i_int = atoi( newval.psz_string ); - var_Set( p_input->p_libvlc, "logo-y", val ); - } - } - else if( !strcmp( psz_cmd, "logo-position" ) ) - { - if( strlen( newval.psz_string ) > 0) - { - val.i_int = atoi( newval.psz_string ); - var_Set( p_input->p_libvlc, "logo-position", val ); - } - } - else if( !strcmp( psz_cmd, "logo-transparency" ) ) - { - if( strlen( newval.psz_string ) > 0) - { - val.i_int = strtol( newval.psz_string, NULL, 0 ); - var_Set( p_input->p_libvlc, "logo-transparency", val ); - } - } - - /* - * sanity check - */ - else - { - msg_rc( "unknown command!" ); - } - - vlc_object_release( p_playlist ); - vlc_object_release( p_input ); - return VLC_SUCCESS; -} - static int Quit( vlc_object_t *p_this, char const *psz_cmd, vlc_value_t oldval, vlc_value_t newval, void *p_data ) { @@ -1671,7 +1447,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_vlc->b_die = VLC_TRUE; + vlc_object_kill( p_this->p_libvlc ); return VLC_SUCCESS; } @@ -1680,7 +1456,7 @@ static int Intf( vlc_object_t *p_this, char const *psz_cmd, { intf_thread_t *p_newintf = NULL; - p_newintf = intf_Create( p_this->p_vlc, newval.psz_string, 0, NULL ); + p_newintf = intf_Create( p_this->p_libvlc, newval.psz_string, 0, NULL ); if( p_newintf ) { p_newintf->b_block = VLC_FALSE; @@ -1712,7 +1488,7 @@ static int Volume( vlc_object_t *p_this, char const *psz_cmd, var_Get( p_input, "state", &val ); if( ( val.i_int == PAUSE_S ) || ( val.i_int == PLAYLIST_PAUSED ) ) { - msg_rc( _("press menu select or pause to continue") ); + msg_rc( _("Type 'menu select' or 'pause' to continue.") ); vlc_object_release( p_input ); return VLC_EGENERIC; } @@ -1725,7 +1501,7 @@ static int Volume( vlc_object_t *p_this, char const *psz_cmd, audio_volume_t i_volume = atoi( newval.psz_string ); if ( (i_volume > (audio_volume_t)AOUT_VOLUME_MAX) ) { - msg_rc( "Volume must be in the range %d-%d", AOUT_VOLUME_MIN, + msg_rc( "Volume must be in the range %d-%d.", AOUT_VOLUME_MIN, AOUT_VOLUME_MAX ); i_error = VLC_EBADVAR; } @@ -1736,7 +1512,7 @@ static int Volume( vlc_object_t *p_this, char const *psz_cmd, vlc_value_t keyval; keyval.i_int = config_GetInt( p_intf, "key-vol-mute" ); - var_Set( p_intf->p_vlc, "key-pressed", keyval ); + var_Set( p_intf->p_libvlc, "key-pressed", keyval ); } i_error = aout_VolumeSet( p_this, i_volume ); osd_Volume( p_this ); @@ -1782,14 +1558,14 @@ static int VolumeMove( vlc_object_t *p_this, char const *psz_cmd, var_Get( p_input, "state", &val ); if( ( val.i_int == PAUSE_S ) || ( val.i_int == PLAYLIST_PAUSED ) ) { - msg_rc( _("press menu select or pause to continue") ); + msg_rc( _("Type 'menu select' or 'pause' to continue.") ); vlc_object_release( p_input ); return VLC_EGENERIC; } vlc_object_release( p_input ); } - i_volume_step = config_GetInt( p_intf->p_vlc, "volume-step" ); + i_volume_step = config_GetInt( p_intf->p_libvlc, "volume-step" ); if ( i_nb_steps <= 0 || i_nb_steps > (AOUT_VOLUME_MAX/i_volume_step) ) { i_nb_steps = 1; @@ -1811,6 +1587,126 @@ static int VolumeMove( vlc_object_t *p_this, char const *psz_cmd, return i_error; } + +static int VideoConfig( 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; + vout_thread_t * p_vout; + const char * psz_variable; + vlc_value_t val_name; + int i_error; + + p_input = vlc_object_find( p_this, VLC_OBJECT_INPUT, FIND_ANYWHERE ); + if( !p_input ) + return VLC_ENOOBJ; + + p_vout = vlc_object_find( p_input, VLC_OBJECT_VOUT, FIND_CHILD ); + vlc_object_release( p_input ); + if( !p_vout ) + return VLC_ENOOBJ; + + if( !strcmp( psz_cmd, "vcrop" ) ) + { + psz_variable = "crop"; + } + else if( !strcmp( psz_cmd, "vratio" ) ) + { + psz_variable = "aspect-ratio"; + } + 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); + + if( newval.psz_string && *newval.psz_string ) + { + /* set */ + if( !strcmp( psz_variable, "zoom" ) ) + { + vlc_value_t val; + val.f_float = atof( newval.psz_string ); + i_error = var_Set( p_vout, psz_variable, val ); + } + else + { + i_error = var_Set( p_vout, psz_variable, newval ); + } + } + else + { + /* get */ + vlc_value_t val, text; + int i; + float f_value = 0.; + char *psz_value = NULL; + + if ( var_Get( p_vout, psz_variable, &val ) < 0 ) + { + vlc_object_release( p_vout ); + return VLC_EGENERIC; + } + if( !strcmp( psz_variable, "zoom" ) ) + { + f_value = val.f_float; + } + else + { + psz_value = strdup( val.psz_string ); + } + + if ( var_Change( p_vout, psz_variable, + VLC_VAR_GETLIST, &val, &text ) < 0 ) + { + vlc_object_release( p_vout ); + return VLC_EGENERIC; + } + + msg_rc( "+----[ %s ]", val_name.psz_string ); + if( !strcmp( psz_variable, "zoom" ) ) + { + for ( i = 0; i < val.p_list->i_count; i++ ) + { + if ( f_value == val.p_list->p_values[i].f_float ) + msg_rc( "| %f - %s *", val.p_list->p_values[i].f_float, + text.p_list->p_values[i].psz_string ); + else + msg_rc( "| %f - %s", val.p_list->p_values[i].f_float, + text.p_list->p_values[i].psz_string ); + } + } + else + { + for ( i = 0; i < val.p_list->i_count; i++ ) + { + if ( !strcmp( psz_value, val.p_list->p_values[i].psz_string ) ) + msg_rc( "| %s - %s *", val.p_list->p_values[i].psz_string, + text.p_list->p_values[i].psz_string ); + else + msg_rc( "| %s - %s", val.p_list->p_values[i].psz_string, + text.p_list->p_values[i].psz_string ); + } + free( psz_value ); + } + var_Change( p_vout, psz_variable, VLC_VAR_FREELIST, + &val, &text ); + msg_rc( "+----[ end of %s ]", val_name.psz_string ); + + if( val_name.psz_string ) free( val_name.psz_string ); + + i_error = VLC_SUCCESS; + } + vlc_object_release( p_vout ); + return i_error; +} + static int AudioConfig( vlc_object_t *p_this, char const *psz_cmd, vlc_value_t oldval, vlc_value_t newval, void *p_data ) { @@ -1831,7 +1727,7 @@ static int AudioConfig( vlc_object_t *p_this, char const *psz_cmd, var_Get( p_input, "state", &val ); if( ( val.i_int == PAUSE_S ) || ( val.i_int == PLAYLIST_PAUSED ) ) { - msg_rc( _("press menu select or pause to continue") ); + msg_rc( _("Type 'menu select' or 'pause' to continue.") ); vlc_object_release( p_input ); return VLC_EGENERIC; } @@ -1915,7 +1811,7 @@ static int Menu( vlc_object_t *p_this, char const *psz_cmd, if ( !*newval.psz_string ) { - msg_rc( _("please provide one of the following paramaters") ); + msg_rc( _("Please provide one of the following parameters:") ); msg_rc( "[on|off|up|down|left|right|select]" ); return i_error; } @@ -1930,7 +1826,7 @@ static int Menu( vlc_object_t *p_this, char const *psz_cmd, if( ( ( val.i_int == PAUSE_S ) || ( val.i_int == PLAYLIST_PAUSED ) ) && ( strcmp( newval.psz_string, "select" ) != 0 ) ) { - msg_rc( _("press menu select or pause to continue") ); + msg_rc( _("Type 'menu select' or 'pause' to continue.") ); vlc_object_release( p_playlist ); return VLC_EGENERIC; } @@ -1954,7 +1850,7 @@ static int Menu( vlc_object_t *p_this, char const *psz_cmd, osd_MenuActivate( p_this ); else { - msg_rc( _("please provide one of the following paramaters") ); + msg_rc( _("Please provide one of the following parameters:") ); msg_rc( "[on|off|up|down|left|right|select]" ); if( val.psz_string ) free( val.psz_string ); return i_error; @@ -1975,7 +1871,7 @@ vlc_bool_t ReadWin32( intf_thread_t *p_intf, char *p_buffer, int *pi_size ) while( WaitForSingleObject( p_intf->p_sys->hConsoleIn, INTF_IDLE_SLEEP/1000 ) == WAIT_OBJECT_0 ) { - while( !p_intf->b_die && *pi_size < MAX_LINE_LENGTH && + while( !intf_ShouldDie( p_intf ) && *pi_size < MAX_LINE_LENGTH && ReadConsoleInput( p_intf->p_sys->hConsoleIn, &input_record, 1, &i_dw ) ) { @@ -2045,10 +1941,10 @@ vlc_bool_t ReadCommand( intf_thread_t *p_intf, char *p_buffer, int *pi_size ) } #endif - while( !p_intf->b_die && *pi_size < MAX_LINE_LENGTH && - (i_read = net_ReadNonBlock( p_intf, p_intf->p_sys->i_socket == -1 ? + while( !intf_ShouldDie( p_intf ) && *pi_size < MAX_LINE_LENGTH && + (i_read = net_Read( p_intf, p_intf->p_sys->i_socket == -1 ? 0 /*STDIN_FILENO*/ : p_intf->p_sys->i_socket, NULL, - (uint8_t *)p_buffer + *pi_size, 1, INTF_IDLE_SLEEP ) ) > 0 ) + (uint8_t *)p_buffer + *pi_size, 1, VLC_FALSE ) ) > 0 ) { if( p_buffer[ *pi_size ] == '\r' || p_buffer[ *pi_size ] == '\n' ) break; @@ -2057,9 +1953,17 @@ vlc_bool_t ReadCommand( intf_thread_t *p_intf, char *p_buffer, int *pi_size ) } /* Connection closed */ - if( i_read == -1 ) + if( i_read <= 0 ) { - p_intf->p_sys->i_socket = -1; + if( p_intf->p_sys->i_socket != -1 ) + { + net_Close( p_intf->p_sys->i_socket ); + p_intf->p_sys->i_socket = -1; + } + else + /* Standard input closed: exit */ + vlc_object_kill( p_intf ); + p_buffer[ *pi_size ] = 0; return VLC_TRUE; } @@ -2075,19 +1979,19 @@ vlc_bool_t ReadCommand( intf_thread_t *p_intf, char *p_buffer, int *pi_size ) } /***************************************************************************** - * parse_MRL: build a playlist item from a full mrl + * parse_MRL: build a input item from a full mrl ***************************************************************************** * MRL format: "simplified-mrl [:option-name[=option-value]]" * We don't check for '"' or '\'', we just assume that a ':' that follows a * space is a new option. Should be good enough for our purpose. *****************************************************************************/ -static playlist_item_t *parse_MRL( intf_thread_t *p_intf, char *psz_mrl ) +static input_item_t *parse_MRL( intf_thread_t *p_intf, char *psz_mrl ) { #define SKIPSPACE( p ) { while( *p && ( *p == ' ' || *p == '\t' ) ) p++; } #define SKIPTRAILINGSPACE( p, d ) \ { char *e=d; while( e > p && (*(e-1)==' ' || *(e-1)=='\t') ){e--;*e=0;} } - playlist_item_t *p_item = NULL; + input_item_t *p_item = NULL; char *psz_item = NULL, *psz_item_mrl = NULL, *psz_orig; char **ppsz_options = NULL; int i, i_options = 0; @@ -2138,10 +2042,10 @@ static playlist_item_t *parse_MRL( intf_thread_t *p_intf, char *psz_mrl ) /* Now create a playlist item */ if( psz_item_mrl ) { - p_item = playlist_ItemNew( p_intf, psz_item_mrl, psz_item_mrl ); + p_item = input_ItemNew( p_intf, psz_item_mrl, NULL ); for( i = 0; i < i_options; i++ ) { - playlist_ItemAddOption( p_item, ppsz_options[i] ); + input_ItemAddOption( p_item, ppsz_options[i] ); } } @@ -2150,3 +2054,120 @@ static playlist_item_t *parse_MRL( intf_thread_t *p_intf, char *psz_mrl ) return p_item; } + +/***************************************************************************** + * checkUpdates : check for updates + ****************************************************************************/ +static void checkUpdates( intf_thread_t *p_intf, char *psz_arg ) +{ + 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_Delete( p_u ); +}