X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcontrol%2Frc.c;h=1fd71e6627c78e6f5714343a4a9c3126584c27d4;hb=d18bfd92bb33df6e590efa02a55121ee75529b4f;hp=34aa35afdc5031ee7794078f2190a04d5cf44d54;hpb=09699dedb553f768752dec3f1bdf73c10e18bd95;p=vlc diff --git a/modules/control/rc.c b/modules/control/rc.c index 34aa35afdc..1fd71e6627 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,7 +19,7 @@ * * 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. *****************************************************************************/ /***************************************************************************** @@ -36,6 +37,9 @@ #include #include #include +#include +#include +#include #ifdef HAVE_UNISTD_H # include @@ -48,19 +52,18 @@ #include "vlc_error.h" #include "network.h" +#include "vlc_url.h" -#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,8 +72,13 @@ 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 int Input ( vlc_object_t *, char const *, vlc_value_t, vlc_value_t, void * ); static int Playlist ( vlc_object_t *, char const *, @@ -87,30 +95,56 @@ static int VolumeMove ( 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; + vlc_bool_t b_quiet; #endif }; #ifdef HAVE_VARIADIC_MACROS -# define printf( psz_format, args... ) \ - Printf( p_intf, psz_format, ## args ) +# define msg_rc( psz_format, args... ) \ + __msg_rc( p_intf, psz_format, ## args ) #endif -void Printf( intf_thread_t *p_intf, const char *psz_fmt, ... ) +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 ); - else net_vaPrintf( p_intf, p_intf->p_sys->i_socket, psz_fmt, args ); + + if( p_intf->p_sys->i_socket == -1 ) + { + vprintf( psz_fmt, args ); + printf( "\r\n" ); + } + else + { + 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 ); } @@ -131,9 +165,6 @@ void Printf( 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") @@ -145,6 +176,9 @@ void Printf( 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_description( _("Remote control interface") ); add_bool( "rc-show-pos", 0, NULL, POS_TEXT, POS_LONGTEXT, VLC_TRUE ); #ifdef HAVE_ISATTY @@ -156,7 +190,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 ); @@ -168,8 +201,9 @@ 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 i_socket = -1; + int *pi_socket = NULL; #if defined(HAVE_ISATTY) && !defined(WIN32) /* Check that stdin is a TTY */ @@ -183,7 +217,9 @@ 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; + +#if !defined(AF_LOCAL) || defined(WIN32) msg_Warn( p_intf, "your OS doesn't support filesystem sockets" ); free( psz_unix_path ); return VLC_EGENERIC; @@ -195,7 +231,7 @@ static int Activate( vlc_object_t *p_this ) 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 ); @@ -223,10 +259,21 @@ static int Activate( vlc_object_t *p_this ) net_Close( i_socket ); return VLC_EGENERIC; } + + /* FIXME: we need a core function to merge listening sockets sets */ + pi_socket = calloc( 2, sizeof( int ) ); + if( pi_socket == NULL ) + { + free( psz_unix_path ); + net_Close( i_socket ); + 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; @@ -235,7 +282,8 @@ static int Activate( vlc_object_t *p_this ) 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 ); @@ -255,9 +303,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 ); @@ -265,12 +315,24 @@ static int Activate( vlc_object_t *p_this ) p_intf->pf_run = Run; #ifdef WIN32 - if( !config_GetInt( p_intf, "rc-quiet" ) ) { CONSOLE_INTRO_MSG; } + p_intf->p_sys->b_quiet = config_GetInt( p_intf, "rc-quiet" ); + if( !p_intf->p_sys->b_quiet ) { CONSOLE_INTRO_MSG; } #else CONSOLE_INTRO_MSG; #endif - printf( _("Remote control interface initialized, `h' for help\n") ); + /* 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") ); return VLC_SUCCESS; } @@ -281,43 +343,25 @@ 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 ); } /***************************************************************************** - * Run: rc thread - ***************************************************************************** - * This part of the interface is in a separate thread so that we can call - * exec() from within it without annoying the rest of the program. + * RegisterCallbacks: Register callbacks to dynamic variables *****************************************************************************/ -static void Run( intf_thread_t *p_intf ) +static void RegisterCallbacks( intf_thread_t *p_intf ) { - input_thread_t * p_input; - playlist_t * p_playlist; - - char p_buffer[ MAX_LINE_LENGTH + 1 ]; - vlc_bool_t b_showpos = config_GetInt( p_intf, "rc-show-pos" ); - - int i_size = 0; - int i_oldpos = 0; - int i_newpos; - - 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 ); @@ -332,20 +376,95 @@ static void Run( intf_thread_t *p_intf ) 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 ); + + /* OSD menu commands */ + var_Create( p_intf, "menu", VLC_VAR_STRING | VLC_VAR_ISCOMMAND ); + var_AddCallback( p_intf, "menu", Menu, NULL ); + + /* 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 ); @@ -363,6 +482,18 @@ static void Run( intf_thread_t *p_intf ) 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 ); + + /* 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 ); @@ -373,6 +504,37 @@ static void Run( intf_thread_t *p_intf ) 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 ); +} + +/***************************************************************************** + * Run: rc thread + ***************************************************************************** + * This part of the interface is in a separate thread so that we can call + * exec() from within it without annoying the rest of the program. + *****************************************************************************/ +static void Run( intf_thread_t *p_intf ) +{ + input_thread_t * p_input; + playlist_t * p_playlist; + + 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; + int i_newpos; + + p_buffer[0] = 0; + p_input = NULL; + p_playlist = NULL; + + /* Register commands that will be cleaned up upon object destruction */ + RegisterCallbacks( p_intf ); + + /* status callbacks */ + /* Listen to audio volume updates */ + var_AddCallback( p_intf->p_vlc, "volume-change", VolumeChanged, p_intf ); #ifdef WIN32 /* Get the file descriptor of the console input */ @@ -389,11 +551,11 @@ static void Run( intf_thread_t *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 ); @@ -416,11 +578,63 @@ 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 )", p_input->input.p_item->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 ) @@ -429,7 +643,7 @@ static void Run( intf_thread_t *p_intf ) if( i_oldpos != i_newpos ) { i_oldpos = i_newpos; - printf( "pos: %d%%\n", i_newpos ); + msg_rc( "pos: %d%%", i_newpos ); } } @@ -468,7 +682,7 @@ static void Run( intf_thread_t *p_intf ) val.psz_string = psz_arg; i_ret = var_Set( p_intf, psz_cmd, val ); - printf( _("%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 */ @@ -483,7 +697,7 @@ static void Run( intf_thread_t *p_intf ) i_ret = var_Set( p_intf->p_libvlc, psz_cmd, val ); if( i_ret != 0 ) { - printf( _("%s: returned %i (%s)\n"), + msg_rc( "%s: returned %i (%s)", psz_cmd, i_ret, vlc_error( i_ret ) ); } } @@ -507,72 +721,85 @@ static void Run( intf_thread_t *p_intf ) info_category_t *p_category = p_input->input.p_item->pp_categories[i]; - printf( "+----[ %s ]\n", p_category->psz_name ); - printf( "| \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]; - printf( "| %s: %s\n", p_info->psz_name, + msg_rc( "| %s: %s", p_info->psz_name, p_info->psz_value ); } - printf( "| \n" ); + msg_rc( "| " ); } - printf( _("+----[ end of stream info ]\n") ); + msg_rc( "+----[ end of stream info ]" ); vlc_mutex_unlock( &p_input->input.p_item->lock ); } else { - printf( _("no input\n") ); + msg_rc( "no input" ); } } else if( !strcmp( psz_cmd, "is_playing" ) ) { if( ! p_input ) { - printf( "0\n" ); + msg_rc( "0" ); } else { - printf( "1\n" ); + msg_rc( "1" ); } } else if( !strcmp( psz_cmd, "get_time" ) ) { if( ! p_input ) { - printf("0\n"); + msg_rc("0"); } else { vlc_value_t time; var_Get( p_input, "time", &time ); - printf( "%i\n", time.i_time / 1000000); + msg_rc( "%i", time.i_time / 1000000); } } else if( !strcmp( psz_cmd, "get_length" ) ) { if( ! p_input ) { - printf("0\n"); + msg_rc("0"); } else { vlc_value_t time; var_Get( p_input, "length", &time ); - printf( "%i\n", time.i_time / 1000000); + msg_rc( "%i", time.i_time / 1000000); } } else if( !strcmp( psz_cmd, "get_title" ) ) { if( ! p_input ) { - printf("\n"); + msg_rc(""); } else { - printf( "%s\n", p_input->input.p_item->psz_name ); + msg_rc( "%s", p_input->input.p_item->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': @@ -585,7 +812,23 @@ 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 ); } } @@ -596,56 +839,12 @@ static void Run( intf_thread_t *p_intf ) ; break; - case '?': - case 'h': - case 'H': - printf(_("+----[ Remote control commands ]\n")); - printf("| \n"); - printf(_("| add XYZ . . . . . . . . . . add XYZ to playlist\n")); - printf(_("| playlist . . . show items currently in playlist\n")); - printf(_("| play . . . . . . . . . . . . . . . . play stream\n")); - printf(_("| stop . . . . . . . . . . . . . . . . stop stream\n")); - printf(_("| next . . . . . . . . . . . . next playlist item\n")); - printf(_("| prev . . . . . . . . . . previous playlist item\n")); - printf(_("| title [X] . . . . set/get title in current item\n")); - printf(_("| title_n . . . . . . next title in current item\n")); - printf(_("| title_p . . . . previous title in current item\n")); - printf(_("| chapter [X] . . set/get chapter in current item\n")); - printf(_("| chapter_n . . . . next chapter in current item\n")); - printf(_("| chapter_p . . previous chapter in current item\n")); - printf("| \n"); - printf(_("| seek X . seek in seconds, for instance `seek 12'\n")); - printf(_("| pause . . . . . . . . . . . . . . toggle pause\n")); - printf(_("| f . . . . . . . . . . . . . . toggle fullscreen\n")); - printf(_("| info . . . information about the current stream\n")); - printf("| \n"); - printf(_("| volume [X] . . . . . . . . set/get audio volume\n")); - printf(_("| volup [X] . . . . . raise audio volume X steps\n")); - printf(_("| voldown [X] . . . . lower audio volume X steps\n")); - printf(_("| adev [X] . . . . . . . . . set/get audio device\n")); - printf(_("| achan [X]. . . . . . . . set/get audio channels\n")); - printf("| \n"); - if (p_intf->p_sys->b_extend) - { - printf(_("| marq-marquee STRING . . overlay STRING in video\n")); - printf(_("| marq-x X . . . . . .offset of marquee, from left\n")); - printf(_("| marq-y Y . . . . . . offset of marquee, from top\n")); - printf(_("| marq-timeout T. . . . .timeout of marquee, in ms\n")); - printf("| \n"); - } - printf(_("| help . . . . . . . . . . . . . this help message\n")); - printf(_("| logout . . . . . .exit (if in socket connection)\n")); - printf(_("| quit . . . . . . . . . . . . . . . . . quit vlc\n")); - printf("| \n"); - printf(_("+----[ end of help ]\n")); - break; - case '\0': /* Ignore empty lines */ break; default: - printf(_("unknown command `%s', type `help' for help\n"), psz_cmd); + msg_rc(_("unknown command `%s', type `help' for help"), psz_cmd); break; } @@ -653,8 +852,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; } @@ -664,8 +871,188 @@ static void Run( intf_thread_t *p_intf ) vlc_object_release( p_playlist ); p_playlist = NULL; } + + var_DelCallback( p_intf->p_vlc, "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( "| "); + 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( "| "); + 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( "| "); + + 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(_("| 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( "| "); + 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-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( "| "); + 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 ) { @@ -676,12 +1063,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_vlc, "key-pressed", val ); vlc_object_release( p_input ); return VLC_SUCCESS; } @@ -701,7 +1096,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_vlc, "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 ); + 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" ) ) @@ -722,7 +1151,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 ); - printf( _("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 ); @@ -738,7 +1167,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; } @@ -762,7 +1190,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 ); - printf( _("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 ); @@ -784,15 +1212,16 @@ static int Input( vlc_object_t *p_this, char const *psz_cmd, } /* 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; - vlc_value_t val; p_playlist = vlc_object_find( p_this, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE ); @@ -801,6 +1230,17 @@ static int Playlist( vlc_object_t *p_this, char const *psz_cmd, return VLC_ENOOBJ; } + 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") ); + vlc_object_release( p_playlist ); + return VLC_EGENERIC; + } + } + /* Parse commands that require a playlist */ if( !strcmp( psz_cmd, "prev" ) ) { @@ -812,113 +1252,435 @@ static int Playlist( vlc_object_t *p_this, char const *psz_cmd, } else if( !strcmp( psz_cmd, "play" ) ) { - playlist_Play( p_playlist ); + if( p_playlist->p_input ) + { + vlc_value_t val; + + var_Get( p_playlist->p_input, "rate", &val ); + if( val.i_int != INPUT_RATE_DEFAULT ) + { + val.i_int = INPUT_RATE_DEFAULT; + var_Set( p_playlist->p_input, "rate", val ); + } + else + { + playlist_Play( p_playlist ); + } + } + } + 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); + } } else if( !strcmp( psz_cmd, "stop" ) ) { playlist_Stop( p_playlist ); } - else if( !strcmp( psz_cmd, "add" ) ) + else if( !strcmp( psz_cmd, "clear" ) ) { - printf( _("trying to add %s to playlist\n"), newval.psz_string ); - playlist_Add( p_playlist, newval.psz_string, newval.psz_string, - PLAYLIST_GO|PLAYLIST_APPEND, PLAYLIST_END ); + playlist_Stop( p_playlist ); + vlc_mutex_lock( &p_playlist->object_lock ); + playlist_Clear( p_playlist ); + vlc_mutex_unlock( &p_playlist->object_lock ); + } + else if( !strcmp( psz_cmd, "add" ) && + newval.psz_string && *newval.psz_string ) + { + playlist_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 ); + } } else if( !strcmp( psz_cmd, "playlist" ) ) { int i; + for ( i = 0; i < p_playlist->i_size; i++ ) { - printf( "|%s%s %s|\n", i == p_playlist->i_index?"*":" ", + 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]->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 ) { - printf( _("| no entries\n") ); + msg_rc( "| no entries" ); + } + } + 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" )); + + 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 { - printf( _("unknown command!\n") ); + msg_rc( "unknown command!" ); } vlc_object_release( p_playlist ); return VLC_SUCCESS; } -static Other( vlc_object_t *p_this, char const *psz_cmd, +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_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_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_pl, "marq-marquee", val ); + var_Set( p_input->p_libvlc, "marq-marquee", val ); } - else + else { - val.psz_string = ""; - var_Set( p_pl, "marq-marquee", val); + 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) + if( strlen( newval.psz_string ) > 0) { val.i_int = atoi( newval.psz_string ); - var_Set( p_pl, "marq-x", val ); + var_Set( p_input->p_libvlc, "marq-x", val ); } } else if( !strcmp( psz_cmd, "marq-y" ) ) { - if( strlen( newval.psz_string ) > 0) + 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_pl, "marq-y", val ); + 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) + if( strlen( newval.psz_string ) > 0) { val.i_int = atoi( newval.psz_string ); - var_Set( p_pl, "marq-timeout", val ); + 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 { - printf( _("unknown command!\n") ); + msg_rc( "unknown command!" ); } - vlc_object_release( p_pl ); + 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 ) { + 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_vlc->b_die = VLC_TRUE; return VLC_SUCCESS; } @@ -926,10 +1688,9 @@ static int Quit( vlc_object_t *p_this, char const *psz_cmd, 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_vlc, newval.psz_string, 0, NULL ); if( p_newintf ) { p_newintf->b_block = VLC_FALSE; @@ -947,19 +1708,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( _("press 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) ) { - printf( _("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_vlc, "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 { @@ -971,7 +1763,7 @@ static int Volume( vlc_object_t *p_this, char const *psz_cmd, } else { - printf( _("Volume is %d\n"), i_volume ); + msg_rc( STATUS_CHANGE "( audio volume: %d )", i_volume ); i_error = VLC_SUCCESS; } } @@ -984,10 +1776,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( _("press 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" ); + if ( i_nb_steps <= 0 || i_nb_steps > (AOUT_VOLUME_MAX/i_volume_step) ) { i_nb_steps = 1; } @@ -1002,8 +1815,9 @@ 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 ) printf( _("Volume is %d\n"), i_volume ); + if ( !i_error ) msg_rc( STATUS_CHANGE "( audio volume: %d )", i_volume ); return i_error; } @@ -1011,11 +1825,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( _("press 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; @@ -1053,19 +1885,19 @@ static int AudioConfig( vlc_object_t *p_this, char const *psz_cmd, return VLC_EGENERIC; } - printf( "+----[ %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 ) - printf( "| %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 - printf( "| %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 ); - printf( _("+----[ 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; @@ -1082,6 +1914,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 paramaters") ); + 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( _("press 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 paramaters") ); + 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 ) { @@ -1153,14 +2046,19 @@ vlc_bool_t ReadCommand( intf_thread_t *p_intf, char *p_buffer, int *pi_size ) int i_read = 0; #ifdef WIN32 - if( p_intf->p_sys->i_socket == -1 ) + if( p_intf->p_sys->i_socket == -1 && !p_intf->p_sys->b_quiet ) return ReadWin32( p_intf, p_buffer, pi_size ); + else if( p_intf->p_sys->i_socket == -1 ) + { + msleep( INTF_IDLE_SLEEP ); + return VLC_FALSE; + } #endif while( !p_intf->b_die && *pi_size < MAX_LINE_LENGTH && (i_read = net_ReadNonBlock( p_intf, p_intf->p_sys->i_socket == -1 ? - STDIN_FILENO : p_intf->p_sys->i_socket, - p_buffer + *pi_size, 1, INTF_IDLE_SLEEP ) ) > 0 ) + 0 /*STDIN_FILENO*/ : p_intf->p_sys->i_socket, NULL, + (uint8_t *)p_buffer + *pi_size, 1, INTF_IDLE_SLEEP ) ) > 0 ) { if( p_buffer[ *pi_size ] == '\r' || p_buffer[ *pi_size ] == '\n' ) break; @@ -1185,3 +2083,197 @@ vlc_bool_t ReadCommand( intf_thread_t *p_intf, char *p_buffer, int *pi_size ) return VLC_FALSE; } + +/***************************************************************************** + * parse_MRL: build a playlist 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 ) +{ +#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; + char *psz_item = NULL, *psz_item_mrl = NULL, *psz_orig; + char **ppsz_options = NULL; + int i, i_options = 0; + + if( !psz_mrl ) return 0; + + psz_mrl = psz_orig = strdup( psz_mrl ); + while( *psz_mrl ) + { + SKIPSPACE( psz_mrl ); + psz_item = psz_mrl; + + for( ; *psz_mrl; psz_mrl++ ) + { + if( (*psz_mrl == ' ' || *psz_mrl == '\t') && psz_mrl[1] == ':' ) + { + /* We have a complete item */ + break; + } + if( (*psz_mrl == ' ' || *psz_mrl == '\t') && + (psz_mrl[1] == '"' || psz_mrl[1] == '\'') && psz_mrl[2] == ':') + { + /* We have a complete item */ + break; + } + } + + if( *psz_mrl ) { *psz_mrl = 0; psz_mrl++; } + SKIPTRAILINGSPACE( psz_item, psz_item + strlen( psz_item ) ); + + /* Remove '"' and '\'' if necessary */ + if( *psz_item == '"' && psz_item[strlen(psz_item)-1] == '"' ) + { psz_item++; psz_item[strlen(psz_item)-1] = 0; } + if( *psz_item == '\'' && psz_item[strlen(psz_item)-1] == '\'' ) + { psz_item++; psz_item[strlen(psz_item)-1] = 0; } + + if( !psz_item_mrl ) psz_item_mrl = psz_item; + else if( *psz_item ) + { + i_options++; + ppsz_options = realloc( ppsz_options, i_options * sizeof(char *) ); + ppsz_options[i_options - 1] = &psz_item[1]; + } + + if( *psz_mrl ) SKIPSPACE( psz_mrl ); + } + + /* Now create a playlist item */ + if( psz_item_mrl ) + { + p_item = playlist_ItemNew( p_intf, psz_item_mrl, psz_item_mrl ); + for( i = 0; i < i_options; i++ ) + { + playlist_ItemAddOption( p_item, ppsz_options[i] ); + } + } + + if( i_options ) free( ppsz_options ); + free( psz_orig ); + + 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 ); +}