X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcontrol%2Frc.c;h=7d419d2589c949aca4085c9fee4204428dd35ea2;hb=80fde19dfe7b9e5875e0f891fe29aa0f6c0ec82e;hp=9e6d609f2b7815ba9c446fb9c101d4b046b525ed;hpb=d2adc9f3c197dfb3b148db04d24f838d7f0befcd;p=vlc diff --git a/modules/control/rc.c b/modules/control/rc.c index 9e6d609f2b..7d419d2589 100644 --- a/modules/control/rc.c +++ b/modules/control/rc.c @@ -1,10 +1,11 @@ /***************************************************************************** * rc.c : remote control stdin/stdout module for vlc ***************************************************************************** - * Copyright (C) 2004 VideoLAN + * Copyright (C) 2004 - 2005 the VideoLAN team * $Id$ * * Author: Peter Surda + * Jean-Paul Saman * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,12 +19,14 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ +#include + #include /* malloc(), free() */ #include @@ -32,10 +35,12 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #ifdef HAVE_UNISTD_H # include @@ -46,21 +51,21 @@ #endif #include -#include "vlc_error.h" -#include "network.h" +#include +#include "vlc_url.h" + +#include -#if defined(PF_UNIX) && !defined(PF_LOCAL) -# define PF_LOCAL PF_UNIX -#endif #if defined(AF_UNIX) && !defined(AF_LOCAL) # define AF_LOCAL AF_UNIX #endif -#ifdef PF_LOCAL +#if defined(AF_LOCAL) && ! defined(WIN32) # include #endif #define MAX_LINE_LENGTH 256 +#define STATUS_CHANGE "status change: " /***************************************************************************** * Local prototypes @@ -69,9 +74,12 @@ static int Activate ( vlc_object_t * ); static void Deactivate ( vlc_object_t * ); static void Run ( intf_thread_t * ); +static void Help ( intf_thread_t *, vlc_bool_t ); +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 * ); @@ -87,15 +95,33 @@ 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 *, + vlc_value_t, vlc_value_t , void * ); +static int VolumeChanged ( vlc_object_t *, char const *, + vlc_value_t, vlc_value_t, void * ); +static int StateChanged ( vlc_object_t *, char const *, + vlc_value_t, vlc_value_t, void * ); +static int RateChanged ( vlc_object_t *, char const *, + vlc_value_t, vlc_value_t, void * ); struct intf_sys_t { - int i_socket_listen; + int *pi_socket_listen; int i_socket; char *psz_unix_path; - vlc_bool_t b_extend; + + /* status changes */ + vlc_mutex_t status_lock; + playlist_status_t i_last_state; #ifdef WIN32 HANDLE hConsoleIn; @@ -108,14 +134,21 @@ 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 ); + + if( p_intf->p_sys->i_socket == -1 ) + { + utf8_vfprintf( stdout, psz_fmt, args ); + printf( "\r\n" ); + } else - { net_vaPrintf( p_intf, p_intf->p_sys->i_socket, NULL, psz_fmt, args ); - net_Printf( VLC_OBJECT(p_intf), p_intf->p_sys->i_socket, NULL, "\r" ); } + { + net_vaPrintf( p_intf, p_intf->p_sys->i_socket, NULL, psz_fmt, args ); + net_Write( p_intf, p_intf->p_sys->i_socket, NULL, (uint8_t*)"\r\n", 2 ); + } va_end( args ); } @@ -136,8 +169,6 @@ void __msg_rc( intf_thread_t *p_intf, const char *psz_fmt, ... ) #define HOST_TEXT N_("TCP command input") #define HOST_LONGTEXT N_("Accept commands over a socket rather than stdin. " \ "You can set the address and port the interface will bind to." ) -#define EXTEND_TEXT N_("Extended help") -#define EXTEND_LONGTEXT N_("List additional commands.") #ifdef WIN32 #define QUIET_TEXT N_("Do not open a DOS command box interface") @@ -149,8 +180,9 @@ void __msg_rc( intf_thread_t *p_intf, const char *psz_fmt, ... ) #endif 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 @@ -162,7 +194,6 @@ vlc_module_begin(); #ifdef WIN32 add_bool( "rc-quiet", 0, NULL, QUIET_TEXT, QUIET_LONGTEXT, VLC_FALSE ); #endif - add_bool( "rc-extend", 0, NULL, EXTEND_TEXT, EXTEND_LONGTEXT, VLC_FALSE ); set_capability( "interface", 20 ); set_callbacks( Activate, Deactivate ); @@ -175,7 +206,7 @@ static int Activate( vlc_object_t *p_this ) { intf_thread_t *p_intf = (intf_thread_t*)p_this; char *psz_host, *psz_unix_path; - int i_socket = -1; + int *pi_socket = NULL; #if defined(HAVE_ISATTY) && !defined(WIN32) /* Check that stdin is a TTY */ @@ -189,19 +220,22 @@ static int Activate( vlc_object_t *p_this ) psz_unix_path = config_GetPsz( p_intf, "rc-unix" ); if( psz_unix_path ) { -#ifndef PF_LOCAL + int i_socket, i_overwrite; + + i_overwrite = config_GetInt( p_intf, "rc-overwrite" ); + +#if !defined(AF_LOCAL) || defined(WIN32) 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) ); msg_Dbg( p_intf, "trying UNIX socket" ); - if( (i_socket = socket( PF_LOCAL, SOCK_STREAM, 0 ) ) < 0 ) + if( (i_socket = socket( AF_LOCAL, SOCK_STREAM, 0 ) ) < 0 ) { msg_Warn( p_intf, "can't open socket: %s", strerror(errno) ); free( psz_unix_path ); @@ -212,36 +246,56 @@ 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) ); + 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( listen( i_socket, 1 ) ) + { + msg_Warn( p_intf, "can't listen on socket: %s", strerror(errno)); free( psz_unix_path ); net_Close( i_socket ); return VLC_EGENERIC; } - if( ( i_ret = listen( i_socket, 1 ) ) < 0 ) + /* FIXME: we need a core function to merge listening sockets sets */ + pi_socket = calloc( 2, sizeof( int ) ); + if( pi_socket == NULL ) { - msg_Warn( p_intf, "can't listen on socket: %s", strerror(errno)); free( psz_unix_path ); net_Close( i_socket ); - return VLC_EGENERIC; + return VLC_ENOMEM; } + pi_socket[0] = i_socket; + pi_socket[1] = -1; #endif } - if( ( i_socket == -1) && + if( ( pi_socket == NULL ) && ( psz_host = config_GetPsz( p_intf, "rc-host" ) ) != NULL ) { vlc_url_t url; 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 ); - if( (i_socket = net_ListenTCP(p_this, url.psz_host, url.i_port)) == -1) + pi_socket = net_ListenTCP(p_this, url.psz_host, url.i_port); + if( pi_socket == NULL ) { msg_Warn( p_intf, "can't listen to %s port %i", url.psz_host, url.i_port ); @@ -261,9 +315,11 @@ static int Activate( vlc_object_t *p_this ) return VLC_ENOMEM; } - p_intf->p_sys->i_socket_listen = i_socket; + p_intf->p_sys->pi_socket_listen = pi_socket; p_intf->p_sys->i_socket = -1; 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; /* Non-buffered stdout */ setvbuf( stdout, (char *)NULL, _IOLBF, 0 ); @@ -277,7 +333,7 @@ static int Activate( vlc_object_t *p_this ) CONSOLE_INTRO_MSG; #endif - msg_rc( _("Remote control interface initialized, `h' for help\n") ); + msg_rc( _("Remote control interface initialized. Type `help' for help.") ); return VLC_SUCCESS; } @@ -288,20 +344,116 @@ static void Deactivate( vlc_object_t *p_this ) { intf_thread_t *p_intf = (intf_thread_t*)p_this; - if( p_intf->p_sys->i_socket_listen != -1 ) - net_Close( p_intf->p_sys->i_socket_listen ); + net_ListenClose( p_intf->p_sys->pi_socket_listen ); if( p_intf->p_sys->i_socket != -1 ) net_Close( p_intf->p_sys->i_socket ); if( p_intf->p_sys->psz_unix_path != NULL ) { -#ifdef PF_LOCAL +#if defined(AF_LOCAL) && !defined(WIN32) unlink( p_intf->p_sys->psz_unix_path ); #endif free( p_intf->p_sys->psz_unix_path ); } + vlc_mutex_destroy( &p_intf->p_sys->status_lock ); free( p_intf->p_sys ); } +/***************************************************************************** + * RegisterCallbacks: Register callbacks to dynamic variables + *****************************************************************************/ +static void RegisterCallbacks( intf_thread_t *p_intf ) +{ + /* Register commands that will be cleaned up upon object destruction */ +#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 ) + + /* marquee on the fly items */ + ADD( "marq-marquee", STRING, Other ) + ADD( "marq-x", INTEGER, Other ) + ADD( "marq-y", INTEGER, Other ) + ADD( "marq-position", INTEGER, Other ) + ADD( "marq-color", INTEGER, Other ) + ADD( "marq-opacity", INTEGER, Other ) + ADD( "marq-timeout", INTEGER, Other ) + ADD( "marq-size", INTEGER, Other ) + + ADD( "mosaic-alpha", INTEGER, Other ) + ADD( "mosaic-height", INTEGER, Other ) + ADD( "mosaic-width", INTEGER, Other ) + ADD( "mosaic-xoffset", INTEGER, Other ) + ADD( "mosaic-yoffset", INTEGER, Other ) + ADD( "mosaic-offsets", STRING, Other ) + ADD( "mosaic-align", INTEGER, Other ) + ADD( "mosaic-vborder", INTEGER, Other ) + ADD( "mosaic-hborder", INTEGER, Other ) + ADD( "mosaic-position", INTEGER, Other ) + ADD( "mosaic-rows", INTEGER, Other ) + ADD( "mosaic-cols", INTEGER, Other ) + ADD( "mosaic-order", STRING, Other ) + ADD( "mosaic-keep-aspect-ratio", INTEGER, Other ) + + /* logo on the fly items */ + ADD( "logo-file", STRING, Other ) + ADD( "logo-x", INTEGER, Other ) + ADD( "logo-y", INTEGER, Other ) + ADD( "logo-position", INTEGER, Other ) + ADD( "logo-transparency", INTEGER, Other ) + + /* OSD menu commands */ + ADD( "menu", STRING, Menu ) + + /* DVD commands */ + 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 */ + ADD( "volume", STRING, Volume ) + ADD( "volup", STRING, VolumeMove ) + ADD( "voldown", STRING, VolumeMove ) + ADD( "adev", STRING, AudioConfig ) + ADD( "achan", STRING, AudioConfig ) + +#undef ADD +} + /***************************************************************************** * Run: rc thread ***************************************************************************** @@ -315,6 +467,7 @@ static void Run( intf_thread_t *p_intf ) char p_buffer[ MAX_LINE_LENGTH + 1 ]; vlc_bool_t b_showpos = config_GetInt( p_intf, "rc-show-pos" ); + vlc_bool_t b_longhelp = VLC_FALSE; int i_size = 0; int i_oldpos = 0; @@ -323,84 +476,34 @@ static void Run( intf_thread_t *p_intf ) p_buffer[0] = 0; p_input = NULL; p_playlist = NULL; - - p_intf->p_sys->b_extend = config_GetInt( p_intf, "rc-extend" ); + /* 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, "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, "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-timeout", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "marq-timeout", Other, NULL ); - - 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, "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 ); + RegisterCallbacks( p_intf ); + + /* status callbacks */ + /* Listen to audio volume updates */ + 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" ); + msg_Err( p_intf, "couldn't find user input handle" ); p_intf->b_die = VLC_TRUE; } #endif - while( !p_intf->b_die ) + while( !intf_ShouldDie( p_intf ) ) { char *psz_cmd, *psz_arg; vlc_bool_t b_complete; - if( p_intf->p_sys->i_socket_listen != - 1 && + if( p_intf->p_sys->pi_socket_listen != NULL && p_intf->p_sys->i_socket == -1 ) { p_intf->p_sys->i_socket = - net_Accept( p_intf, p_intf->p_sys->i_socket_listen, 0 ); + net_Accept( p_intf, p_intf->p_sys->pi_socket_listen, 0 ); } b_complete = ReadCommand( p_intf, p_buffer, &i_size ); @@ -423,11 +526,69 @@ static void Run( intf_thread_t *p_intf ) FIND_PARENT ); } } + /* New input has been registered */ + if( p_input ) + { + if( !p_input->b_dead || !p_input->b_die ) + { + 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 ); + } } else if( p_input->b_dead ) { + var_DelCallback( p_input, "state", StateChanged, p_intf ); + var_DelCallback( p_input, "rate-faster", RateChanged, p_intf ); + var_DelCallback( p_input, "rate-slower", RateChanged, p_intf ); + var_DelCallback( p_input, "rate", RateChanged, p_intf ); + var_DelCallback( p_input, "time-offset", TimeOffsetChanged, + p_intf ); vlc_object_release( p_input ); p_input = NULL; + + if( p_playlist ) + { + vlc_mutex_lock( &p_playlist->object_lock ); + p_intf->p_sys->i_last_state = (int) PLAYLIST_STOPPED; + msg_rc( STATUS_CHANGE "( stop state: 0 )" ); + vlc_mutex_unlock( &p_playlist->object_lock ); + } + } + + if( (p_input != NULL) && !p_input->b_dead && !p_input->b_die && + (p_playlist != NULL) ) + { + vlc_mutex_lock( &p_playlist->object_lock ); + if( (p_intf->p_sys->i_last_state != p_playlist->status.i_status) && + (p_playlist->status.i_status == PLAYLIST_STOPPED) ) + { + 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) && + (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) && + (p_playlist->status.i_status == PLAYLIST_PAUSED) ) + { + p_intf->p_sys->i_last_state = p_playlist->status.i_status; + msg_rc( STATUS_CHANGE "( pause state: 2 )" ); + } + vlc_mutex_unlock( &p_playlist->object_lock ); } if( p_input && b_showpos ) @@ -436,7 +597,7 @@ static void Run( intf_thread_t *p_intf ) if( i_oldpos != i_newpos ) { i_oldpos = i_newpos; - msg_rc( "pos: %d%%\n", i_newpos ); + msg_rc( "pos: %d%%", i_newpos ); } } @@ -475,22 +636,22 @@ static void Run( intf_thread_t *p_intf ) val.psz_string = psz_arg; i_ret = var_Set( p_intf, psz_cmd, val ); - msg_rc( "%s: returned %i (%s)\n", + msg_rc( "%s: returned %i (%s)", 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)\n", + msg_rc( "%s: returned %i (%s)", psz_cmd, i_ret, vlc_error( i_ret ) ); } } @@ -508,78 +669,91 @@ 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 ]\n", p_category->psz_name ); - msg_rc( "| \n" ); + msg_rc( "+----[ %s ]", p_category->psz_name ); + msg_rc( "| " ); for ( j = 0; j < p_category->i_infos; j++ ) { info_t *p_info = p_category->pp_infos[j]; - msg_rc( "| %s: %s\n", p_info->psz_name, + msg_rc( "| %s: %s", p_info->psz_name, p_info->psz_value ); } - msg_rc( "| \n" ); + msg_rc( "| " ); } - msg_rc( "+----[ end of stream info ]\n" ); - vlc_mutex_unlock( &p_input->input.p_item->lock ); + msg_rc( "+----[ end of stream info ]" ); + vlc_mutex_unlock( &input_GetItem(p_input)->lock ); } else { - msg_rc( "no input\n" ); + msg_rc( "no input" ); } } else if( !strcmp( psz_cmd, "is_playing" ) ) { if( ! p_input ) { - msg_rc( "0\n" ); + msg_rc( "0" ); } else { - msg_rc( "1\n" ); + msg_rc( "1" ); } } else if( !strcmp( psz_cmd, "get_time" ) ) { if( ! p_input ) { - msg_rc("0\n"); + msg_rc("0"); } else { vlc_value_t time; var_Get( p_input, "time", &time ); - msg_rc( "%i\n", time.i_time / 1000000); + msg_rc( "%i", time.i_time / 1000000); } } else if( !strcmp( psz_cmd, "get_length" ) ) { if( ! p_input ) { - msg_rc("0\n"); + msg_rc("0"); } else { vlc_value_t time; var_Get( p_input, "length", &time ); - msg_rc( "%i\n", time.i_time / 1000000); + msg_rc( "%i", time.i_time / 1000000); } } else if( !strcmp( psz_cmd, "get_title" ) ) { if( ! p_input ) { - msg_rc("\n"); + msg_rc(""); } else { - msg_rc( "%s\n", 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 ) + || !strncmp( psz_cmd, "H", 1 ) || !strncmp( psz_cmd, "?", 1 ) ) + { + if( !strcmp( psz_cmd, "longhelp" ) || !strncmp( psz_cmd, "H", 1 ) ) + b_longhelp = VLC_TRUE; + else b_longhelp = VLC_FALSE; + + Help( p_intf, b_longhelp ); + } + else if( !strcmp( psz_cmd, "check-updates" ) ) + { + checkUpdates( p_intf, psz_arg ); + } else switch( psz_cmd[0] ) { case 'f': @@ -592,7 +766,26 @@ static void Run( intf_thread_t *p_intf ) if( p_vout ) { - p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE; + vlc_value_t val; + 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 ) ) + { + b_update = VLC_TRUE; + val.b_bool = VLC_TRUE; + } + 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 ) ) + b_update = VLC_TRUE; + if( b_update ) var_Set( p_vout, "fullscreen", val ); vlc_object_release( p_vout ); } } @@ -603,56 +796,12 @@ static void Run( intf_thread_t *p_intf ) ; break; - case '?': - case 'h': - case 'H': - msg_rc(_("+----[ Remote control commands ]\n")); - msg_rc("| \n"); - msg_rc(_("| add XYZ . . . . . . . . . . add XYZ to playlist\n")); - msg_rc(_("| playlist . . . show items currently in playlist\n")); - msg_rc(_("| play . . . . . . . . . . . . . . . . play stream\n")); - msg_rc(_("| stop . . . . . . . . . . . . . . . . stop stream\n")); - msg_rc(_("| next . . . . . . . . . . . . next playlist item\n")); - msg_rc(_("| prev . . . . . . . . . . previous playlist item\n")); - msg_rc(_("| title [X] . . . . set/get title in current item\n")); - msg_rc(_("| title_n . . . . . . next title in current item\n")); - msg_rc(_("| title_p . . . . previous title in current item\n")); - msg_rc(_("| chapter [X] . . set/get chapter in current item\n")); - msg_rc(_("| chapter_n . . . . next chapter in current item\n")); - msg_rc(_("| chapter_p . . previous chapter in current item\n")); - msg_rc("| \n"); - msg_rc(_("| seek X . seek in seconds, for instance `seek 12'\n")); - msg_rc(_("| pause . . . . . . . . . . . . . . toggle pause\n")); - msg_rc(_("| f . . . . . . . . . . . . . . toggle fullscreen\n")); - msg_rc(_("| info . . . information about the current stream\n")); - msg_rc("| \n"); - msg_rc(_("| volume [X] . . . . . . . . set/get audio volume\n")); - msg_rc(_("| volup [X] . . . . . raise audio volume X steps\n")); - msg_rc(_("| voldown [X] . . . . lower audio volume X steps\n")); - msg_rc(_("| adev [X] . . . . . . . . . set/get audio device\n")); - msg_rc(_("| achan [X]. . . . . . . . set/get audio channels\n")); - msg_rc("| \n"); - if (p_intf->p_sys->b_extend) - { - msg_rc(_("| marq-marquee STRING . . overlay STRING in video\n")); - msg_rc(_("| marq-x X . . . . . .offset of marquee, from left\n")); - msg_rc(_("| marq-y Y . . . . . . offset of marquee, from top\n")); - msg_rc(_("| marq-timeout T. . . . .timeout of marquee, in ms\n")); - msg_rc("| \n"); - } - msg_rc(_("| help . . . . . . . . . . . . . this help message\n")); - msg_rc(_("| logout . . . . . .exit (if in socket connection)\n")); - msg_rc(_("| quit . . . . . . . . . . . . . . . . . quit vlc\n")); - msg_rc("| \n"); - msg_rc(_("+----[ end of help ]\n")); - break; - case '\0': /* Ignore empty lines */ break; default: - msg_rc(_("unknown command `%s', type `help' for help\n"), psz_cmd); + msg_rc(_("Unknown command `%s'. Type `help' for help."), psz_cmd); break; } @@ -660,8 +809,16 @@ static void Run( intf_thread_t *p_intf ) i_size = 0; p_buffer[0] = 0; } + msg_rc( STATUS_CHANGE "( stop state: 0 )" ); + msg_rc( STATUS_CHANGE "( quit )" ); + if( p_input ) { + var_DelCallback( p_input, "state", StateChanged, p_intf ); + var_DelCallback( p_input, "rate-faster", RateChanged, p_intf ); + var_DelCallback( p_input, "rate-slower", RateChanged, p_intf ); + var_DelCallback( p_input, "rate", RateChanged, p_intf ); + var_DelCallback( p_input, "time-offset", TimeOffsetChanged, p_intf ); vlc_object_release( p_input ); p_input = NULL; } @@ -671,8 +828,198 @@ static void Run( intf_thread_t *p_intf ) vlc_object_release( p_playlist ); p_playlist = NULL; } + + 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(_("| 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(_("| 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(_("| 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(_("| 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( "| "); + 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( "| "); + 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-offsets x,y(,x,y)*. . . . list of offsets")); + 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-order id(,id)* . . . . order of pictures ")); + msg_rc(_("| mosaic-keep-aspect-ratio {0,1} . . .aspect ratio")); + msg_rc( "| "); + 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( "| "); + msg_rc(_("+----[ end of help ]")); +} + +/******************************************************************** + * Status callback routines + ********************************************************************/ +static int TimeOffsetChanged( vlc_object_t *p_this, char const *psz_cmd, + vlc_value_t oldval, vlc_value_t newval, void *p_data ) +{ + intf_thread_t *p_intf = (intf_thread_t*)p_data; + input_thread_t *p_input = NULL; + + vlc_mutex_lock( &p_intf->p_sys->status_lock ); + 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" ) ); + vlc_object_release( p_input ); + } + vlc_mutex_unlock( &p_intf->p_sys->status_lock ); + return VLC_SUCCESS; +} + +static int VolumeChanged( vlc_object_t *p_this, char const *psz_cmd, + vlc_value_t oldval, vlc_value_t newval, void *p_data ) +{ + 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") ); + vlc_mutex_unlock( &p_intf->p_sys->status_lock ); + return VLC_SUCCESS; +} + +static int StateChanged( vlc_object_t *p_this, char const *psz_cmd, + vlc_value_t oldval, vlc_value_t newval, void *p_data ) +{ + intf_thread_t *p_intf = (intf_thread_t*)p_data; + playlist_t *p_playlist = NULL; + input_thread_t *p_input = NULL; + + vlc_mutex_lock( &p_intf->p_sys->status_lock ); + p_input = vlc_object_find( p_intf, VLC_OBJECT_INPUT, FIND_ANYWHERE ); + if( p_input ) + { + p_playlist = vlc_object_find( p_input, VLC_OBJECT_PLAYLIST, FIND_PARENT ); + if( p_playlist ) + { + char cmd[5] = ""; + switch( p_playlist->status.i_status ) + { + case PLAYLIST_STOPPED: + strncpy( &cmd[0], "stop", 4); + cmd[4] = '\0'; + break; + case PLAYLIST_RUNNING: + strncpy( &cmd[0], "play", 4); + cmd[4] = '\0'; + break; + case PLAYLIST_PAUSED: + strncpy( &cmd[0], "pause", 5); + cmd[5] = '\0'; + break; + } /* var_GetInteger( p_input, "state" ) */ + msg_rc( STATUS_CHANGE "( %s state: %d )", &cmd[0], newval.i_int ); + vlc_object_release( p_playlist ); + } + vlc_object_release( p_input ); + } + vlc_mutex_unlock( &p_intf->p_sys->status_lock ); + return VLC_SUCCESS; +} + +static int RateChanged( vlc_object_t *p_this, char const *psz_cmd, + vlc_value_t oldval, vlc_value_t newval, void *p_data ) +{ + intf_thread_t *p_intf = (intf_thread_t*)p_data; + input_thread_t *p_input = NULL; + + vlc_mutex_lock( &p_intf->p_sys->status_lock ); + 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" ) ); + vlc_object_release( p_input ); + } + vlc_mutex_unlock( &p_intf->p_sys->status_lock ); + return VLC_SUCCESS; } +/******************************************************************** + * Command routines + ********************************************************************/ static int Input( vlc_object_t *p_this, char const *psz_cmd, vlc_value_t oldval, vlc_value_t newval, void *p_data ) { @@ -683,12 +1030,20 @@ static int Input( vlc_object_t *p_this, char const *psz_cmd, p_input = vlc_object_find( p_this, VLC_OBJECT_INPUT, FIND_ANYWHERE ); if( !p_input ) return VLC_ENOOBJ; + var_Get( p_input, "state", &val ); + 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.") ); + vlc_object_release( p_input ); + return VLC_EGENERIC; + } + /* Parse commands that only require an input */ if( !strcmp( psz_cmd, "pause" ) ) { - val.i_int = PAUSE_S; - - var_Set( p_input, "state", val ); + val.i_int = config_GetInt( p_intf, "key-play-pause" ); + var_Set( p_intf->p_libvlc, "key-pressed", val ); vlc_object_release( p_input ); return VLC_SUCCESS; } @@ -697,7 +1052,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 @@ -708,7 +1063,41 @@ 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, "fastforward" ) ) + { + val.i_int = config_GetInt( p_intf, "key-jump+extrashort" ); + 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_libvlc, "key-pressed", val ); + vlc_object_release( p_input ); + return VLC_SUCCESS; + } + 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; + } + else if ( !strcmp( psz_cmd, "normal" ) ) + { + val.i_int = INPUT_RATE_DEFAULT; + var_Set( p_input, "rate", val ); + vlc_object_release( p_input ); + return VLC_SUCCESS; + } else if( !strcmp( psz_cmd, "chapter" ) || !strcmp( psz_cmd, "chapter_n" ) || !strcmp( psz_cmd, "chapter_p" ) ) @@ -729,7 +1118,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\n", + 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 ); @@ -745,7 +1134,6 @@ static int Input( vlc_object_t *p_this, char const *psz_cmd, val.b_bool = VLC_TRUE; var_Set( p_input, "prev-chapter", val ); } - vlc_object_release( p_input ); return VLC_SUCCESS; } @@ -769,7 +1157,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\n", + 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 ); @@ -789,23 +1177,108 @@ 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 ); return VLC_EGENERIC; } 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; + playlist_t *p_playlist = pl_Yield( p_this ); - p_playlist = vlc_object_find( p_this, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); - if( !p_playlist ) + PL_LOCK; + if( p_playlist->p_input ) { - return VLC_ENOOBJ; + var_Get( p_playlist->p_input, "state", &val ); + 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" ) ) @@ -818,45 +1291,139 @@ static int Playlist( vlc_object_t *p_this, char const *psz_cmd, } else if( !strcmp( psz_cmd, "play" ) ) { + 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 ) + { + 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, "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 ) ) ) + { + 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" ) ) + { + msg_rc( _("goto is deprecated" ) ); + msg_Err( p_playlist, "goto is deprecated" ); + } else if( !strcmp( psz_cmd, "stop" ) ) { playlist_Stop( p_playlist ); } + else if( !strcmp( psz_cmd, "clear" ) ) + { + playlist_Stop( p_playlist ); + 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\n", 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 ); } } - else if( !strcmp( psz_cmd, "playlist" ) ) + else if( !strcmp( psz_cmd, "enqueue" ) && + newval.psz_string && *newval.psz_string ) { - int i; - for ( i = 0; i < p_playlist->i_size; i++ ) + input_item_t *p_item = parse_MRL( p_intf, newval.psz_string ); + + if( p_item ) { - msg_rc( "|%s%s %s|\n", i == p_playlist->i_index?"*":" ", - p_playlist->pp_items[i]->input.psz_name, - p_playlist->pp_items[i]->input.psz_uri ); + msg_rc( "trying to enqueue %s to playlist", newval.psz_string ); + playlist_AddInput( p_playlist, p_item, + PLAYLIST_APPEND, PLAYLIST_END, VLC_TRUE ); } - if ( i == 0 ) + } + 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 ) { - msg_rc( "| no entries\n" ); + /* Replay the current state of the system. */ + 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 ) + { + case PLAYLIST_STOPPED: + msg_rc( STATUS_CHANGE "( stop state: 0 )" ); + break; + case PLAYLIST_RUNNING: + msg_rc( STATUS_CHANGE "( play state: 1 )" ); + break; + case PLAYLIST_PAUSED: + msg_rc( STATUS_CHANGE "( pause state: 2 )" ); + break; + default: + msg_rc( STATUS_CHANGE "( state unknown )" ); + break; + } + vlc_mutex_unlock( &p_playlist->object_lock ); } } - + /* * sanity check */ else { - msg_rc( "unknown command!\n" ); + msg_rc( "unknown command!" ); } vlc_object_release( p_playlist ); @@ -867,90 +1434,101 @@ 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_pl; - vlc_value_t val; - vlc_object_t *p_inp; + vlc_object_t *p_playlist; + vlc_value_t val; + vlc_object_t *p_input; - p_pl = vlc_object_find( p_this, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); - if( !p_pl ) + p_playlist = vlc_object_find( p_this, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE ); + if( !p_playlist ) { return VLC_ENOOBJ; } - - p_inp = vlc_object_find( p_this, VLC_OBJECT_INPUT, - FIND_ANYWHERE ); - if( !p_inp ) + + p_input = vlc_object_find( p_this, VLC_OBJECT_INPUT, FIND_ANYWHERE ); + if( !p_input ) { + vlc_object_release( p_playlist ); return VLC_ENOOBJ; } - /* Parse miscellaneous commands */ - if( !strcmp( psz_cmd, "marq-marquee" ) ) - { - if( strlen( newval.psz_string ) > 0 ) - { - val.psz_string = newval.psz_string; - var_Set( p_inp->p_libvlc, "marq-marquee", val ); - } - else - { - val.psz_string = ""; - var_Set( p_inp->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_inp->p_libvlc, "marq-x", val ); - } - } - else if( !strcmp( psz_cmd, "marq-y" ) ) + if( p_input ) { - if( strlen( newval.psz_string ) > 0) + var_Get( p_input, "state", &val ); + if( ( val.i_int == PAUSE_S ) || ( val.i_int == PLAYLIST_PAUSED ) ) { - val.i_int = atoi( newval.psz_string ); - var_Set( p_inp->p_libvlc, "marq-y", val ); + msg_rc( _("Type 'pause' to continue.") ); + vlc_object_release( p_playlist ); + vlc_object_release( p_input ); + return VLC_EGENERIC; } } - else if( !strcmp( psz_cmd, "marq-timeout" ) ) + + /* Parse miscellaneous commands */ { - if( strlen( newval.psz_string ) > 0) + static const char vars[] = + "marq-x\0" "marq-y\0" "marq-position\0" "marq-color\0" + "marq-opacity\0" "marq-size\0" "marq-timeout\0" + "mosaic-alpha\0" "mosaic-height\0" "mosaic-width\0" + "mosaic-xoffset\0" "mosaic-yoffset\0" "mosaic-align\0" + "mosaic-vborder\0" "mosaic-hborder\0" "mosaic-position\0" + "mosaic-rows\0" "mosaic-cols\0" "mosaic-order\0" + "mosaic-offsets\0" "mosaic-keep-aspect-ratio\0" + "logo-file\0" "logo-x\0" "logo-y\0" "logo-position\0" + "logo-transparency\0"; + const char *psz_name = NULL; + + if( newval.psz_string ) + for( psz_name = vars; *psz_name; psz_name += strlen( psz_name ) + 1 ) { - val.i_int = atoi( newval.psz_string ); - var_Set( p_inp, "marq-timeout", val ); + if( strcmp( psz_name, psz_cmd ) == 0 ) + { + int i_type = var_Type( p_input->p_libvlc_global, psz_name ); + + if( i_type & VLC_VAR_INTEGER ) + { + var_SetInteger( p_input->p_libvlc_global, psz_name, + atoi( newval.psz_string ) ); + break; + } + else if( i_type & VLC_VAR_STRING ) + { + var_SetString( p_input->p_libvlc_global, psz_name, + newval.psz_string ); + break; + } + } } - } - - /* - * sanity check - */ - else - { - msg_rc( "unknown command!\n" ); + + if( *psz_name == '\0' ) + msg_rc( "Unknown command!" ); } - vlc_object_release( p_pl ); - vlc_object_release( p_inp ); + 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 ) { - p_this->p_vlc->b_die = VLC_TRUE; + playlist_t *p_playlist; + + p_playlist = vlc_object_find( p_this, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE ); + if( p_playlist ) + { + playlist_Stop( p_playlist ); + vlc_object_release( p_playlist ); + } + p_this->p_libvlc->b_die = VLC_TRUE; return VLC_SUCCESS; } static int Intf( vlc_object_t *p_this, char const *psz_cmd, vlc_value_t oldval, vlc_value_t newval, void *p_data ) { - intf_thread_t *p_newintf; - - p_newintf = intf_Create( p_this->p_vlc, newval.psz_string ); + intf_thread_t *p_newintf = NULL; + p_newintf = intf_Create( p_this->p_libvlc, newval.psz_string, 0, NULL ); if( p_newintf ) { p_newintf->b_block = VLC_FALSE; @@ -968,19 +1546,50 @@ static int Volume( 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; - int i_error; + input_thread_t *p_input = NULL; + int i_error = VLC_EGENERIC; + + p_input = vlc_object_find( p_this, VLC_OBJECT_INPUT, FIND_ANYWHERE ); + if( !p_input ) + return VLC_ENOOBJ; + + if( p_input ) + { + vlc_value_t val; + + var_Get( p_input, "state", &val ); + if( ( val.i_int == PAUSE_S ) || ( val.i_int == PLAYLIST_PAUSED ) ) + { + msg_rc( _("Type 'menu select' or 'pause' to continue.") ); + vlc_object_release( p_input ); + return VLC_EGENERIC; + } + vlc_object_release( p_input ); + } if ( *newval.psz_string ) { /* Set. */ audio_volume_t i_volume = atoi( newval.psz_string ); - if ( i_volume > AOUT_VOLUME_MAX ) + if ( (i_volume > (audio_volume_t)AOUT_VOLUME_MAX) ) { - msg_rc( "Volume must be in the range %d-%d\n", AOUT_VOLUME_MIN, + msg_rc( "Volume must be in the range %d-%d.", AOUT_VOLUME_MIN, AOUT_VOLUME_MAX ); i_error = VLC_EBADVAR; } - else i_error = aout_VolumeSet( p_this, i_volume ); + else + { + if( i_volume == AOUT_VOLUME_MIN ) + { + vlc_value_t keyval; + + keyval.i_int = config_GetInt( p_intf, "key-vol-mute" ); + var_Set( p_intf->p_libvlc, "key-pressed", keyval ); + } + i_error = aout_VolumeSet( p_this, i_volume ); + osd_Volume( p_this ); + msg_rc( STATUS_CHANGE "( audio volume: %d )", i_volume ); + } } else { @@ -992,7 +1601,7 @@ static int Volume( vlc_object_t *p_this, char const *psz_cmd, } else { - msg_rc( "Volume is %d\n", i_volume ); + msg_rc( STATUS_CHANGE "( audio volume: %d )", i_volume ); i_error = VLC_SUCCESS; } } @@ -1005,10 +1614,31 @@ static int VolumeMove( vlc_object_t *p_this, char const *psz_cmd, { intf_thread_t *p_intf = (intf_thread_t*)p_this; audio_volume_t i_volume; + input_thread_t *p_input = NULL; int i_nb_steps = atoi(newval.psz_string); int i_error = VLC_SUCCESS; + int i_volume_step = 0; - if ( i_nb_steps <= 0 || i_nb_steps > (AOUT_VOLUME_MAX/AOUT_VOLUME_STEP) ) + p_input = vlc_object_find( p_this, VLC_OBJECT_INPUT, FIND_ANYWHERE ); + if( !p_input ) + return VLC_ENOOBJ; + + if( p_input ) + { + vlc_value_t val; + + var_Get( p_input, "state", &val ); + if( ( val.i_int == PAUSE_S ) || ( val.i_int == PLAYLIST_PAUSED ) ) + { + 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_libvlc, "volume-step" ); + if ( i_nb_steps <= 0 || i_nb_steps > (AOUT_VOLUME_MAX/i_volume_step) ) { i_nb_steps = 1; } @@ -1023,8 +1653,129 @@ static int VolumeMove( vlc_object_t *p_this, char const *psz_cmd, if ( aout_VolumeDown( p_this, i_nb_steps, &i_volume ) < 0 ) i_error = VLC_EGENERIC; } + osd_Volume( p_this ); + + if ( !i_error ) msg_rc( STATUS_CHANGE "( audio volume: %d )", i_volume ); + 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; + } - if ( !i_error ) msg_rc( "Volume is %d\n", i_volume ); + 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; } @@ -1032,11 +1783,29 @@ static int AudioConfig( 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; aout_instance_t * p_aout; 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; + + if( p_input ) + { + vlc_value_t val; + + var_Get( p_input, "state", &val ); + if( ( val.i_int == PAUSE_S ) || ( val.i_int == PLAYLIST_PAUSED ) ) { + msg_rc( _("Type 'menu select' or 'pause' to continue.") ); + vlc_object_release( p_input ); + return VLC_EGENERIC; + } + vlc_object_release( p_input ); + } + p_aout = vlc_object_find( p_this, VLC_OBJECT_AOUT, FIND_ANYWHERE ); if ( p_aout == NULL ) return VLC_ENOOBJ; @@ -1074,19 +1843,19 @@ static int AudioConfig( vlc_object_t *p_this, char const *psz_cmd, return VLC_EGENERIC; } - msg_rc( "+----[ %s ]\n", val_name.psz_string ); + 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 *\n", 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\n", 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 ); } var_Change( (vlc_object_t *)p_aout, psz_variable, VLC_VAR_FREELIST, &val, &text ); - msg_rc( "+----[ end of %s ]\n", val_name.psz_string ); + msg_rc( "+----[ end of %s ]", val_name.psz_string ); if( val_name.psz_string ) free( val_name.psz_string ); i_error = VLC_SUCCESS; @@ -1103,6 +1872,67 @@ static int AudioConfig( vlc_object_t *p_this, char const *psz_cmd, return i_error; } +/* OSD menu commands */ +static int Menu( 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; + playlist_t *p_playlist = NULL; + vlc_value_t val; + int i_error = VLC_EGENERIC; + + if ( !*newval.psz_string ) + { + msg_rc( _("Please provide one of the following parameters:") ); + msg_rc( "[on|off|up|down|left|right|select]" ); + return i_error; + } + + p_playlist = vlc_object_find( p_this, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE ); + if( !p_playlist ) + return VLC_ENOOBJ; + + if( p_playlist->p_input ) + { + var_Get( p_playlist->p_input, "state", &val ); + if( ( ( val.i_int == PAUSE_S ) || ( val.i_int == PLAYLIST_PAUSED ) ) && + ( strcmp( newval.psz_string, "select" ) != 0 ) ) + { + msg_rc( _("Type 'menu select' or 'pause' to continue.") ); + vlc_object_release( p_playlist ); + return VLC_EGENERIC; + } + } + vlc_object_release( p_playlist ); + + val.psz_string = strdup( newval.psz_string ); + if( !strcmp( val.psz_string, "on" ) || !strcmp( val.psz_string, "show" )) + osd_MenuShow( p_this ); + else if( !strcmp( val.psz_string, "off" ) || !strcmp( val.psz_string, "hide" ) ) + osd_MenuHide( p_this ); + else if( !strcmp( val.psz_string, "up" ) ) + osd_MenuUp( p_this ); + else if( !strcmp( val.psz_string, "down" ) ) + osd_MenuDown( p_this ); + else if( !strcmp( val.psz_string, "left" ) ) + osd_MenuPrev( p_this ); + else if( !strcmp( val.psz_string, "right" ) ) + osd_MenuNext( p_this ); + else if( !strcmp( val.psz_string, "select" ) ) + osd_MenuActivate( p_this ); + else + { + 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; + } + + i_error = VLC_SUCCESS; + if( val.psz_string ) free( val.psz_string ); + return i_error; +} + #ifdef WIN32 vlc_bool_t ReadWin32( intf_thread_t *p_intf, char *p_buffer, int *pi_size ) { @@ -1113,7 +1943,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 ) ) { @@ -1183,10 +2013,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 && + while( !intf_ShouldDie( p_intf ) && *pi_size < MAX_LINE_LENGTH && (i_read = net_ReadNonBlock( p_intf, p_intf->p_sys->i_socket == -1 ? 0 /*STDIN_FILENO*/ : p_intf->p_sys->i_socket, NULL, - p_buffer + *pi_size, 1, INTF_IDLE_SLEEP ) ) > 0 ) + (uint8_t *)p_buffer + *pi_size, 1, INTF_IDLE_SLEEP ) ) > 0 ) { if( p_buffer[ *pi_size ] == '\r' || p_buffer[ *pi_size ] == '\n' ) break; @@ -1213,19 +2043,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; @@ -1276,10 +2106,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] ); } } @@ -1288,3 +2118,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 ); +}