X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fcontrol%2Frc.c;h=ab990baeb11d5a147c4c18a2b263b1d6f9e2b7f4;hb=25b8641d713521fd4e0114b31b93516273845034;hp=2d4d4bf0053c6fb862c4edcfda0e03250931188c;hpb=a1e597bf0072e2466e137277ec9ff0562c8d0a8e;p=vlc diff --git a/modules/control/rc.c b/modules/control/rc.c index 2d4d4bf005..ab990baeb1 100644 --- a/modules/control/rc.c +++ b/modules/control/rc.c @@ -1,7 +1,7 @@ /***************************************************************************** * rc.c : remote control stdin/stdout module for vlc ***************************************************************************** - * Copyright (C) 2004 - 2005 the VideoLAN team + * Copyright (C) 2004-2007 the VideoLAN team * $Id$ * * Author: Peter Surda @@ -25,20 +25,21 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* malloc(), free() */ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include #include /* ENOMEM */ -#include #include #include -#include -#include -#include -#include -#include +#include +#include +#include #include +#include #ifdef HAVE_UNISTD_H # include @@ -49,8 +50,10 @@ #endif #include -#include "vlc_error.h" -#include "network.h" +#include +#include "vlc_url.h" + +#include #if defined(AF_UNIX) && !defined(AF_LOCAL) # define AF_LOCAL AF_UNIX @@ -63,6 +66,8 @@ #define MAX_LINE_LENGTH 256 #define STATUS_CHANGE "status change: " +static const char *ppsz_input_state[] = { N_("Initializing"), N_("Opening"), N_("Buffer"), N_("Play"), N_("Pause"), N_("Stop"), N_("Error") }; + /***************************************************************************** * Local prototypes *****************************************************************************/ @@ -70,19 +75,17 @@ 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 Help ( intf_thread_t *, bool ); static void RegisterCallbacks( intf_thread_t * ); -static vlc_bool_t ReadCommand( intf_thread_t *, char *, int * ); +static bool ReadCommand( intf_thread_t *, char *, int * ); -static playlist_item_t *parse_MRL( intf_thread_t *, char * ); +static input_item_t *parse_MRL( intf_thread_t *, char * ); static int Input ( vlc_object_t *, char const *, vlc_value_t, vlc_value_t, void * ); static int Playlist ( vlc_object_t *, char const *, vlc_value_t, vlc_value_t, void * ); -static int Other ( vlc_object_t *, char const *, - vlc_value_t, vlc_value_t, void * ); static int Quit ( vlc_object_t *, char const *, vlc_value_t, vlc_value_t, void * ); static int Intf ( vlc_object_t *, char const *, @@ -91,10 +94,16 @@ 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 int Statistics ( vlc_object_t *, char const *, + vlc_value_t, vlc_value_t, void * ); + +static int updateStatistics( intf_thread_t *, input_item_t *); /* Status Callbacks */ static int TimeOffsetChanged( vlc_object_t *, char const *, @@ -118,23 +127,20 @@ struct intf_sys_t #ifdef WIN32 HANDLE hConsoleIn; - vlc_bool_t b_quiet; + bool b_quiet; #endif }; -#ifdef HAVE_VARIADIC_MACROS -# define msg_rc( psz_format, args... ) \ - __msg_rc( p_intf, psz_format, ## args ) -#endif +#define msg_rc( ... ) __msg_rc( p_intf, __VA_ARGS__ ) -void __msg_rc( intf_thread_t *p_intf, const char *psz_fmt, ... ) +static void __msg_rc( intf_thread_t *p_intf, const char *psz_fmt, ... ) { va_list args; va_start( args, psz_fmt ); if( p_intf->p_sys->i_socket == -1 ) { - vprintf( psz_fmt, args ); + utf8_vfprintf( stdout, psz_fmt, args ); printf( "\r\n" ); } else @@ -175,20 +181,22 @@ void __msg_rc( intf_thread_t *p_intf, const char *psz_fmt, ... ) vlc_module_begin(); set_shortname( _("RC")); set_category( CAT_INTERFACE ); - set_subcategory( SUBCAT_INTERFACE_GENERAL ); + set_subcategory( SUBCAT_INTERFACE_MAIN ); set_description( _("Remote control interface") ); - add_bool( "rc-show-pos", 0, NULL, POS_TEXT, POS_LONGTEXT, VLC_TRUE ); -#ifdef HAVE_ISATTY - add_bool( "rc-fake-tty", 0, NULL, TTY_TEXT, TTY_LONGTEXT, VLC_TRUE ); -#endif - add_string( "rc-unix", 0, NULL, UNIX_TEXT, UNIX_LONGTEXT, VLC_TRUE ); - add_string( "rc-host", 0, NULL, HOST_TEXT, HOST_LONGTEXT, VLC_TRUE ); + add_bool( "rc-show-pos", 0, NULL, POS_TEXT, POS_LONGTEXT, true ); #ifdef WIN32 - add_bool( "rc-quiet", 0, NULL, QUIET_TEXT, QUIET_LONGTEXT, VLC_FALSE ); + add_bool( "rc-quiet", 0, NULL, QUIET_TEXT, QUIET_LONGTEXT, false ); +#else +#if defined (HAVE_ISATTY) + add_bool( "rc-fake-tty", 0, NULL, TTY_TEXT, TTY_LONGTEXT, true ); +#endif + add_string( "rc-unix", 0, NULL, UNIX_TEXT, UNIX_LONGTEXT, true ); #endif + add_string( "rc-host", 0, NULL, HOST_TEXT, HOST_LONGTEXT, true ); set_capability( "interface", 20 ); + set_callbacks( Activate, Deactivate ); vlc_module_end(); @@ -198,11 +206,11 @@ vlc_module_end(); static int Activate( vlc_object_t *p_this ) { intf_thread_t *p_intf = (intf_thread_t*)p_this; - playlist_t *p_playlist; char *psz_host, *psz_unix_path; int *pi_socket = NULL; -#if defined(HAVE_ISATTY) && !defined(WIN32) +#ifndef WIN32 +#if defined(HAVE_ISATTY) /* Check that stdin is a TTY */ if( !config_GetInt( p_intf, "rc-fake-tty" ) && !isatty( 0 ) ) { @@ -216,13 +224,12 @@ static int Activate( vlc_object_t *p_this ) { int i_socket; -#if !defined(AF_LOCAL) || defined(WIN32) +#ifndef AF_LOCAL msg_Warn( p_intf, "your OS doesn't support filesystem sockets" ); free( psz_unix_path ); return VLC_EGENERIC; #else struct sockaddr_un addr; - int i_ret; memset( &addr, 0, sizeof(struct sockaddr_un) ); @@ -230,7 +237,7 @@ static int Activate( vlc_object_t *p_this ) if( (i_socket = socket( AF_LOCAL, SOCK_STREAM, 0 ) ) < 0 ) { - msg_Warn( p_intf, "can't open socket: %s", strerror(errno) ); + msg_Warn( p_intf, "can't open socket: %m" ); free( psz_unix_path ); return VLC_EGENERIC; } @@ -239,19 +246,27 @@ static int Activate( vlc_object_t *p_this ) strncpy( addr.sun_path, psz_unix_path, sizeof( addr.sun_path ) ); addr.sun_path[sizeof( addr.sun_path ) - 1] = '\0'; - if( (i_ret = bind( i_socket, (struct sockaddr*)&addr, - sizeof(struct sockaddr_un) ) ) < 0 ) + if (bind (i_socket, (struct sockaddr *)&addr, sizeof (addr)) + && (errno == EADDRINUSE) + && connect (i_socket, (struct sockaddr *)&addr, sizeof (addr)) + && (errno == ECONNREFUSED)) { - msg_Warn( p_intf, "couldn't bind socket to address: %s", - strerror(errno) ); - free( psz_unix_path ); - net_Close( i_socket ); - return VLC_EGENERIC; + msg_Info (p_intf, "Removing dead UNIX socket: %s", psz_unix_path); + unlink (psz_unix_path); + + if (bind (i_socket, (struct sockaddr *)&addr, sizeof (addr))) + { + msg_Err (p_intf, "cannot bind UNIX socket at %s: %m", + psz_unix_path); + free (psz_unix_path); + net_Close (i_socket); + return VLC_EGENERIC; + } } - if( ( i_ret = listen( i_socket, 1 ) ) < 0 ) + if( listen( i_socket, 1 ) ) { - msg_Warn( p_intf, "can't listen on socket: %s", strerror(errno)); + msg_Warn( p_intf, "can't listen on socket: %m"); free( psz_unix_path ); net_Close( i_socket ); return VLC_EGENERIC; @@ -267,8 +282,9 @@ static int Activate( vlc_object_t *p_this ) } pi_socket[0] = i_socket; pi_socket[1] = -1; -#endif +#endif /* AF_LOCAL */ } +#endif /* !WIN32 */ if( ( pi_socket == NULL ) && ( psz_host = config_GetPsz( p_intf, "rc-host" ) ) != NULL ) @@ -277,7 +293,7 @@ static int Activate( vlc_object_t *p_this ) vlc_UrlParse( &url, psz_host, 0 ); - msg_Dbg( p_intf, "base %s port %d", url.psz_host, url.i_port ); + msg_Dbg( p_intf, "base: %s, port: %d", url.psz_host, url.i_port ); pi_socket = net_ListenTCP(p_this, url.psz_host, url.i_port); if( pi_socket == NULL ) @@ -318,18 +334,7 @@ static int Activate( vlc_object_t *p_this ) CONSOLE_INTRO_MSG; #endif - /* Force "no-view" mode */ - p_playlist = (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); - if( p_playlist ) - { - vlc_mutex_lock( &p_playlist->object_lock ); - p_playlist->status.i_view = -1; - vlc_mutex_unlock( &p_playlist->object_lock ); - vlc_object_release( p_playlist ); - } - - msg_rc( _("Remote control interface initialized, `h' for help") ); + msg_rc( _("Remote control interface initialized. Type `help' for help.") ); return VLC_SUCCESS; } @@ -350,7 +355,7 @@ static void Deactivate( vlc_object_t *p_this ) #endif free( p_intf->p_sys->psz_unix_path ); } - vlc_mutex_destroy( &p_intf->p_sys->status_lock ); + vlc_mutex_destroy( &p_intf->p_sys->status_lock ); free( p_intf->p_sys ); } @@ -360,147 +365,67 @@ static void Deactivate( vlc_object_t *p_this ) static void RegisterCallbacks( intf_thread_t *p_intf ) { /* Register commands that will be cleaned up upon object destruction */ - var_Create( p_intf, "quit", VLC_VAR_VOID | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "quit", Quit, NULL ); - var_Create( p_intf, "intf", VLC_VAR_STRING | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "intf", Intf, NULL ); - - var_Create( p_intf, "add", VLC_VAR_STRING | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "add", Playlist, NULL ); - var_Create( p_intf, "playlist", VLC_VAR_VOID | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "playlist", Playlist, NULL ); - var_Create( p_intf, "play", VLC_VAR_VOID | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "play", Playlist, NULL ); - var_Create( p_intf, "stop", VLC_VAR_VOID | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "stop", Playlist, NULL ); - var_Create( p_intf, "clear", VLC_VAR_VOID | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "clear", Playlist, NULL ); - var_Create( p_intf, "prev", VLC_VAR_VOID | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "prev", Playlist, NULL ); - var_Create( p_intf, "next", VLC_VAR_VOID | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "next", Playlist, NULL ); - var_Create( p_intf, "goto", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "goto", Playlist, NULL ); - var_Create( p_intf, "status", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "status", Playlist, NULL ); - - /* marquee on the fly items */ - var_Create( p_intf, "marq-marquee", VLC_VAR_VOID | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "marq-marquee", Other, NULL ); - var_Create( p_intf, "marq-x", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "marq-x", Other, NULL ); - var_Create( p_intf, "marq-y", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "marq-y", Other, NULL ); - var_Create( p_intf, "marq-position", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "marq-position", Other, NULL ); - var_Create( p_intf, "marq-color", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "marq-color", Other, NULL ); - var_Create( p_intf, "marq-opacity", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "marq-opacity", Other, NULL ); - var_Create( p_intf, "marq-timeout", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "marq-timeout", Other, NULL ); - var_Create( p_intf, "marq-size", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "marq-size", Other, NULL ); - - var_Create( p_intf, "mosaic-alpha", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "mosaic-alpha", Other, NULL ); - var_Create( p_intf, "mosaic-height", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "mosaic-height", Other, NULL ); - var_Create( p_intf, "mosaic-width", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "mosaic-width", Other, NULL ); - var_Create( p_intf, "mosaic-xoffset", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "mosaic-xoffset", Other, NULL ); - var_Create( p_intf, "mosaic-yoffset", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "mosaic-yoffset", Other, NULL ); - var_Create( p_intf, "mosaic-align", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "mosaic-align", Other, NULL ); - var_Create( p_intf, "mosaic-vborder", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "mosaic-vborder", Other, NULL ); - var_Create( p_intf, "mosaic-hborder", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "mosaic-hborder", Other, NULL ); - var_Create( p_intf, "mosaic-position", - VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "mosaic-position", Other, NULL ); - var_Create( p_intf, "mosaic-rows", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "mosaic-rows", Other, NULL ); - var_Create( p_intf, "mosaic-cols", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "mosaic-cols", Other, NULL ); - var_Create( p_intf, "mosaic-keep-aspect-ratio", - VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "mosaic-keep-aspect-ratio", Other, NULL ); - - /* time on the fly items */ - var_Create( p_intf, "time-format", VLC_VAR_VOID | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "time-format", Other, NULL ); - var_Create( p_intf, "time-x", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "time-x", Other, NULL ); - var_Create( p_intf, "time-y", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "time-y", Other, NULL ); - var_Create( p_intf, "time-position", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "time-position", Other, NULL ); - var_Create( p_intf, "time-color", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "time-color", Other, NULL ); - var_Create( p_intf, "time-opacity", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "time-opacity", Other, NULL ); - var_Create( p_intf, "time-size", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "time-size", Other, NULL ); - - /* logo on the fly items */ - var_Create( p_intf, "logo-file", VLC_VAR_VOID | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "logo-file", Other, NULL ); - var_Create( p_intf, "logo-x", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "logo-x", Other, NULL ); - var_Create( p_intf, "logo-y", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "logo-y", Other, NULL ); - var_Create( p_intf, "logo-position", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "logo-position", Other, NULL ); - var_Create( p_intf, "logo-transparency", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "logo-transparency", Other, NULL ); +#define ADD( name, type, target ) \ + var_Create( p_intf, name, VLC_VAR_ ## type | VLC_VAR_ISCOMMAND ); \ + var_AddCallback( p_intf, name, target, NULL ); + ADD( "quit", VOID, Quit ) + ADD( "intf", STRING, Intf ) + + ADD( "add", STRING, Playlist ) + ADD( "repeat", STRING, Playlist ) + ADD( "loop", STRING, Playlist ) + ADD( "random", STRING, Playlist ) + ADD( "enqueue", STRING, Playlist ) + ADD( "playlist", VOID, Playlist ) + ADD( "sort", VOID, Playlist ) + ADD( "play", VOID, Playlist ) + ADD( "stop", VOID, Playlist ) + ADD( "clear", VOID, Playlist ) + ADD( "prev", VOID, Playlist ) + ADD( "next", VOID, Playlist ) + ADD( "goto", INTEGER, Playlist ) + ADD( "status", INTEGER, Playlist ) /* OSD menu commands */ - var_Create( p_intf, "menu", VLC_VAR_STRING | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "menu", Menu, NULL ); + ADD( "menu", STRING, Menu ) /* DVD commands */ - var_Create( p_intf, "pause", VLC_VAR_VOID | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "pause", Input, NULL ); - var_Create( p_intf, "seek", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "seek", Input, NULL ); - var_Create( p_intf, "title", VLC_VAR_STRING | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "title", Input, NULL ); - var_Create( p_intf, "title_n", VLC_VAR_VOID | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "title_n", Input, NULL ); - var_Create( p_intf, "title_p", VLC_VAR_VOID | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "title_p", Input, NULL ); - var_Create( p_intf, "chapter", VLC_VAR_STRING | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "chapter", Input, NULL ); - var_Create( p_intf, "chapter_n", VLC_VAR_VOID | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "chapter_n", Input, NULL ); - var_Create( p_intf, "chapter_p", VLC_VAR_VOID | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "chapter_p", Input, NULL ); - - var_Create( p_intf, "fastforward", VLC_VAR_VOID | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "fastforward", Input, NULL ); - var_Create( p_intf, "rewind", VLC_VAR_VOID | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "rewind", Input, NULL ); - var_Create( p_intf, "faster", VLC_VAR_VOID | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "faster", Input, NULL ); - var_Create( p_intf, "slower", VLC_VAR_VOID | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "slower", Input, NULL ); - var_Create( p_intf, "normal", VLC_VAR_VOID | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "normal", Input, NULL ); + ADD( "pause", VOID, Input ) + ADD( "seek", INTEGER, Input ) + ADD( "title", STRING, Input ) + ADD( "title_n", VOID, Input ) + ADD( "title_p", VOID, Input ) + ADD( "chapter", STRING, Input ) + ADD( "chapter_n", VOID, Input ) + ADD( "chapter_p", VOID, Input ) + + ADD( "fastforward", VOID, Input ) + ADD( "rewind", VOID, Input ) + ADD( "faster", VOID, Input ) + ADD( "slower", VOID, Input ) + ADD( "normal", VOID, Input ) + + ADD( "atrack", STRING, Input ) + ADD( "vtrack", STRING, Input ) + ADD( "strack", STRING, Input ) + + /* video commands */ + ADD( "vratio", STRING, VideoConfig ) + ADD( "vcrop", STRING, VideoConfig ) + ADD( "vzoom", STRING, VideoConfig ) + ADD( "snapshot", VOID, VideoConfig ) /* audio commands */ - var_Create( p_intf, "volume", VLC_VAR_STRING | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "volume", Volume, NULL ); - var_Create( p_intf, "volup", VLC_VAR_STRING | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "volup", VolumeMove, NULL ); - var_Create( p_intf, "voldown", VLC_VAR_STRING | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "voldown", VolumeMove, NULL ); - var_Create( p_intf, "adev", VLC_VAR_STRING | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "adev", AudioConfig, NULL ); - var_Create( p_intf, "achan", VLC_VAR_STRING | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_intf, "achan", AudioConfig, NULL ); + ADD( "volume", STRING, Volume ) + ADD( "volup", STRING, VolumeMove ) + ADD( "voldown", STRING, VolumeMove ) + ADD( "adev", STRING, AudioConfig ) + ADD( "achan", STRING, AudioConfig ) + + /* misc menu commands */ + ADD( "stats", BOOL, Statistics ) + +#undef ADD } /***************************************************************************** @@ -515,8 +440,8 @@ static void Run( intf_thread_t *p_intf ) 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; + bool b_showpos = config_GetInt( p_intf, "rc-show-pos" ); + bool b_longhelp = false; int i_size = 0; int i_oldpos = 0; @@ -531,28 +456,30 @@ static void Run( intf_thread_t *p_intf ) /* status callbacks */ /* Listen to audio volume updates */ - var_AddCallback( p_intf->p_vlc, "volume-change", VolumeChanged, p_intf ); + var_AddCallback( p_intf->p_libvlc, "volume-change", VolumeChanged, p_intf ); #ifdef WIN32 /* Get the file descriptor of the console input */ p_intf->p_sys->hConsoleIn = GetStdHandle(STD_INPUT_HANDLE); if( p_intf->p_sys->hConsoleIn == INVALID_HANDLE_VALUE ) { - msg_Err( p_intf, "Couldn't open STD_INPUT_HANDLE" ); - p_intf->b_die = VLC_TRUE; + msg_Err( p_intf, "couldn't find user input handle" ); + vlc_object_kill( p_intf ); } #endif - while( !p_intf->b_die ) + while( !intf_ShouldDie( p_intf ) ) { char *psz_cmd, *psz_arg; - vlc_bool_t b_complete; + bool b_complete; 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->pi_socket_listen, 0 ); + net_Accept( p_intf, p_intf->p_sys->pi_socket_listen, + INTF_IDLE_SLEEP ); + if( p_intf->p_sys->i_socket == -1 ) continue; } b_complete = ReadCommand( p_intf, p_buffer, &i_size ); @@ -580,14 +507,19 @@ static void Run( intf_thread_t *p_intf ) { if( !p_input->b_dead || !p_input->b_die ) { - msg_rc( STATUS_CHANGE "( New input: %s )", p_input->input.p_item->psz_uri ); - msg_rc( STATUS_CHANGE "( audio volume: %d )", config_GetInt( p_intf, "volume" )); + char *psz_uri = + input_item_GetURI( input_GetItem( p_input ) ); + msg_rc( STATUS_CHANGE "( new input: %s )", psz_uri ); + free( psz_uri ); + msg_rc( STATUS_CHANGE "( audio volume: %d )", + config_GetInt( p_intf, "volume" )); } var_AddCallback( p_input, "state", StateChanged, p_intf ); var_AddCallback( p_input, "rate-faster", RateChanged, p_intf ); var_AddCallback( p_input, "rate-slower", RateChanged, p_intf ); var_AddCallback( p_input, "rate", RateChanged, p_intf ); - var_AddCallback( p_input, "time-offset", TimeOffsetChanged, p_intf ); + var_AddCallback( p_input, "time-offset", TimeOffsetChanged, + p_intf ); } } else if( p_input->b_dead ) @@ -596,7 +528,8 @@ static void Run( intf_thread_t *p_intf ) var_DelCallback( p_input, "rate-faster", RateChanged, p_intf ); var_DelCallback( p_input, "rate-slower", RateChanged, p_intf ); var_DelCallback( p_input, "rate", RateChanged, p_intf ); - var_DelCallback( p_input, "time-offset", TimeOffsetChanged, p_intf ); + var_DelCallback( p_input, "time-offset", TimeOffsetChanged, + p_intf ); vlc_object_release( p_input ); p_input = NULL; @@ -617,19 +550,21 @@ static void Run( intf_thread_t *p_intf ) (p_playlist->status.i_status == PLAYLIST_STOPPED) ) { p_intf->p_sys->i_last_state = PLAYLIST_STOPPED; - msg_rc( STATUS_CHANGE "( stop state: 0 )" ); + msg_rc( STATUS_CHANGE "( stop state: 5 )" ); } - else if( (p_intf->p_sys->i_last_state != p_playlist->status.i_status) && + else if( + (p_intf->p_sys->i_last_state != p_playlist->status.i_status) && (p_playlist->status.i_status == PLAYLIST_RUNNING) ) { p_intf->p_sys->i_last_state = p_playlist->status.i_status; - msg_rc( STATUS_CHANGE "( play state: 1 )" ); + msg_rc( STATUS_CHANGE "( play state: 3 )" ); } - else if( (p_intf->p_sys->i_last_state != p_playlist->status.i_status) && + else if( + (p_intf->p_sys->i_last_state != p_playlist->status.i_status) && (p_playlist->status.i_status == PLAYLIST_PAUSED) ) { p_intf->p_sys->i_last_state = p_playlist->status.i_status; - msg_rc( STATUS_CHANGE "( pause state: 2 )" ); + msg_rc( STATUS_CHANGE "( pause state: 4 )" ); } vlc_mutex_unlock( &p_playlist->object_lock ); } @@ -647,7 +582,6 @@ static void Run( intf_thread_t *p_intf ) /* Is there something to do? */ if( !b_complete ) continue; - /* Skip heading spaces */ psz_cmd = p_buffer; while( *psz_cmd == ' ' ) @@ -668,11 +602,40 @@ static void Run( intf_thread_t *p_intf ) } else { - psz_arg = ""; + psz_arg = (char*)""; } + /* module specfic commands: @ */ + if( *psz_cmd == '@' && *psz_arg ) + { + /* Parse miscellaneous commands */ + char *psz_alias = psz_cmd + 1; + char *psz_mycmd = strdup( psz_arg ); + char *psz_myarg = strchr( psz_mycmd, ' ' ); + char *psz_msg; + + if( !psz_myarg ) + { + msg_rc( "Not enough parameters." ); + } + else + { + *psz_myarg = '\0'; + psz_myarg ++; + + var_Command( p_intf, psz_alias, psz_mycmd, psz_myarg, + &psz_msg ); + + if( psz_msg ) + { + msg_rc( psz_msg ); + free( psz_msg ); + } + } + free( psz_mycmd ); + } /* If the user typed a registered local command, try it */ - if( var_Type( p_intf, psz_cmd ) & VLC_VAR_ISCOMMAND ) + else if( var_Type( p_intf, psz_cmd ) & VLC_VAR_ISCOMMAND ) { vlc_value_t val; int i_ret; @@ -712,11 +675,11 @@ static void Run( intf_thread_t *p_intf ) if( p_input ) { int i, j; - vlc_mutex_lock( &p_input->input.p_item->lock ); - for ( i = 0; i < p_input->input.p_item->i_categories; i++ ) + vlc_mutex_lock( &input_GetItem(p_input)->lock ); + for ( i = 0; i < input_GetItem(p_input)->i_categories; i++ ) { - info_category_t *p_category = - p_input->input.p_item->pp_categories[i]; + info_category_t *p_category = input_GetItem(p_input) + ->pp_categories[i]; msg_rc( "+----[ %s ]", p_category->psz_name ); msg_rc( "| " ); @@ -729,7 +692,7 @@ static void Run( intf_thread_t *p_intf ) msg_rc( "| " ); } msg_rc( "+----[ end of stream info ]" ); - vlc_mutex_unlock( &p_input->input.p_item->lock ); + vlc_mutex_unlock( &input_GetItem(p_input)->lock ); } else { @@ -781,18 +744,23 @@ static void Run( intf_thread_t *p_intf ) } else { - msg_rc( "%s", p_input->input.p_item->psz_name ); + msg_rc( "%s", input_GetItem(p_input)->psz_name ); } } else if( !strcmp( psz_cmd, "longhelp" ) || !strncmp( psz_cmd, "h", 1 ) || !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; + b_longhelp = true; + else b_longhelp = false; Help( p_intf, b_longhelp ); } + else if( !strcmp( psz_cmd, "key" ) || !strcmp( psz_cmd, "hotkey" ) ) + { + var_SetInteger( p_intf->p_libvlc, "key-pressed", + config_GetInt( p_intf, psz_arg ) ); + } else switch( psz_cmd[0] ) { case 'f': @@ -806,21 +774,24 @@ static void Run( intf_thread_t *p_intf ) if( p_vout ) { vlc_value_t val; - vlc_bool_t b_update = VLC_FALSE; + bool b_update = false; var_Get( p_vout, "fullscreen", &val ); val.b_bool = !val.b_bool; - if( !strncmp(psz_arg, "on", 2) && (val.b_bool == VLC_TRUE) ) + if( !strncmp( psz_arg, "on", 2 ) + && ( val.b_bool == true ) ) { - b_update = VLC_TRUE; - val.b_bool = VLC_TRUE; + b_update = true; + val.b_bool = true; } - else if( !strncmp(psz_arg, "off", 3) && (val.b_bool == VLC_FALSE) ) + else if( !strncmp( psz_arg, "off", 3 ) + && ( val.b_bool == false ) ) { - b_update = VLC_TRUE; - val.b_bool = VLC_FALSE; + b_update = true; + val.b_bool = false; } - else if( strncmp(psz_arg, "off", 3) && strncmp(psz_arg, "on", 2) ) - b_update = VLC_TRUE; + else if( strncmp( psz_arg, "off", 3 ) + && strncmp( psz_arg, "on", 2 ) ) + b_update = true; if( b_update ) var_Set( p_vout, "fullscreen", val ); vlc_object_release( p_vout ); } @@ -837,7 +808,7 @@ static void Run( intf_thread_t *p_intf ) break; default: - msg_rc(_("unknown command `%s', type `help' for help"), psz_cmd); + msg_rc(_("Unknown command `%s'. Type `help' for help."), psz_cmd); break; } @@ -865,90 +836,101 @@ static void Run( intf_thread_t *p_intf ) p_playlist = NULL; } - var_DelCallback( p_intf->p_vlc, "volume-change", VolumeChanged, p_intf ); + var_DelCallback( p_intf->p_libvlc, "volume-change", VolumeChanged, p_intf ); } -static void Help( intf_thread_t *p_intf, vlc_bool_t b_longhelp) +static void Help( intf_thread_t *p_intf, bool b_longhelp) { msg_rc(_("+----[ Remote control commands ]")); msg_rc( "| "); - msg_rc(_("| add XYZ . . . . . . . . . . add XYZ to playlist")); - msg_rc(_("| playlist . . . show items currently in playlist")); - msg_rc(_("| play . . . . . . . . . . . . . . . . play stream")); - msg_rc(_("| stop . . . . . . . . . . . . . . . . stop stream")); - msg_rc(_("| next . . . . . . . . . . . . next playlist item")); - msg_rc(_("| prev . . . . . . . . . . previous playlist item")); - msg_rc(_("| goto . . . . . . . . . . . . goto item at index")); - msg_rc(_("| clear . . . . . . . . . . . clear the playlist")); - msg_rc(_("| status . . . . . . . . . current playlist status")); - msg_rc(_("| title [X] . . . . set/get title in current item")); - msg_rc(_("| title_n . . . . . . next title in current item")); - msg_rc(_("| title_p . . . . previous title in current item")); - msg_rc(_("| chapter [X] . . set/get chapter in current item")); - msg_rc(_("| chapter_n . . . . next chapter in current item")); - msg_rc(_("| chapter_p . . previous chapter in current item")); + msg_rc(_("| add XYZ . . . . . . . . . . . . add XYZ to playlist")); + msg_rc(_("| enqueue XYZ . . . . . . . . . queue XYZ to playlist")); + msg_rc(_("| playlist . . . . . show items currently in playlist")); + msg_rc(_("| play . . . . . . . . . . . . . . . . . . play stream")); + msg_rc(_("| stop . . . . . . . . . . . . . . . . . . stop stream")); + msg_rc(_("| next . . . . . . . . . . . . . . next playlist item")); + msg_rc(_("| prev . . . . . . . . . . . . previous playlist item")); + msg_rc(_("| goto . . . . . . . . . . . . . . goto item at index")); + msg_rc(_("| repeat [on|off] . . . . toggle playlist item repeat")); + msg_rc(_("| loop [on|off] . . . . . . . . . toggle playlist loop")); + msg_rc(_("| random [on|off] . . . . . . . toggle random jumping")); + msg_rc(_("| clear . . . . . . . . . . . . . . clear the playlist")); + msg_rc(_("| status . . . . . . . . . . . current playlist status")); + msg_rc(_("| title [X] . . . . . . set/get title in current item")); + msg_rc(_("| title_n . . . . . . . . next title in current item")); + msg_rc(_("| title_p . . . . . . previous title in current item")); + msg_rc(_("| chapter [X] . . . . set/get chapter in current item")); + msg_rc(_("| chapter_n . . . . . . next chapter in current item")); + msg_rc(_("| chapter_p . . . . previous chapter in current item")); msg_rc( "| "); - msg_rc(_("| seek X . seek in seconds, for instance `seek 12'")); - msg_rc(_("| pause . . . . . . . . . . . . . . toggle pause")); - msg_rc(_("| fastforward . . . . . . . set to maximum rate")); - msg_rc(_("| rewind . . . . . . . . . . set to minimum rate")); - msg_rc(_("| faster . . . . . . . . faster playing of stream")); - msg_rc(_("| slower . . . . . . . . slower playing of stream")); - msg_rc(_("| normal . . . . . . . . normal playing of stream")); - msg_rc(_("| f [on|off] . . . . . . . . . . toggle fullscreen")); - msg_rc(_("| info . . . information about the current stream")); + msg_rc(_("| seek X . . . seek in seconds, for instance `seek 12'")); + msg_rc(_("| pause . . . . . . . . . . . . . . . . toggle pause")); + msg_rc(_("| fastforward . . . . . . . . . set to maximum rate")); + msg_rc(_("| rewind . . . . . . . . . . . . set to minimum rate")); + msg_rc(_("| faster . . . . . . . . . . faster playing of stream")); + msg_rc(_("| slower . . . . . . . . . . slower playing of stream")); + msg_rc(_("| normal . . . . . . . . . . normal playing of stream")); + msg_rc(_("| f [on|off] . . . . . . . . . . . . toggle fullscreen")); + msg_rc(_("| info . . . . . information about the current stream")); + msg_rc(_("| stats . . . . . . . . show statistical information")); + msg_rc(_("| get_time . . seconds elapsed since stream's beginning")); + msg_rc(_("| is_playing . . . . 1 if a stream plays, 0 otherwise")); + msg_rc(_("| get_title . . . . . the title of the current stream")); + msg_rc(_("| get_length . . . . the length of the current stream")); msg_rc( "| "); - msg_rc(_("| volume [X] . . . . . . . . set/get audio volume")); - msg_rc(_("| volup [X] . . . . . raise audio volume X steps")); - msg_rc(_("| voldown [X] . . . . lower audio volume X steps")); - msg_rc(_("| adev [X] . . . . . . . . . set/get audio device")); - msg_rc(_("| achan [X]. . . . . . . . set/get audio channels")); - msg_rc(_("| menu [on|off|up|down|left|right|select] use menu")); + msg_rc(_("| volume [X] . . . . . . . . . . set/get audio volume")); + msg_rc(_("| volup [X] . . . . . . . raise audio volume X steps")); + msg_rc(_("| voldown [X] . . . . . . lower audio volume X steps")); + msg_rc(_("| adev [X] . . . . . . . . . . . set/get audio device")); + msg_rc(_("| achan [X]. . . . . . . . . . set/get audio channels")); + msg_rc(_("| atrack [X] . . . . . . . . . . . set/get audio track")); + msg_rc(_("| vtrack [X] . . . . . . . . . . . set/get video track")); + msg_rc(_("| vratio [X] . . . . . . . set/get video aspect ratio")); + msg_rc(_("| vcrop [X] . . . . . . . . . . . set/get video crop")); + msg_rc(_("| vzoom [X] . . . . . . . . . . . set/get video zoom")); + msg_rc(_("| snapshot . . . . . . . . . . . . take video snapshot")); + msg_rc(_("| strack [X] . . . . . . . . . set/get subtitles track")); + msg_rc(_("| key [hotkey name] . . . . . . simulate hotkey press")); + msg_rc(_("| menu . . [on|off|up|down|left|right|select] use menu")); msg_rc( "| "); if (b_longhelp) { - msg_rc(_("| marq-marquee STRING . . overlay STRING in video")); - msg_rc(_("| marq-x X . . . . . . . . . . . .offset from left")); - msg_rc(_("| marq-y Y . . . . . . . . . . . . offset from top")); - msg_rc(_("| marq-position #. . . .relative position control")); - msg_rc(_("| marq-color # . . . . . . . . . . font color, RGB")); - msg_rc(_("| marq-opacity # . . . . . . . . . . . . . opacity")); - msg_rc(_("| marq-timeout T. . . . . . . . . . timeout, in ms")); - msg_rc(_("| marq-size # . . . . . . . . font size, in pixels")); + msg_rc(_("| @name marq-marquee STRING . . overlay STRING in video")); + msg_rc(_("| @name marq-x X . . . . . . . . . . . .offset from left")); + msg_rc(_("| @name marq-y Y . . . . . . . . . . . . offset from top")); + msg_rc(_("| @name marq-position #. . . .relative position control")); + msg_rc(_("| @name marq-color # . . . . . . . . . . font color, RGB")); + msg_rc(_("| @name marq-opacity # . . . . . . . . . . . . . opacity")); + msg_rc(_("| @name marq-timeout T. . . . . . . . . . timeout, in ms")); + msg_rc(_("| @name marq-size # . . . . . . . . font size, in pixels")); msg_rc( "| "); - msg_rc(_("| time-format STRING . . . overlay STRING in video")); - msg_rc(_("| time-x X . . . . . . . . . . . .offset from left")); - msg_rc(_("| time-y Y . . . . . . . . . . . . offset from top")); - msg_rc(_("| time-position #. . . . . . . . relative position")); - msg_rc(_("| time-color # . . . . . . . . . . font color, RGB")); - msg_rc(_("| time-opacity # . . . . . . . . . . . . . opacity")); - msg_rc(_("| time-size # . . . . . . . . font size, in pixels")); + msg_rc(_("| @name logo-file STRING . . .the overlay file path/name")); + msg_rc(_("| @name logo-x X . . . . . . . . . . . .offset from left")); + msg_rc(_("| @name logo-y Y . . . . . . . . . . . . offset from top")); + msg_rc(_("| @name logo-position #. . . . . . . . relative position")); + msg_rc(_("| @name logo-transparency #. . . . . . . . .transparency")); msg_rc( "| "); - msg_rc(_("| logo-file STRING . . . the overlay file path/name")); - msg_rc(_("| logo-x X . . . . . . . . . . . .offset from left")); - msg_rc(_("| logo-y Y . . . . . . . . . . . . offset from top")); - msg_rc(_("| logo-position #. . . . . . . . relative position")); - msg_rc(_("| logo-transparency #. . . . . . . . .transparency")); - msg_rc( "| "); - 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(_("| @name mosaic-alpha # . . . . . . . . . . . . . . alpha")); + msg_rc(_("| @name mosaic-height #. . . . . . . . . . . . . .height")); + msg_rc(_("| @name mosaic-width # . . . . . . . . . . . . . . width")); + msg_rc(_("| @name mosaic-xoffset # . . . .top left corner position")); + msg_rc(_("| @name mosaic-yoffset # . . . .top left corner position")); + msg_rc(_("| @name mosaic-offsets x,y(,x,y)*. . . . list of offsets")); + msg_rc(_("| @name mosaic-align 0..2,4..6,8..10. . .mosaic alignment")); + msg_rc(_("| @name mosaic-vborder # . . . . . . . . vertical border")); + msg_rc(_("| @name mosaic-hborder # . . . . . . . horizontal border")); + msg_rc(_("| @name mosaic-position {0=auto,1=fixed} . . . .position")); + msg_rc(_("| @name mosaic-rows #. . . . . . . . . . .number of rows")); + msg_rc(_("| @name mosaic-cols #. . . . . . . . . . .number of cols")); + msg_rc(_("| @name mosaic-order id(,id)* . . . . order of pictures ")); + msg_rc(_("| @name mosaic-keep-aspect-ratio {0,1} . . .aspect ratio")); msg_rc( "| "); } - msg_rc(_("| help . . . . . . . . . . . . . this help message")); - msg_rc(_("| longhelp . . . . . . . . . a longer help message")); - msg_rc(_("| logout . . . . . exit (if in socket connection)")); - msg_rc(_("| quit . . . . . . . . . . . . . . . . . quit vlc")); + msg_rc(_("| help . . . . . . . . . . . . . . . this help message")); + msg_rc(_("| longhelp . . . . . . . . . . . a longer help message")); + msg_rc(_("| logout . . . . . . . exit (if in socket connection)")); + msg_rc(_("| quit . . . . . . . . . . . . . . . . . . . quit vlc")); msg_rc( "| "); msg_rc(_("+----[ end of help ]")); } @@ -959,6 +941,8 @@ static void Help( intf_thread_t *p_intf, vlc_bool_t b_longhelp) static int TimeOffsetChanged( vlc_object_t *p_this, char const *psz_cmd, vlc_value_t oldval, vlc_value_t newval, void *p_data ) { + VLC_UNUSED(p_this); VLC_UNUSED(psz_cmd); + VLC_UNUSED(oldval); VLC_UNUSED(newval); intf_thread_t *p_intf = (intf_thread_t*)p_data; input_thread_t *p_input = NULL; @@ -966,7 +950,8 @@ static int TimeOffsetChanged( vlc_object_t *p_this, char const *psz_cmd, p_input = vlc_object_find( p_intf, VLC_OBJECT_INPUT, FIND_ANYWHERE ); if( p_input ) { - msg_rc( STATUS_CHANGE "( time-offset: %d )", var_GetInteger( p_input, "time-offset" ) ); + msg_rc( STATUS_CHANGE "( time-offset: %d )", + var_GetInteger( p_input, "time-offset" ) ); vlc_object_release( p_input ); } vlc_mutex_unlock( &p_intf->p_sys->status_lock ); @@ -976,10 +961,12 @@ static int TimeOffsetChanged( vlc_object_t *p_this, char const *psz_cmd, static int VolumeChanged( vlc_object_t *p_this, char const *psz_cmd, vlc_value_t oldval, vlc_value_t newval, void *p_data ) { + VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval); VLC_UNUSED(newval); intf_thread_t *p_intf = (intf_thread_t*)p_data; vlc_mutex_lock( &p_intf->p_sys->status_lock ); - msg_rc( STATUS_CHANGE "( audio volume: %d )", config_GetInt( p_this, "volume") ); + msg_rc( STATUS_CHANGE "( audio volume: %d )", + config_GetInt( p_this, "volume") ); vlc_mutex_unlock( &p_intf->p_sys->status_lock ); return VLC_SUCCESS; } @@ -987,6 +974,7 @@ static int VolumeChanged( vlc_object_t *p_this, char const *psz_cmd, static int StateChanged( vlc_object_t *p_this, char const *psz_cmd, vlc_value_t oldval, vlc_value_t newval, void *p_data ) { + VLC_UNUSED(p_this); VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval); intf_thread_t *p_intf = (intf_thread_t*)p_data; playlist_t *p_playlist = NULL; input_thread_t *p_input = NULL; @@ -998,23 +986,24 @@ static int StateChanged( vlc_object_t *p_this, char const *psz_cmd, p_playlist = vlc_object_find( p_input, VLC_OBJECT_PLAYLIST, FIND_PARENT ); if( p_playlist ) { - char cmd[5] = ""; + char cmd[6]; switch( p_playlist->status.i_status ) { case PLAYLIST_STOPPED: - strncpy( &cmd[0], "stop", 4); - cmd[4] = '\0'; + strcpy( cmd, "stop" ); break; case PLAYLIST_RUNNING: - strncpy( &cmd[0], "play", 4); - cmd[4] = '\0'; + strcpy( cmd, "play" ); break; case PLAYLIST_PAUSED: - strncpy( &cmd[0], "pause", 5); - cmd[5] = '\0'; + strcpy( cmd, "pause" ); break; + default: + cmd[0] = '\0'; } /* var_GetInteger( p_input, "state" ) */ - msg_rc( STATUS_CHANGE "( %s state: %d )", &cmd[0], newval.i_int ); + msg_rc( STATUS_CHANGE "( %s state: %d ): %s", + &cmd[0], newval.i_int, + ppsz_input_state[ newval.i_int ] ); vlc_object_release( p_playlist ); } vlc_object_release( p_input ); @@ -1026,6 +1015,8 @@ static int StateChanged( vlc_object_t *p_this, char const *psz_cmd, static int RateChanged( vlc_object_t *p_this, char const *psz_cmd, vlc_value_t oldval, vlc_value_t newval, void *p_data ) { + VLC_UNUSED(p_this); VLC_UNUSED(psz_cmd); + VLC_UNUSED(oldval); VLC_UNUSED(newval); intf_thread_t *p_intf = (intf_thread_t*)p_data; input_thread_t *p_input = NULL; @@ -1033,7 +1024,8 @@ static int RateChanged( vlc_object_t *p_this, char const *psz_cmd, p_input = vlc_object_find( p_intf, VLC_OBJECT_INPUT, FIND_ANYWHERE ); if( p_input ) { - msg_rc( STATUS_CHANGE "( new rate: %d )", var_GetInteger( p_input, "rate" ) ); + msg_rc( STATUS_CHANGE "( new rate: %d )", + var_GetInteger( p_input, "rate" ) ); vlc_object_release( p_input ); } vlc_mutex_unlock( &p_intf->p_sys->status_lock ); @@ -1046,6 +1038,7 @@ static int RateChanged( vlc_object_t *p_this, char const *psz_cmd, static int Input( vlc_object_t *p_this, char const *psz_cmd, vlc_value_t oldval, vlc_value_t newval, void *p_data ) { + VLC_UNUSED(oldval); VLC_UNUSED(p_data); intf_thread_t *p_intf = (intf_thread_t*)p_this; input_thread_t *p_input; vlc_value_t val; @@ -1057,7 +1050,7 @@ static int Input( vlc_object_t *p_this, char const *psz_cmd, if( ( ( val.i_int == PAUSE_S ) || ( val.i_int == PLAYLIST_PAUSED ) ) && ( strcmp( psz_cmd, "pause" ) != 0 ) ) { - msg_rc( _("press menu select or pause to continue") ); + msg_rc( _("Press menu select or pause to continue.") ); vlc_object_release( p_input ); return VLC_EGENERIC; } @@ -1066,7 +1059,7 @@ static int Input( vlc_object_t *p_this, char const *psz_cmd, if( !strcmp( psz_cmd, "pause" ) ) { val.i_int = config_GetInt( p_intf, "key-play-pause" ); - var_Set( p_intf->p_vlc, "key-pressed", val ); + var_Set( p_intf->p_libvlc, "key-pressed", val ); vlc_object_release( p_input ); return VLC_SUCCESS; } @@ -1075,7 +1068,7 @@ static int Input( vlc_object_t *p_this, char const *psz_cmd, if( strlen( newval.psz_string ) > 0 && newval.psz_string[strlen( newval.psz_string ) - 1] == '%' ) { - val.f_float = (float)atoi( newval.psz_string ) / 100.0; + val.f_float = (float)atof( newval.psz_string ) / 100.0; var_Set( p_input, "position", val ); } else @@ -1089,27 +1082,25 @@ static int Input( vlc_object_t *p_this, char const *psz_cmd, else if ( !strcmp( psz_cmd, "fastforward" ) ) { val.i_int = config_GetInt( p_intf, "key-jump+extrashort" ); - var_Set( p_intf->p_vlc, "key-pressed", val ); + var_Set( p_intf->p_libvlc, "key-pressed", val ); vlc_object_release( p_input ); return VLC_SUCCESS; } else if ( !strcmp( psz_cmd, "rewind" ) ) { val.i_int = config_GetInt( p_intf, "key-jump-extrashort" ); - var_Set( p_intf->p_vlc, "key-pressed", val ); + var_Set( p_intf->p_libvlc, "key-pressed", val ); vlc_object_release( p_input ); return VLC_SUCCESS; } 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; @@ -1141,7 +1132,7 @@ static int Input( vlc_object_t *p_this, char const *psz_cmd, var_Get( p_input, "chapter", &val ); var_Change( p_input, "chapter", VLC_VAR_GETCHOICES, &val_list, NULL ); - msg_rc( "Currently playing chapter %d/%d", + msg_rc( "Currently playing chapter %d/%d.", val.i_int, val_list.p_list->i_count ); var_Change( p_this, "chapter", VLC_VAR_FREELIST, &val_list, NULL ); @@ -1149,12 +1140,12 @@ static int Input( vlc_object_t *p_this, char const *psz_cmd, } else if( !strcmp( psz_cmd, "chapter_n" ) ) { - val.b_bool = VLC_TRUE; + val.b_bool = true; var_Set( p_input, "next-chapter", val ); } else if( !strcmp( psz_cmd, "chapter_p" ) ) { - val.b_bool = VLC_TRUE; + val.b_bool = true; var_Set( p_input, "prev-chapter", val ); } vlc_object_release( p_input ); @@ -1180,7 +1171,7 @@ static int Input( vlc_object_t *p_this, char const *psz_cmd, var_Get( p_input, "title", &val ); var_Change( p_input, "title", VLC_VAR_GETCHOICES, &val_list, NULL ); - msg_rc( "Currently playing title %d/%d", + msg_rc( "Currently playing title %d/%d.", val.i_int, val_list.p_list->i_count ); var_Change( p_this, "title", VLC_VAR_FREELIST, &val_list, NULL ); @@ -1188,462 +1179,325 @@ static int Input( vlc_object_t *p_this, char const *psz_cmd, } else if( !strcmp( psz_cmd, "title_n" ) ) { - val.b_bool = VLC_TRUE; + val.b_bool = true; var_Set( p_input, "next-title", val ); } else if( !strcmp( psz_cmd, "title_p" ) ) { - val.b_bool = VLC_TRUE; + val.b_bool = true; var_Set( p_input, "prev-title", val ); } vlc_object_release( p_input ); return VLC_SUCCESS; } - - /* 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; - - p_playlist = vlc_object_find( p_this, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); - if( !p_playlist ) - { - return VLC_ENOOBJ; - } - - if( p_playlist->p_input ) + else if( !strcmp( psz_cmd, "atrack" ) + || !strcmp( psz_cmd, "vtrack" ) + || !strcmp( psz_cmd, "strack" ) ) { - 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; - } - } + const char *psz_variable; + vlc_value_t val_name; + int i_error; - /* Parse commands that require a playlist */ - if( !strcmp( psz_cmd, "prev" ) ) - { - playlist_Prev( p_playlist ); - } - else if( !strcmp( psz_cmd, "next" ) ) - { - playlist_Next( p_playlist ); - } - else if( !strcmp( psz_cmd, "play" ) ) - { - if( p_playlist->p_input ) + if( !strcmp( psz_cmd, "atrack" ) ) { - 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 ); - } + psz_variable = "audio-es"; } - } - else if (!strcmp( psz_cmd, "goto" ) ) - { - if( strlen( newval.psz_string ) > 0) + else if( !strcmp( psz_cmd, "vtrack" ) ) { - val.i_int = atoi( newval.psz_string ); - playlist_Goto( p_playlist, val.i_int); + psz_variable = "video-es"; } - } - else if( !strcmp( psz_cmd, "stop" ) ) - { - playlist_Stop( p_playlist ); - } - else if( !strcmp( psz_cmd, "clear" ) ) - { - playlist_Stop( p_playlist ); - vlc_mutex_lock( &p_playlist->object_lock ); - playlist_Clear( p_playlist ); - vlc_mutex_unlock( &p_playlist->object_lock ); - } - 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 ) + else { - msg_rc( "trying to add %s to playlist", newval.psz_string ); - playlist_AddItem( p_playlist, p_item, - PLAYLIST_GO|PLAYLIST_APPEND, PLAYLIST_END ); + psz_variable = "spu-es"; } - } - else if( !strcmp( psz_cmd, "playlist" ) ) - { - int i; - for ( i = 0; i < p_playlist->i_size; i++ ) - { - msg_rc( "|%s%s %s|%s|", i == p_playlist->i_index ? "*" : " ", - p_playlist->pp_items[i]->input.psz_name, - p_playlist->pp_items[i]->input.psz_uri, - p_playlist->pp_items[i]->i_parents > 0 ? - p_playlist->pp_items[i]->pp_parents[0]->p_parent->input.psz_name : "" ); - } - if ( i == 0 ) + /* 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 ) { - msg_rc( "| no entries" ); + /* set */ + vlc_value_t val; + val.i_int = atoi( newval.psz_string ); + + i_error = var_Set( p_input, psz_variable, val ); } - } - else if( !strcmp( psz_cmd, "status" ) ) - { - if( p_playlist->p_input ) + else { - /* 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" )); + /* get */ + vlc_value_t val, text; + int i, i_value; - vlc_mutex_lock( &p_playlist->object_lock ); - switch( p_playlist->status.i_status ) + if ( var_Get( p_input, psz_variable, &val ) < 0 ) { - 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_object_release( p_input ); + return VLC_EGENERIC; } - vlc_mutex_unlock( &p_playlist->object_lock ); + 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 ); + + free( val_name.psz_string ); + + i_error = VLC_SUCCESS; } + vlc_object_release( p_input ); + return i_error; } - /* - * sanity check - */ - else + /* Never reached. */ + vlc_object_release( p_input ); + return VLC_EGENERIC; +} + +static void print_playlist( intf_thread_t *p_intf, playlist_item_t *p_item, int i_level ) +{ + int i; + char psz_buffer[MSTRTIME_MAX_SIZE]; + for( i = 0; i< p_item->i_children; i++ ) { - msg_rc( "unknown command!" ); - } + if( p_item->pp_children[i]->p_input->i_duration != -1 ) + { + secstotimestr( psz_buffer, p_item->pp_children[i]->p_input->i_duration / 1000000 ); + msg_rc( "|%*s- %s (%s)", 2 * i_level, "", p_item->pp_children[i]->p_input->psz_name, psz_buffer ); + } + else + msg_rc( "|%*s- %s", 2 * i_level, "", p_item->pp_children[i]->p_input->psz_name ); - vlc_object_release( p_playlist ); - return VLC_SUCCESS; + if( p_item->pp_children[i]->i_children >= 0 ) + print_playlist( p_intf, p_item->pp_children[i], i_level + 1 ); + } } -static int Other( vlc_object_t *p_this, char const *psz_cmd, +static int Playlist( vlc_object_t *p_this, char const *psz_cmd, vlc_value_t oldval, vlc_value_t newval, void *p_data ) { - intf_thread_t *p_intf = (intf_thread_t*)p_this; - vlc_object_t *p_playlist; - vlc_value_t val; - vlc_object_t *p_input; - - p_playlist = vlc_object_find( p_this, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE ); - if( !p_playlist ) - { - return VLC_ENOOBJ; - } + VLC_UNUSED(oldval); VLC_UNUSED(p_data); + vlc_value_t val; - p_input = vlc_object_find( p_this, VLC_OBJECT_INPUT, FIND_ANYWHERE ); - if( !p_input ) - { - vlc_object_release( p_playlist ); - return VLC_ENOOBJ; - } + intf_thread_t *p_intf = (intf_thread_t*)p_this; + playlist_t *p_playlist = pl_Yield( p_this ); - if( p_input ) + PL_LOCK; + if( p_playlist->p_input ) { - var_Get( p_input, "state", &val ); + var_Get( p_playlist->p_input, "state", &val ); if( ( val.i_int == PAUSE_S ) || ( val.i_int == PLAYLIST_PAUSED ) ) { - msg_rc( _("press pause to continue") ); + msg_rc( _("Type 'menu select' or 'pause' to continue.") ); vlc_object_release( p_playlist ); - vlc_object_release( p_input ); + PL_UNLOCK; return VLC_EGENERIC; } } + PL_UNLOCK; - /* Parse miscellaneous commands */ - if( !strcmp( psz_cmd, "marq-marquee" ) ) - { - if( strlen( newval.psz_string ) > 0 ) - { - val.psz_string = newval.psz_string; - var_Set( p_input->p_libvlc, "marq-marquee", val ); - } - else - { - val.psz_string = ""; - var_Set( p_input->p_libvlc, "marq-marquee", val); - } - } - else if( !strcmp( psz_cmd, "marq-x" ) ) - { - if( strlen( newval.psz_string ) > 0) - { - val.i_int = atoi( newval.psz_string ); - var_Set( p_input->p_libvlc, "marq-x", val ); - } - } - else if( !strcmp( psz_cmd, "marq-y" ) ) - { - if( strlen( newval.psz_string ) > 0) - { - val.i_int = atoi( newval.psz_string ); - var_Set( p_input->p_libvlc, "marq-y", val ); - } - } - else if( !strcmp( psz_cmd, "marq-position" ) ) - { - if( strlen( newval.psz_string ) > 0) - { - val.i_int = atoi( newval.psz_string ); - var_Set( p_input->p_libvlc, "marq-position", val ); - } - } - else if( !strcmp( psz_cmd, "marq-color" ) ) - { - if( strlen( newval.psz_string ) > 0) - { - val.i_int = strtol( newval.psz_string, NULL, 0 ); - var_Set( p_input->p_libvlc, "marq-color", val ); - } - } - else if( !strcmp( psz_cmd, "marq-opacity" ) ) - { - if( strlen( newval.psz_string ) > 0) - { - val.i_int = strtol( newval.psz_string, NULL, 0 ); - var_Set( p_input->p_libvlc, "marq-opacity", val ); - } - } - else if( !strcmp( psz_cmd, "marq-size" ) ) - { - if( strlen( newval.psz_string ) > 0) - { - val.i_int = atoi( newval.psz_string ); - var_Set( p_input->p_libvlc, "marq-size", val ); - } - } - else if( !strcmp( psz_cmd, "marq-timeout" ) ) - { - if( strlen( newval.psz_string ) > 0) - { - val.i_int = atoi( newval.psz_string ); - var_Set( p_input, "marq-timeout", val ); - } - } - else if( !strcmp( psz_cmd, "mosaic-alpha" ) ) - { - if( strlen( newval.psz_string ) > 0) - { - val.i_int = atoi( newval.psz_string ); - var_Set( p_input->p_libvlc, "mosaic-alpha", val ); - } - } - else if( !strcmp( psz_cmd, "mosaic-height" ) ) - { - if( strlen( newval.psz_string ) > 0) - { - val.i_int = atoi( newval.psz_string ); - var_Set( p_input->p_libvlc, "mosaic-height", val ); - } - } - else if( !strcmp( psz_cmd, "mosaic-width" ) ) + /* Parse commands that require a playlist */ + if( !strcmp( psz_cmd, "prev" ) ) { - if( strlen( newval.psz_string ) > 0) - { - val.i_int = atoi( newval.psz_string ); - var_Set( p_input->p_libvlc, "mosaic-width", val ); - } + playlist_Prev( p_playlist ); } - else if( !strcmp( psz_cmd, "mosaic-xoffset" ) ) + else if( !strcmp( psz_cmd, "next" ) ) { - if( strlen( newval.psz_string ) > 0) - { - val.i_int = atoi( newval.psz_string ); - var_Set( p_input->p_libvlc, "mosaic-xoffset", val ); - } + playlist_Next( p_playlist ); } - else if( !strcmp( psz_cmd, "mosaic-yoffset" ) ) + else if( !strcmp( psz_cmd, "play" ) ) { - if( strlen( newval.psz_string ) > 0) - { - val.i_int = atoi( newval.psz_string ); - var_Set( p_input->p_libvlc, "mosaic-yoffset", val ); - } + msg_Warn( p_playlist, "play" ); + playlist_Play( p_playlist ); } - else if( !strcmp( psz_cmd, "mosaic-align" ) ) + else if( !strcmp( psz_cmd, "repeat" ) ) { + bool b_update = true; + + var_Get( p_playlist, "repeat", &val ); + 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 ); + if ( ( !strncmp( newval.psz_string, "on", 2 ) && ( val.b_bool == true ) ) || + ( !strncmp( newval.psz_string, "off", 3 ) && ( val.b_bool == false ) ) ) + { + b_update = false; + } } - } - else if( !strcmp( psz_cmd, "mosaic-keep-aspect-ratio" ) ) - { - if( strlen( newval.psz_string ) > 0) + + if ( b_update ) { - val.i_int = atoi( newval.psz_string ); - var_Set( p_input->p_libvlc, "mosaic-keep-aspect-ratio", val ); + 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, "time-format" ) ) + else if( !strcmp( psz_cmd, "loop" ) ) { + bool b_update = true; + + var_Get( p_playlist, "loop", &val ); + 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); + if ( ( !strncmp( newval.psz_string, "on", 2 ) && ( val.b_bool == true ) ) || + ( !strncmp( newval.psz_string, "off", 3 ) && ( val.b_bool == false ) ) ) + { + b_update = false; + } } - } - else if( !strcmp( psz_cmd, "time-x" ) ) - { - if( strlen( newval.psz_string ) > 0) + + if ( b_update ) { - val.i_int = atoi( newval.psz_string ); - var_Set( p_input->p_libvlc, "time-x", val ); + 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, "time-y" ) ) + else if( !strcmp( psz_cmd, "random" ) ) { - if( strlen( newval.psz_string ) > 0) + bool b_update = true; + + var_Get( p_playlist, "random", &val ); + + if( strlen( newval.psz_string ) > 0 ) { - val.i_int = atoi( newval.psz_string ); - var_Set( p_input->p_libvlc, "time-y", val ); + if ( ( !strncmp( newval.psz_string, "on", 2 ) && ( val.b_bool == true ) ) || + ( !strncmp( newval.psz_string, "off", 3 ) && ( val.b_bool == false ) ) ) + { + b_update = false; + } } - } - else if( !strcmp( psz_cmd, "time-position" ) ) - { - if( strlen( newval.psz_string ) > 0) + + if ( b_update ) { - val.i_int = atoi( newval.psz_string ); - var_Set( p_input->p_libvlc, "time-position", val ); + val.b_bool = !val.b_bool; + var_Set( p_playlist, "random", val ); } + msg_rc( "Setting random to %d", val.b_bool ); } - else if( !strcmp( psz_cmd, "time-color" ) ) + else if (!strcmp( psz_cmd, "goto" ) ) { - if( strlen( newval.psz_string ) > 0) + int i_pos = atoi( newval.psz_string ); + /* The playlist stores 2 times the same item: onelevel & category */ + int i_size = p_playlist->items.i_size / 2; + + if( i_pos <= 0 ) + msg_rc( _("Error: `goto' needs an argument greater than zero.") ); + else if( i_pos <= i_size ) { - val.i_int = strtol( newval.psz_string, NULL, 0 ); - var_Set( p_input->p_libvlc, "time-color", val ); + playlist_item_t *p_item, *p_parent; + p_item = p_parent = p_playlist->items.p_elems[i_pos*2-1]; + while( p_parent->p_parent ) + p_parent = p_parent->p_parent; + playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, true, + p_parent, p_item ); } + else + msg_rc( _("Playlist has only %d elements"), i_size ); } - else if( !strcmp( psz_cmd, "time-opacity" ) ) + else if( !strcmp( psz_cmd, "stop" ) ) { - if( strlen( newval.psz_string ) > 0) - { - val.i_int = strtol( newval.psz_string, NULL, 0 ); - var_Set( p_input->p_libvlc, "time-opacity", val ); - } + playlist_Stop( p_playlist ); } - else if( !strcmp( psz_cmd, "time-size" ) ) + else if( !strcmp( psz_cmd, "clear" ) ) { - if( strlen( newval.psz_string ) > 0) - { - val.i_int = atoi( newval.psz_string ); - var_Set( p_input->p_libvlc, "time-size", val ); - } + playlist_Stop( p_playlist ); + playlist_Clear( p_playlist, false ); } - else if( !strcmp( psz_cmd, "logo-file" ) ) + else if( !strcmp( psz_cmd, "add" ) && + newval.psz_string && *newval.psz_string ) { - if( strlen( newval.psz_string ) > 0 ) + input_item_t *p_item = parse_MRL( p_intf, newval.psz_string ); + + if( p_item ) { - val.psz_string = newval.psz_string; - var_Set( p_input->p_libvlc, "logo-file", val ); + msg_rc( "Trying to add %s to playlist.", newval.psz_string ); + int i_ret =playlist_AddInput( p_playlist, p_item, + PLAYLIST_GO|PLAYLIST_APPEND, PLAYLIST_END, true, + false ); + vlc_gc_decref( p_item ); + if( i_ret != VLC_SUCCESS ) + { + return VLC_EGENERIC; + } } } - else if( !strcmp( psz_cmd, "logo-x" ) ) + else if( !strcmp( psz_cmd, "enqueue" ) && + newval.psz_string && *newval.psz_string ) { - if( strlen( newval.psz_string ) > 0) + input_item_t *p_item = parse_MRL( p_intf, newval.psz_string ); + + if( p_item ) { - val.i_int = atoi( newval.psz_string ); - var_Set( p_input->p_libvlc, "logo-x", val ); + msg_rc( "trying to enqueue %s to playlist", newval.psz_string ); + if( playlist_AddInput( p_playlist, p_item, + PLAYLIST_APPEND, PLAYLIST_END, true, + false ) != VLC_SUCCESS ) + { + return VLC_EGENERIC; + } } } - else if( !strcmp( psz_cmd, "logo-y" ) ) + else if( !strcmp( psz_cmd, "playlist" ) ) { - if( strlen( newval.psz_string ) > 0) - { - val.i_int = atoi( newval.psz_string ); - var_Set( p_input->p_libvlc, "logo-y", val ); - } + msg_rc( "+----[ Playlist ]" ); + print_playlist( p_intf, p_playlist->p_root_category, 0 ); + msg_rc( "+----[ End of playlist ]" ); } - else if( !strcmp( psz_cmd, "logo-position" ) ) + + else if( !strcmp( psz_cmd, "sort" )) { - if( strlen( newval.psz_string ) > 0) - { - val.i_int = atoi( newval.psz_string ); - var_Set( p_input->p_libvlc, "logo-position", val ); - } + playlist_RecursiveNodeSort( p_playlist, p_playlist->p_root_onelevel, + SORT_ARTIST, ORDER_NORMAL ); } - else if( !strcmp( psz_cmd, "logo-transparency" ) ) + else if( !strcmp( psz_cmd, "status" ) ) { - if( strlen( newval.psz_string ) > 0) + if( p_playlist->p_input ) { - val.i_int = strtol( newval.psz_string, NULL, 0 ); - var_Set( p_input->p_libvlc, "logo-transparency", val ); + /* Replay the current state of the system. */ + char *psz_uri = + input_item_GetURI( input_GetItem( p_playlist->p_input ) ); + msg_rc( STATUS_CHANGE "( new input: %s )", psz_uri ); + free( psz_uri ); + msg_rc( STATUS_CHANGE "( audio volume: %d )", + config_GetInt( p_intf, "volume" )); + + PL_LOCK; + switch( p_playlist->status.i_status ) + { + case PLAYLIST_STOPPED: + msg_rc( STATUS_CHANGE "( stop state: 5 )" ); + break; + case PLAYLIST_RUNNING: + msg_rc( STATUS_CHANGE "( play state: 3 )" ); + break; + case PLAYLIST_PAUSED: + msg_rc( STATUS_CHANGE "( pause state: 4 )" ); + break; + default: + msg_rc( STATUS_CHANGE "( unknown state: -1 )" ); + break; + } + PL_UNLOCK; } } @@ -1656,13 +1510,14 @@ static int Other( vlc_object_t *p_this, char const *psz_cmd, } 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 ) { + VLC_UNUSED(p_data); VLC_UNUSED(psz_cmd); + VLC_UNUSED(oldval); VLC_UNUSED(newval); playlist_t *p_playlist; p_playlist = vlc_object_find( p_this, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE ); @@ -1671,19 +1526,19 @@ static int Quit( vlc_object_t *p_this, char const *psz_cmd, playlist_Stop( p_playlist ); vlc_object_release( p_playlist ); } - p_this->p_vlc->b_die = VLC_TRUE; + vlc_object_kill( p_this->p_libvlc ); return VLC_SUCCESS; } static int Intf( vlc_object_t *p_this, char const *psz_cmd, vlc_value_t oldval, vlc_value_t newval, void *p_data ) { + VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval); VLC_UNUSED(p_data); intf_thread_t *p_newintf = NULL; - p_newintf = intf_Create( p_this->p_vlc, newval.psz_string, 0, NULL ); + p_newintf = intf_Create( p_this->p_libvlc, newval.psz_string, 0, NULL ); if( p_newintf ) { - p_newintf->b_block = VLC_FALSE; if( intf_RunThread( p_newintf ) ) { vlc_object_detach( p_newintf ); @@ -1697,6 +1552,7 @@ static int Intf( vlc_object_t *p_this, char const *psz_cmd, static int Volume( vlc_object_t *p_this, char const *psz_cmd, vlc_value_t oldval, vlc_value_t newval, void *p_data ) { + VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval); VLC_UNUSED(p_data); intf_thread_t *p_intf = (intf_thread_t*)p_this; input_thread_t *p_input = NULL; int i_error = VLC_EGENERIC; @@ -1712,7 +1568,7 @@ static int Volume( vlc_object_t *p_this, char const *psz_cmd, var_Get( p_input, "state", &val ); if( ( val.i_int == PAUSE_S ) || ( val.i_int == PLAYLIST_PAUSED ) ) { - msg_rc( _("press menu select or pause to continue") ); + msg_rc( _("Type 'menu select' or 'pause' to continue.") ); vlc_object_release( p_input ); return VLC_EGENERIC; } @@ -1725,7 +1581,7 @@ static int Volume( vlc_object_t *p_this, char const *psz_cmd, audio_volume_t i_volume = atoi( newval.psz_string ); if ( (i_volume > (audio_volume_t)AOUT_VOLUME_MAX) ) { - msg_rc( "Volume must be in the range %d-%d", AOUT_VOLUME_MIN, + msg_rc( "Volume must be in the range %d-%d.", AOUT_VOLUME_MIN, AOUT_VOLUME_MAX ); i_error = VLC_EBADVAR; } @@ -1736,7 +1592,7 @@ static int Volume( vlc_object_t *p_this, char const *psz_cmd, vlc_value_t keyval; keyval.i_int = config_GetInt( p_intf, "key-vol-mute" ); - var_Set( p_intf->p_vlc, "key-pressed", keyval ); + var_Set( p_intf->p_libvlc, "key-pressed", keyval ); } i_error = aout_VolumeSet( p_this, i_volume ); osd_Volume( p_this ); @@ -1764,6 +1620,7 @@ static int Volume( vlc_object_t *p_this, char const *psz_cmd, static int VolumeMove( vlc_object_t *p_this, char const *psz_cmd, vlc_value_t oldval, vlc_value_t newval, void *p_data ) { + VLC_UNUSED(oldval); VLC_UNUSED(p_data); intf_thread_t *p_intf = (intf_thread_t*)p_this; audio_volume_t i_volume; input_thread_t *p_input = NULL; @@ -1782,14 +1639,14 @@ static int VolumeMove( vlc_object_t *p_this, char const *psz_cmd, var_Get( p_input, "state", &val ); if( ( val.i_int == PAUSE_S ) || ( val.i_int == PLAYLIST_PAUSED ) ) { - msg_rc( _("press menu select or pause to continue") ); + msg_rc( _("Type 'menu select' or 'pause' to continue.") ); vlc_object_release( p_input ); return VLC_EGENERIC; } vlc_object_release( p_input ); } - i_volume_step = config_GetInt( p_intf->p_vlc, "volume-step" ); + i_volume_step = config_GetInt( p_intf->p_libvlc, "volume-step" ); if ( i_nb_steps <= 0 || i_nb_steps > (AOUT_VOLUME_MAX/i_volume_step) ) { i_nb_steps = 1; @@ -1811,9 +1668,140 @@ static int VolumeMove( vlc_object_t *p_this, char const *psz_cmd, return i_error; } + +static int VideoConfig( vlc_object_t *p_this, char const *psz_cmd, + vlc_value_t oldval, vlc_value_t newval, void *p_data ) +{ + VLC_UNUSED(oldval); VLC_UNUSED(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 = NULL; + 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"; + } + else if( !strcmp( psz_cmd, "snapshot" ) ) + { + psz_variable = "video-snapshot"; + } + + 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 if( !strcmp( psz_cmd, "snapshot" ) ) + { + vlc_value_t val; + val.b_bool = true; + i_error = var_Set( p_vout, psz_variable, val ); + } + else + { + /* get */ + vlc_value_t val_name; + 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; + } + + /* Get the descriptive name of the variable */ + var_Change( p_vout, psz_variable, VLC_VAR_GETTEXT, + &val_name, NULL ); + if( !val_name.psz_string ) val_name.psz_string = strdup(psz_variable); + + msg_rc( "+----[ %s ]", val_name.psz_string ); + if( !strcmp( psz_variable, "zoom" ) ) + { + 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 ); + + free( val_name.psz_string ); + + i_error = VLC_SUCCESS; + } + vlc_object_release( p_vout ); + return i_error; +} + static int AudioConfig( vlc_object_t *p_this, char const *psz_cmd, vlc_value_t oldval, vlc_value_t newval, void *p_data ) { + VLC_UNUSED(oldval); VLC_UNUSED(p_data); intf_thread_t *p_intf = (intf_thread_t*)p_this; input_thread_t *p_input = NULL; aout_instance_t * p_aout; @@ -1831,7 +1819,7 @@ static int AudioConfig( vlc_object_t *p_this, char const *psz_cmd, var_Get( p_input, "state", &val ); if( ( val.i_int == PAUSE_S ) || ( val.i_int == PLAYLIST_PAUSED ) ) { - msg_rc( _("press menu select or pause to continue") ); + msg_rc( _("Type 'menu select' or 'pause' to continue.") ); vlc_object_release( p_input ); return VLC_EGENERIC; } @@ -1889,7 +1877,7 @@ static int AudioConfig( vlc_object_t *p_this, char const *psz_cmd, &val, &text ); msg_rc( "+----[ end of %s ]", val_name.psz_string ); - if( val_name.psz_string ) free( val_name.psz_string ); + free( val_name.psz_string ); i_error = VLC_SUCCESS; } else @@ -1908,6 +1896,7 @@ static int AudioConfig( vlc_object_t *p_this, char const *psz_cmd, static int Menu( vlc_object_t *p_this, char const *psz_cmd, vlc_value_t oldval, vlc_value_t newval, void *p_data ) { + VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval); VLC_UNUSED(p_data); intf_thread_t *p_intf = (intf_thread_t*)p_this; playlist_t *p_playlist = NULL; vlc_value_t val; @@ -1915,7 +1904,7 @@ static int Menu( vlc_object_t *p_this, char const *psz_cmd, if ( !*newval.psz_string ) { - msg_rc( _("please provide one of the following paramaters") ); + msg_rc( _("Please provide one of the following parameters:") ); msg_rc( "[on|off|up|down|left|right|select]" ); return i_error; } @@ -1930,7 +1919,7 @@ static int Menu( vlc_object_t *p_this, char const *psz_cmd, if( ( ( val.i_int == PAUSE_S ) || ( val.i_int == PLAYLIST_PAUSED ) ) && ( strcmp( newval.psz_string, "select" ) != 0 ) ) { - msg_rc( _("press menu select or pause to continue") ); + msg_rc( _("Type 'menu select' or 'pause' to continue.") ); vlc_object_release( p_playlist ); return VLC_EGENERIC; } @@ -1954,19 +1943,100 @@ static int Menu( vlc_object_t *p_this, char const *psz_cmd, osd_MenuActivate( p_this ); else { - msg_rc( _("please provide one of the following paramaters") ); + msg_rc( _("Please provide one of the following parameters:") ); msg_rc( "[on|off|up|down|left|right|select]" ); - if( val.psz_string ) free( val.psz_string ); - return i_error; + free( val.psz_string ); + return i_error; + } + + i_error = VLC_SUCCESS; + free( val.psz_string ); + return i_error; +} + +static int Statistics ( vlc_object_t *p_this, char const *psz_cmd, + vlc_value_t oldval, vlc_value_t newval, void *p_data ) +{ + VLC_UNUSED(oldval); VLC_UNUSED(newval); VLC_UNUSED(p_data); + intf_thread_t *p_intf = (intf_thread_t*)p_this; + input_thread_t *p_input = NULL; + int i_error; + + p_input = vlc_object_find( p_this, VLC_OBJECT_INPUT, FIND_ANYWHERE ); + if( !p_input ) + return VLC_ENOOBJ; + + if( !strcmp( psz_cmd, "stats" ) ) + { + vlc_mutex_lock( &input_GetItem(p_input)->lock ); + updateStatistics( p_intf, input_GetItem(p_input) ); + vlc_mutex_unlock( &input_GetItem(p_input)->lock ); + } + /* + * sanity check + */ + else + { + msg_rc(_("Unknown command!") ); } + vlc_object_release( p_input ); i_error = VLC_SUCCESS; - if( val.psz_string ) free( val.psz_string ); return i_error; } +static int updateStatistics( intf_thread_t *p_intf, input_item_t *p_item ) +{ + if( !p_item ) return VLC_EGENERIC; + + vlc_mutex_lock( &p_item->p_stats->lock ); + msg_rc( "+----[ begin of statistical info ]" ); + + /* Input */ + msg_rc(_("+-[Incoming]")); + msg_rc(_("| input bytes read : %8.0f kB"), + (float)(p_item->p_stats->i_read_bytes)/1000 ); + msg_rc(_("| input bitrate : %6.0f kb/s"), + (float)(p_item->p_stats->f_input_bitrate)*8000 ); + msg_rc(_("| demux bytes read : %8.0f kB"), + (float)(p_item->p_stats->i_demux_read_bytes)/1000 ); + msg_rc(_("| demux bitrate : %6.0f kb/s"), + (float)(p_item->p_stats->f_demux_bitrate)*8000 ); + msg_rc("|"); + /* Video */ + msg_rc(_("+-[Video Decoding]")); + msg_rc(_("| video decoded : %5i"), + p_item->p_stats->i_decoded_video ); + msg_rc(_("| frames displayed : %5i"), + p_item->p_stats->i_displayed_pictures ); + msg_rc(_("| frames lost : %5i"), + p_item->p_stats->i_lost_pictures ); + msg_rc("|"); + /* Audio*/ + msg_rc(_("+-[Audio Decoding]")); + msg_rc(_("| audio decoded : %5i"), + p_item->p_stats->i_decoded_audio ); + msg_rc(_("| buffers played : %5i"), + p_item->p_stats->i_played_abuffers ); + msg_rc(_("| buffers lost : %5i"), + p_item->p_stats->i_lost_abuffers ); + msg_rc("|"); + /* Sout */ + msg_rc(_("+-[Streaming]")); + msg_rc(_("| packets sent : %5i"), p_item->p_stats->i_sent_packets ); + msg_rc(_("| bytes sent : %8.0f kB"), + (float)(p_item->p_stats->i_sent_bytes)/1000 ); + msg_rc(_("| sending bitrate : %6.0f kb/s"), + (float)(p_item->p_stats->f_send_bitrate*8)*1000 ); + msg_rc("|"); + msg_rc( "+----[ end of statistical info ]" ); + vlc_mutex_unlock( &p_item->p_stats->lock ); + + return VLC_SUCCESS; +} + #ifdef WIN32 -vlc_bool_t ReadWin32( intf_thread_t *p_intf, char *p_buffer, int *pi_size ) +bool ReadWin32( intf_thread_t *p_intf, char *p_buffer, int *pi_size ) { INPUT_RECORD input_record; DWORD i_dw; @@ -1975,7 +2045,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 ) ) { @@ -2023,15 +2093,15 @@ vlc_bool_t ReadWin32( intf_thread_t *p_intf, char *p_buffer, int *pi_size ) p_buffer[ *pi_size ] == '\r' || p_buffer[ *pi_size ] == '\n' ) { p_buffer[ *pi_size ] = 0; - return VLC_TRUE; + return true; } } - return VLC_FALSE; + return false; } #endif -vlc_bool_t ReadCommand( intf_thread_t *p_intf, char *p_buffer, int *pi_size ) +bool ReadCommand( intf_thread_t *p_intf, char *p_buffer, int *pi_size ) { int i_read = 0; @@ -2041,14 +2111,14 @@ vlc_bool_t ReadCommand( intf_thread_t *p_intf, char *p_buffer, int *pi_size ) else if( p_intf->p_sys->i_socket == -1 ) { msleep( INTF_IDLE_SLEEP ); - return VLC_FALSE; + return 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 ? + while( !intf_ShouldDie( p_intf ) && *pi_size < MAX_LINE_LENGTH && + (i_read = net_Read( p_intf, p_intf->p_sys->i_socket == -1 ? 0 /*STDIN_FILENO*/ : p_intf->p_sys->i_socket, NULL, - (uint8_t *)p_buffer + *pi_size, 1, INTF_IDLE_SLEEP ) ) > 0 ) + (uint8_t *)p_buffer + *pi_size, 1, false ) ) > 0 ) { if( p_buffer[ *pi_size ] == '\r' || p_buffer[ *pi_size ] == '\n' ) break; @@ -2057,37 +2127,48 @@ vlc_bool_t ReadCommand( intf_thread_t *p_intf, char *p_buffer, int *pi_size ) } /* Connection closed */ - if( i_read == -1 ) + if( i_read <= 0 ) { - p_intf->p_sys->i_socket = -1; + if( p_intf->p_sys->i_socket != -1 ) + { + net_Close( p_intf->p_sys->i_socket ); + p_intf->p_sys->i_socket = -1; + } + else + { + /* Standard input closed: exit */ + vlc_value_t empty; + Quit( p_intf, NULL, empty, empty, NULL ); + } + p_buffer[ *pi_size ] = 0; - return VLC_TRUE; + return true; } if( *pi_size == MAX_LINE_LENGTH || p_buffer[ *pi_size ] == '\r' || p_buffer[ *pi_size ] == '\n' ) { p_buffer[ *pi_size ] = 0; - return VLC_TRUE; + return true; } - return VLC_FALSE; + return false; } /***************************************************************************** - * 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 SKIPSPACE( p ) { while( *p == ' ' || *p == '\t' ) p++; } #define SKIPTRAILINGSPACE( p, d ) \ { char *e=d; while( e > p && (*(e-1)==' ' || *(e-1)=='\t') ){e--;*e=0;} } - playlist_item_t *p_item = NULL; + input_item_t *p_item = NULL; char *psz_item = NULL, *psz_item_mrl = NULL, *psz_orig; char **ppsz_options = NULL; int i, i_options = 0; @@ -2138,10 +2219,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] ); } }