/*****************************************************************************
* rc.c : remote control stdin/stdout module for vlc
*****************************************************************************
- * Copyright (C) 2004 VideoLAN
+ * Copyright (C) 2004-2007 the VideoLAN team
* $Id$
*
* Author: Peter Surda <shurdeek@panorama.sth.ac.at>
+ * Jean-Paul Saman <jpsaman #_at_# m2x _replaceWith#dot_ nl>
*
* 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
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h> /* malloc(), free() */
-#include <string.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <errno.h> /* ENOMEM */
-#include <stdio.h>
#include <ctype.h>
#include <signal.h>
-#include <vlc/vlc.h>
-#include <vlc/intf.h>
-#include <vlc/aout.h>
-#include <vlc/vout.h>
+#include <vlc_interface.h>
+#include <vlc_aout.h>
+#include <vlc_vout.h>
+#include <vlc_osd.h>
+#include <vlc_playlist.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
#include <sys/types.h>
-#include "vlc_error.h"
-#include "network.h"
+#include <vlc_network.h>
+#include "vlc_url.h"
+
+#include <vlc_charset.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 <sys/un.h>
#endif
#define MAX_LINE_LENGTH 256
+#define STATUS_CHANGE "status change: "
+
+/* input_state_e from <vlc_input.h> */
+static const char *ppsz_input_state[] = {
+ N_("Initializing"),
+ N_("Opening"),
+ N_("Buffer"),
+ N_("Play"),
+ N_("Pause"),
+ N_("Stop"),
+ N_("Forward"),
+ N_("Backward"),
+ N_("End"),
+ N_("Error"),
+};
/*****************************************************************************
* Local prototypes
static void Deactivate ( vlc_object_t * );
static void Run ( intf_thread_t * );
-static vlc_bool_t ReadCommand( intf_thread_t *, char *, int * );
+static void Help ( intf_thread_t *, bool );
+static void RegisterCallbacks( intf_thread_t * );
+
+static bool ReadCommand( intf_thread_t *, char *, int * );
+
+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 * );
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 *,
+ 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;
+ /* status changes */
+ vlc_mutex_t status_lock;
+ playlist_status_t i_last_state;
+
#ifdef WIN32
HANDLE hConsoleIn;
+ bool b_quiet;
#endif
};
-#ifdef HAVE_VARIADIC_MACROS
-# define printf( psz_format, args... ) \
- Printf( p_intf, psz_format, ## args )
-#endif
+#define msg_rc( ... ) __msg_rc( p_intf, __VA_ARGS__ )
-void Printf( 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 );
- else net_vaPrintf( p_intf, p_intf->p_sys->i_socket, psz_fmt, args );
+
+ if( p_intf->p_sys->i_socket == -1 )
+ {
+ utf8_vfprintf( stdout, psz_fmt, args );
+ printf( "\r\n" );
+ }
+ else
+ {
+ net_vaPrintf( p_intf, p_intf->p_sys->i_socket, NULL, psz_fmt, args );
+ net_Write( p_intf, p_intf->p_sys->i_socket, NULL, (uint8_t*)"\r\n", 2 );
+ }
va_end( args );
}
#endif
vlc_module_begin();
- 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 );
+ set_shortname( N_("RC"));
+ set_category( CAT_INTERFACE );
+ set_subcategory( SUBCAT_INTERFACE_MAIN );
+ set_description( N_("Remote control interface") );
+ 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();
{
intf_thread_t *p_intf = (intf_thread_t*)p_this;
char *psz_host, *psz_unix_path;
- int i_socket = -1;
+ int *pi_socket = NULL;
-#if defined(HAVE_ISATTY) && !defined(WIN32)
+#ifndef WIN32
+#if defined(HAVE_ISATTY)
/* Check that stdin is a TTY */
if( !config_GetInt( p_intf, "rc-fake-tty" ) && !isatty( 0 ) )
{
psz_unix_path = config_GetPsz( p_intf, "rc-unix" );
if( psz_unix_path )
{
-#ifndef PF_LOCAL
+ int i_socket;
+
+#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) );
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) );
+ msg_Warn( p_intf, "can't open socket: %m" );
free( psz_unix_path );
return VLC_EGENERIC;
}
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_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( listen( i_socket, 1 ) )
{
- msg_Warn( p_intf, "couldn't bind socket to address: %s",
- strerror(errno) );
+ msg_Warn( p_intf, "can't listen on socket: %m");
free( psz_unix_path );
net_Close( i_socket );
return VLC_EGENERIC;
}
- if( ( i_ret = listen( i_socket, 1 ) ) < 0 )
+ /* FIXME: we need a core function to merge listening sockets sets */
+ pi_socket = calloc( 2, sizeof( int ) );
+ if( pi_socket == NULL )
{
- msg_Warn( p_intf, "can't listen on socket: %s", strerror(errno));
free( psz_unix_path );
net_Close( i_socket );
- return VLC_EGENERIC;
+ return VLC_ENOMEM;
}
-#endif
+ pi_socket[0] = i_socket;
+ pi_socket[1] = -1;
+#endif /* AF_LOCAL */
}
+#endif /* !WIN32 */
- if( ( i_socket == -1) &&
+ if( ( pi_socket == NULL ) &&
( psz_host = config_GetPsz( p_intf, "rc-host" ) ) != NULL )
{
vlc_url_t url;
vlc_UrlParse( &url, psz_host, 0 );
- msg_Dbg( p_intf, "base %s port %d", url.psz_host, url.i_port );
+ msg_Dbg( p_intf, "base: %s, port: %d", url.psz_host, url.i_port );
- if( (i_socket = net_ListenTCP(p_this, url.psz_host, url.i_port)) == -1)
+ pi_socket = net_ListenTCP(p_this, url.psz_host, url.i_port);
+ if( pi_socket == NULL )
{
msg_Warn( p_intf, "can't listen to %s port %i",
url.psz_host, url.i_port );
p_intf->p_sys = malloc( sizeof( intf_sys_t ) );
if( !p_intf->p_sys )
- {
- msg_Err( p_intf, "no memory" );
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_sys->status_lock );
+ p_intf->p_sys->i_last_state = PLAYLIST_STOPPED;
/* Non-buffered stdout */
setvbuf( stdout, (char *)NULL, _IOLBF, 0 );
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") );
+ msg_rc( _("Remote control interface initialized. Type `help' for help.") );
return VLC_SUCCESS;
}
{
intf_thread_t *p_intf = (intf_thread_t*)p_this;
- if( p_intf->p_sys->i_socket_listen != -1 )
- net_Close( p_intf->p_sys->i_socket_listen );
+ net_ListenClose( p_intf->p_sys->pi_socket_listen );
if( p_intf->p_sys->i_socket != -1 )
net_Close( p_intf->p_sys->i_socket );
if( p_intf->p_sys->psz_unix_path != NULL )
{
-#ifdef PF_LOCAL
+#if defined(AF_LOCAL) && !defined(WIN32)
unlink( p_intf->p_sys->psz_unix_path );
#endif
free( p_intf->p_sys->psz_unix_path );
}
+ vlc_mutex_destroy( &p_intf->p_sys->status_lock );
free( p_intf->p_sys );
}
+/*****************************************************************************
+ * RegisterCallbacks: Register callbacks to dynamic variables
+ *****************************************************************************/
+static void RegisterCallbacks( intf_thread_t *p_intf )
+{
+ /* Register commands that will be cleaned up upon object destruction */
+#define ADD( name, type, target ) \
+ var_Create( p_intf, name, VLC_VAR_ ## type | VLC_VAR_ISCOMMAND ); \
+ var_AddCallback( p_intf, name, target, NULL );
+ ADD( "quit", VOID, Quit )
+ ADD( "intf", STRING, Intf )
+
+ ADD( "add", STRING, Playlist )
+ ADD( "repeat", STRING, Playlist )
+ ADD( "loop", STRING, Playlist )
+ ADD( "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 */
+ ADD( "menu", STRING, Menu )
+
+ /* DVD commands */
+ ADD( "pause", VOID, Input )
+ ADD( "seek", INTEGER, Input )
+ ADD( "title", STRING, Input )
+ ADD( "title_n", VOID, Input )
+ ADD( "title_p", VOID, Input )
+ ADD( "chapter", STRING, Input )
+ ADD( "chapter_n", VOID, Input )
+ ADD( "chapter_p", VOID, Input )
+
+ ADD( "fastforward", VOID, Input )
+ ADD( "rewind", VOID, Input )
+ ADD( "faster", VOID, Input )
+ ADD( "slower", VOID, Input )
+ ADD( "normal", VOID, Input )
+
+ ADD( "atrack", STRING, Input )
+ ADD( "vtrack", STRING, Input )
+ ADD( "strack", STRING, Input )
+
+ /* video commands */
+ ADD( "vratio", STRING, VideoConfig )
+ ADD( "vcrop", STRING, VideoConfig )
+ ADD( "vzoom", STRING, VideoConfig )
+ ADD( "snapshot", VOID, VideoConfig )
+
+ /* audio commands */
+ 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
+}
+
/*****************************************************************************
* Run: rc thread
*****************************************************************************
playlist_t * p_playlist;
char p_buffer[ MAX_LINE_LENGTH + 1 ];
- vlc_bool_t b_showpos = config_GetInt( p_intf, "rc-show-pos" );
+ bool b_showpos = config_GetInt( p_intf, "rc-show-pos" );
+ bool b_longhelp = false;
int i_size = 0;
int i_oldpos = 0;
p_playlist = NULL;
/* Register commands that will be cleaned up upon object destruction */
- var_Create( p_intf, "quit", VLC_VAR_VOID | VLC_VAR_ISCOMMAND );
- var_AddCallback( p_intf, "quit", Quit, NULL );
- var_Create( p_intf, "intf", VLC_VAR_STRING | VLC_VAR_ISCOMMAND );
- var_AddCallback( p_intf, "intf", Intf, NULL );
-
- var_Create( p_intf, "add", VLC_VAR_STRING | VLC_VAR_ISCOMMAND );
- var_AddCallback( p_intf, "add", Playlist, NULL );
- var_Create( p_intf, "playlist", VLC_VAR_VOID | VLC_VAR_ISCOMMAND );
- var_AddCallback( p_intf, "playlist", Playlist, NULL );
- var_Create( p_intf, "play", VLC_VAR_VOID | VLC_VAR_ISCOMMAND );
- var_AddCallback( p_intf, "play", Playlist, NULL );
- var_Create( p_intf, "stop", VLC_VAR_VOID | VLC_VAR_ISCOMMAND );
- var_AddCallback( p_intf, "stop", Playlist, NULL );
- var_Create( p_intf, "prev", VLC_VAR_VOID | VLC_VAR_ISCOMMAND );
- var_AddCallback( p_intf, "prev", Playlist, NULL );
- var_Create( p_intf, "next", VLC_VAR_VOID | VLC_VAR_ISCOMMAND );
- var_AddCallback( p_intf, "next", Playlist, NULL );
-
- var_Create( p_intf, "marquee", VLC_VAR_VOID | VLC_VAR_ISCOMMAND );
- var_AddCallback( p_intf, "marquee", Input, NULL );
- var_Create( p_intf, "marq-x", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND );
- var_AddCallback( p_intf, "marq-x", Input, NULL );
- var_Create( p_intf, "marq-y", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND );
- var_AddCallback( p_intf, "marq-y", Input, NULL );
-
- var_Create( p_intf, "pause", VLC_VAR_VOID | VLC_VAR_ISCOMMAND );
- var_AddCallback( p_intf, "pause", Input, NULL );
- var_Create( p_intf, "seek", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND );
- var_AddCallback( p_intf, "seek", Input, NULL );
- var_Create( p_intf, "title", VLC_VAR_STRING | VLC_VAR_ISCOMMAND );
- var_AddCallback( p_intf, "title", Input, NULL );
- var_Create( p_intf, "title_n", VLC_VAR_VOID | VLC_VAR_ISCOMMAND );
- var_AddCallback( p_intf, "title_n", Input, NULL );
- var_Create( p_intf, "title_p", VLC_VAR_VOID | VLC_VAR_ISCOMMAND );
- var_AddCallback( p_intf, "title_p", Input, NULL );
- var_Create( p_intf, "chapter", VLC_VAR_STRING | VLC_VAR_ISCOMMAND );
- var_AddCallback( p_intf, "chapter", Input, NULL );
- var_Create( p_intf, "chapter_n", VLC_VAR_VOID | VLC_VAR_ISCOMMAND );
- var_AddCallback( p_intf, "chapter_n", Input, NULL );
- var_Create( p_intf, "chapter_p", VLC_VAR_VOID | VLC_VAR_ISCOMMAND );
- var_AddCallback( p_intf, "chapter_p", Input, NULL );
-
- var_Create( p_intf, "volume", VLC_VAR_STRING | VLC_VAR_ISCOMMAND );
- var_AddCallback( p_intf, "volume", Volume, NULL );
- var_Create( p_intf, "volup", VLC_VAR_STRING | VLC_VAR_ISCOMMAND );
- var_AddCallback( p_intf, "volup", VolumeMove, NULL );
- var_Create( p_intf, "voldown", VLC_VAR_STRING | VLC_VAR_ISCOMMAND );
- var_AddCallback( p_intf, "voldown", VolumeMove, NULL );
- var_Create( p_intf, "adev", VLC_VAR_STRING | VLC_VAR_ISCOMMAND );
- var_AddCallback( p_intf, "adev", AudioConfig, NULL );
- var_Create( p_intf, "achan", VLC_VAR_STRING | VLC_VAR_ISCOMMAND );
- var_AddCallback( p_intf, "achan", AudioConfig, NULL );
+ RegisterCallbacks( p_intf );
+
+ /* status callbacks */
+ /* Listen to audio volume updates */
+ var_AddCallback( p_intf->p_libvlc, "volume-change", VolumeChanged, p_intf );
#ifdef WIN32
/* Get the file descriptor of the console input */
p_intf->p_sys->hConsoleIn = GetStdHandle(STD_INPUT_HANDLE);
if( p_intf->p_sys->hConsoleIn == INVALID_HANDLE_VALUE )
{
- msg_Err( p_intf, "Couldn't open STD_INPUT_HANDLE" );
- 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->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,
+ INTF_IDLE_SLEEP );
+ if( p_intf->p_sys->i_socket == -1 ) continue;
}
b_complete = ReadCommand( p_intf, p_buffer, &i_size );
FIND_ANYWHERE );
if( p_input )
{
- p_playlist = vlc_object_find( p_input, VLC_OBJECT_PLAYLIST,
- FIND_PARENT );
+ p_playlist = pl_Yield( p_input );
}
}
+ /* New input has been registered */
+ if( p_input )
+ {
+ if( !p_input->b_dead || vlc_object_alive (p_input) )
+ {
+ 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 );
+ }
}
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_object_lock( p_playlist );
+ p_intf->p_sys->i_last_state = (int) PLAYLIST_STOPPED;
+ msg_rc( STATUS_CHANGE "( stop state: 0 )" );
+ vlc_object_unlock( p_playlist );
+ }
+ }
+
+ if( (p_input != NULL) && !p_input->b_dead && vlc_object_alive (p_input) &&
+ (p_playlist != NULL) )
+ {
+ vlc_object_lock( p_playlist );
+ 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: 5 )" );
+ }
+ 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: 3 )" );
+ }
+ 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: 4 )" );
+ }
+ vlc_object_unlock( p_playlist );
}
if( p_input && b_showpos )
if( i_oldpos != i_newpos )
{
i_oldpos = i_newpos;
- printf( "pos: %d%%\n", i_newpos );
+ msg_rc( "pos: %d%%", i_newpos );
}
}
/* Is there something to do? */
if( !b_complete ) continue;
-
/* Skip heading spaces */
psz_cmd = p_buffer;
while( *psz_cmd == ' ' )
}
else
{
- psz_arg = "";
+ psz_arg = (char*)"";
}
+ /* module specfic commands: @<module name> <command> <args...> */
+ 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;
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 */
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 ) );
}
}
+ else if( !strcmp( psz_cmd, "logout" ) )
+ {
+ /* Close connection */
+ if( p_intf->p_sys->i_socket != -1 )
+ {
+ net_Close( p_intf->p_sys->i_socket );
+ }
+ p_intf->p_sys->i_socket = -1;
+ }
else if( !strcmp( psz_cmd, "info" ) )
{
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];
- 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") );
- vlc_mutex_unlock( &p_input->input.p_item->lock );
+ msg_rc( "+----[ end of stream info ]" );
+ vlc_mutex_unlock( &input_GetItem(p_input)->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", 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 = 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':
if( p_vout )
{
- p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE;
+ vlc_value_t val;
+ 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 == true ) )
+ {
+ b_update = true;
+ val.b_bool = true;
+ }
+ else if( !strncmp( psz_arg, "off", 3 )
+ && ( val.b_bool == false ) )
+ {
+ b_update = true;
+ val.b_bool = false;
+ }
+ 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 );
}
}
;
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(_("| 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("| \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");
- printf(_("| help . . . . . . . . . . . . . this help message\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;
}
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;
}
vlc_object_release( p_playlist );
p_playlist = NULL;
}
+
+ var_DelCallback( p_intf->p_libvlc, "volume-change", VolumeChanged, p_intf );
+}
+
+static void Help( intf_thread_t *p_intf, bool b_longhelp)
+{
+ msg_rc(_("+----[ Remote control commands ]"));
+ msg_rc( "| ");
+ msg_rc(_("| add XYZ . . . . . . . . . . . . add XYZ to playlist"));
+ msg_rc(_("| enqueue XYZ . . . . . . . . . queue XYZ to playlist"));
+ msg_rc(_("| playlist . . . . . show items currently in playlist"));
+ msg_rc(_("| play . . . . . . . . . . . . . . . . . . play stream"));
+ msg_rc(_("| stop . . . . . . . . . . . . . . . . . . stop stream"));
+ msg_rc(_("| next . . . . . . . . . . . . . . next playlist item"));
+ msg_rc(_("| prev . . . . . . . . . . . . previous playlist item"));
+ msg_rc(_("| goto . . . . . . . . . . . . . . goto item at index"));
+ msg_rc(_("| repeat [on|off] . . . . toggle playlist item repeat"));
+ msg_rc(_("| loop [on|off] . . . . . . . . . toggle playlist 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(_("| 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(_("| 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(_("| @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(_("| @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(_("| @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( "| ");
+ 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 )
+{
+ 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;
+
+ 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 )
+{
+ 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") );
+ 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 )
+{
+ 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;
+
+ 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 = pl_Yield( p_input );
+ char cmd[6];
+ switch( p_playlist->status.i_status )
+ {
+ case PLAYLIST_STOPPED:
+ strcpy( cmd, "stop" );
+ break;
+ case PLAYLIST_RUNNING:
+ strcpy( cmd, "play" );
+ break;
+ case PLAYLIST_PAUSED:
+ strcpy( cmd, "pause" );
+ break;
+ default:
+ cmd[0] = '\0';
+ } /* var_GetInteger( p_input, "state" ) */
+ msg_rc( STATUS_CHANGE "( %s state: %d ): %s",
+ cmd, newval.i_int,
+ ppsz_input_state[ 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 )
+{
+ 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;
+
+ 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 )
{
+ 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;
p_input = vlc_object_find( p_this, VLC_OBJECT_INPUT, FIND_ANYWHERE );
if( !p_input ) return VLC_ENOOBJ;
+ var_Get( p_input, "state", &val );
+ if( ( ( val.i_int == PAUSE_S ) || ( val.i_int == PLAYLIST_PAUSED ) ) &&
+ ( strcmp( psz_cmd, "pause" ) != 0 ) )
+ {
+ msg_rc( _("Press menu select or pause to continue.") );
+ vlc_object_release( p_input );
+ return VLC_EGENERIC;
+ }
+
/* Parse commands that only require an input */
if( !strcmp( psz_cmd, "pause" ) )
{
- val.i_int = PAUSE_S;
-
- var_Set( p_input, "state", val );
+ val.i_int = config_GetInt( p_intf, "key-play-pause" );
+ var_Set( p_intf->p_libvlc, "key-pressed", val );
vlc_object_release( p_input );
return VLC_SUCCESS;
}
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
vlc_object_release( p_input );
return VLC_SUCCESS;
}
- else if( !strcmp( psz_cmd, "marquee" ) )
+ else if ( !strcmp( psz_cmd, "fastforward" ) )
{
- if( strlen( newval.psz_string ) > 0 )
- {
- val.psz_string = newval.psz_string;
- /* check for the playlist structure */
- vlc_object_t *p_pl =
- vlc_object_find( p_this, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
- if( !p_pl )
- {
- return VLC_ENOOBJ;
- }
- var_Set( p_pl, "marquee", val );
- vlc_object_release( p_pl );
- }
+ val.i_int = config_GetInt( p_intf, "key-jump+extrashort" );
+ var_Set( p_intf->p_libvlc, "key-pressed", val );
vlc_object_release( p_input );
return VLC_SUCCESS;
}
- else if( !strcmp( psz_cmd, "marq-x" ) )
+ else if ( !strcmp( psz_cmd, "rewind" ) )
{
- if( strlen( newval.psz_string ) > 0)
- {
- vlc_object_t *p_pl =
- vlc_object_find( p_this, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
- if( !p_pl )
- {
- return VLC_ENOOBJ;
- }
- val.i_int = atoi( newval.psz_string );
- var_Set( p_pl, "marq-x", val );
- vlc_object_release( p_pl );
- }
+ val.i_int = config_GetInt( p_intf, "key-jump-extrashort" );
+ var_Set( p_intf->p_libvlc, "key-pressed", val );
vlc_object_release( p_input );
return VLC_SUCCESS;
}
- else if( !strcmp( psz_cmd, "marq-y" ) )
+ else if ( !strcmp( psz_cmd, "faster" ) )
{
- if( strlen( newval.psz_string ) > 0)
- {
- vlc_object_t *p_pl =
- vlc_object_find( p_this, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
- if( !p_pl )
- {
- return VLC_ENOOBJ;
- }
- val.i_int = atoi( newval.psz_string );
- var_Set( p_pl, "marq-y", val );
- vlc_object_release( p_pl );
- }
+ var_Set( p_input, "rate-faster", val );
+ vlc_object_release( p_input );
+ return VLC_SUCCESS;
+ }
+ else if ( !strcmp( psz_cmd, "slower" ) )
+ {
+ 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" ) )
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 );
}
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 );
return VLC_SUCCESS;
}
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 );
}
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;
}
+ else if( !strcmp( psz_cmd, "atrack" )
+ || !strcmp( psz_cmd, "vtrack" )
+ || !strcmp( psz_cmd, "strack" ) )
+ {
+ const char *psz_variable;
+ vlc_value_t val_name;
+ int i_error;
+
+ if( !strcmp( psz_cmd, "atrack" ) )
+ {
+ psz_variable = "audio-es";
+ }
+ else if( !strcmp( psz_cmd, "vtrack" ) )
+ {
+ psz_variable = "video-es";
+ }
+ else
+ {
+ psz_variable = "spu-es";
+ }
+
+ /* Get the descriptive name of the variable */
+ var_Change( p_input, psz_variable, VLC_VAR_GETTEXT,
+ &val_name, NULL );
+ if( !val_name.psz_string ) val_name.psz_string = strdup(psz_variable);
+
+ if( newval.psz_string && *newval.psz_string )
+ {
+ /* set */
+ vlc_value_t val;
+ val.i_int = atoi( newval.psz_string );
+
+ i_error = var_Set( p_input, psz_variable, val );
+ }
+ else
+ {
+ /* get */
+ vlc_value_t val, text;
+ int i, i_value;
+
+ if ( var_Get( p_input, psz_variable, &val ) < 0 )
+ {
+ vlc_object_release( p_input );
+ return VLC_EGENERIC;
+ }
+ i_value = val.i_int;
+
+ if ( var_Change( p_input, psz_variable,
+ VLC_VAR_GETLIST, &val, &text ) < 0 )
+ {
+ vlc_object_release( p_input );
+ return VLC_EGENERIC;
+ }
+
+ msg_rc( "+----[ %s ]", val_name.psz_string );
+ for ( i = 0; i < val.p_list->i_count; i++ )
+ {
+ if ( i_value == val.p_list->p_values[i].i_int )
+ msg_rc( "| %i - %s *", val.p_list->p_values[i].i_int,
+ text.p_list->p_values[i].psz_string );
+ else
+ msg_rc( "| %i - %s", val.p_list->p_values[i].i_int,
+ text.p_list->p_values[i].psz_string );
+ }
+ var_Change( p_input, psz_variable, VLC_VAR_FREELIST,
+ &val, &text );
+ msg_rc( "+----[ end of %s ]", val_name.psz_string );
+
+ free( val_name.psz_string );
+
+ i_error = VLC_SUCCESS;
+ }
+ vlc_object_release( p_input );
+ return i_error;
+ }
/* Never reached. */
+ vlc_object_release( p_input );
return VLC_EGENERIC;
}
+static 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++ )
+ {
+ 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 );
+
+ if( p_item->pp_children[i]->i_children >= 0 )
+ print_playlist( p_intf, p_item->pp_children[i], i_level + 1 );
+ }
+}
+
static int Playlist( 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);
+ vlc_value_t val;
+
intf_thread_t *p_intf = (intf_thread_t*)p_this;
- playlist_t *p_playlist;
+ playlist_t *p_playlist = pl_Yield( p_this );
- p_playlist = vlc_object_find( p_this, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
- if( !p_playlist )
+ PL_LOCK;
+ if( p_playlist->p_input )
{
- return VLC_ENOOBJ;
+ var_Get( p_playlist->p_input, "state", &val );
+ if( ( val.i_int == PAUSE_S ) || ( val.i_int == PLAYLIST_PAUSED ) )
+ {
+ msg_rc( _("Type 'menu select' or 'pause' to continue.") );
+ vlc_object_release( p_playlist );
+ PL_UNLOCK;
+ return VLC_EGENERIC;
+ }
}
+ PL_UNLOCK;
/* Parse commands that require a playlist */
if( !strcmp( psz_cmd, "prev" ) )
}
else if( !strcmp( psz_cmd, "play" ) )
{
+ msg_Warn( p_playlist, "play" );
playlist_Play( p_playlist );
}
+ else if( !strcmp( psz_cmd, "repeat" ) )
+ {
+ bool b_update = true;
+
+ var_Get( p_playlist, "repeat", &val );
+
+ if( strlen( newval.psz_string ) > 0 )
+ {
+ if ( ( !strncmp( newval.psz_string, "on", 2 ) && ( val.b_bool == true ) ) ||
+ ( !strncmp( newval.psz_string, "off", 3 ) && ( val.b_bool == false ) ) )
+ {
+ b_update = false;
+ }
+ }
+
+ if ( b_update )
+ {
+ val.b_bool = !val.b_bool;
+ var_Set( p_playlist, "repeat", val );
+ }
+ msg_rc( "Setting repeat to %d", val.b_bool );
+ }
+ else if( !strcmp( psz_cmd, "loop" ) )
+ {
+ bool b_update = true;
+
+ var_Get( p_playlist, "loop", &val );
+
+ if( strlen( newval.psz_string ) > 0 )
+ {
+ if ( ( !strncmp( newval.psz_string, "on", 2 ) && ( val.b_bool == true ) ) ||
+ ( !strncmp( newval.psz_string, "off", 3 ) && ( val.b_bool == false ) ) )
+ {
+ b_update = false;
+ }
+ }
+
+ if ( b_update )
+ {
+ val.b_bool = !val.b_bool;
+ var_Set( p_playlist, "loop", val );
+ }
+ msg_rc( "Setting loop to %d", val.b_bool );
+ }
+ else if( !strcmp( psz_cmd, "random" ) )
+ {
+ bool b_update = true;
+
+ var_Get( p_playlist, "random", &val );
+
+ if( strlen( newval.psz_string ) > 0 )
+ {
+ if ( ( !strncmp( newval.psz_string, "on", 2 ) && ( val.b_bool == true ) ) ||
+ ( !strncmp( newval.psz_string, "off", 3 ) && ( val.b_bool == false ) ) )
+ {
+ b_update = false;
+ }
+ }
+
+ if ( b_update )
+ {
+ val.b_bool = !val.b_bool;
+ var_Set( p_playlist, "random", val );
+ }
+ msg_rc( "Setting random to %d", val.b_bool );
+ }
+ else if (!strcmp( psz_cmd, "goto" ) )
+ {
+ int i_pos = atoi( newval.psz_string );
+ /* The playlist stores 2 times the same item: onelevel & category */
+ int i_size = p_playlist->items.i_size / 2;
+
+ if( i_pos <= 0 )
+ msg_rc( _("Error: `goto' needs an argument greater than zero.") );
+ else if( i_pos <= i_size )
+ {
+ playlist_item_t *p_item, *p_parent;
+ p_item = p_parent = p_playlist->items.p_elems[i_pos*2-1];
+ while( p_parent->p_parent )
+ p_parent = p_parent->p_parent;
+ playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, pl_Unlocked,
+ p_parent, p_item );
+ }
+ else
+ msg_rc( _("Playlist has only %d elements"), i_size );
+ }
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 );
+ playlist_Clear( p_playlist, pl_Unlocked );
}
- else if( !strcmp( psz_cmd, "playlist" ) )
+ else if( !strcmp( psz_cmd, "add" ) &&
+ newval.psz_string && *newval.psz_string )
{
- int i;
- for ( i = 0; i < p_playlist->i_size; i++ )
+ input_item_t *p_item = parse_MRL( p_intf, newval.psz_string );
+
+ if( p_item )
{
- printf( "|%s%s %s|\n", i == p_playlist->i_index?"*":" ",
- p_playlist->pp_items[i]->input.psz_name,
- p_playlist->pp_items[i]->input.psz_uri );
+ msg_rc( "Trying to add %s to playlist.", newval.psz_string );
+ int i_ret =playlist_AddInput( p_playlist, p_item,
+ PLAYLIST_GO|PLAYLIST_APPEND, PLAYLIST_END, true,
+ pl_Unlocked );
+ vlc_gc_decref( p_item );
+ if( i_ret != VLC_SUCCESS )
+ {
+ return VLC_EGENERIC;
+ }
}
- if ( i == 0 )
+ }
+ else if( !strcmp( psz_cmd, "enqueue" ) &&
+ newval.psz_string && *newval.psz_string )
+ {
+ input_item_t *p_item = parse_MRL( p_intf, newval.psz_string );
+
+ if( p_item )
{
- printf( _("| no entries\n") );
+ msg_rc( "trying to enqueue %s to playlist", newval.psz_string );
+ if( playlist_AddInput( p_playlist, p_item,
+ PLAYLIST_APPEND, PLAYLIST_END, true,
+ pl_Unlocked ) != VLC_SUCCESS )
+ {
+ return VLC_EGENERIC;
+ }
+ }
+ }
+ else if( !strcmp( psz_cmd, "playlist" ) )
+ {
+ msg_rc( "+----[ Playlist ]" );
+ print_playlist( p_intf, p_playlist->p_root_category, 0 );
+ msg_rc( "+----[ End of playlist ]" );
+ }
+
+ else if( !strcmp( psz_cmd, "sort" ))
+ {
+ playlist_RecursiveNodeSort( p_playlist, p_playlist->p_root_onelevel,
+ SORT_ARTIST, ORDER_NORMAL );
+ }
+ else if( !strcmp( psz_cmd, "status" ) )
+ {
+ if( p_playlist->p_input )
+ {
+ /* Replay the current state of the system. */
+ 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;
}
}
+
/*
* sanity check
*/
else
{
- printf( _("unknown command!\n") );
+ msg_rc( "unknown command!" );
}
vlc_object_release( p_playlist );
static int Quit( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
- p_this->p_vlc->b_die = VLC_TRUE;
+ VLC_UNUSED(p_data); VLC_UNUSED(psz_cmd);
+ VLC_UNUSED(oldval); VLC_UNUSED(newval);
+ playlist_t *p_playlist;
+
+ p_playlist = pl_Yield( p_this );
+ playlist_Stop( p_playlist );
+ vlc_object_release( p_playlist );
+
+ 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 )
{
- intf_thread_t *p_newintf;
-
- p_newintf = intf_Create( p_this->p_vlc, newval.psz_string );
+ VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval); VLC_UNUSED(p_data);
+ intf_thread_t *p_newintf = NULL;
+ p_newintf = intf_Create( p_this->p_libvlc, newval.psz_string );
if( p_newintf )
{
- p_newintf->b_block = VLC_FALSE;
if( intf_RunThread( p_newintf ) )
{
vlc_object_detach( p_newintf );
- intf_Destroy( p_newintf );
+ vlc_object_release( p_newintf );
}
}
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;
- int i_error;
+ input_thread_t *p_input = NULL;
+ int i_error = VLC_EGENERIC;
+
+ p_input = vlc_object_find( p_this, VLC_OBJECT_INPUT, FIND_ANYWHERE );
+ if( !p_input )
+ return VLC_ENOOBJ;
+
+ if( p_input )
+ {
+ vlc_value_t val;
+
+ var_Get( p_input, "state", &val );
+ if( ( val.i_int == PAUSE_S ) || ( val.i_int == PLAYLIST_PAUSED ) )
+ {
+ msg_rc( _("Type 'menu select' or 'pause' to continue.") );
+ vlc_object_release( p_input );
+ return VLC_EGENERIC;
+ }
+ vlc_object_release( p_input );
+ }
if ( *newval.psz_string )
{
/* Set. */
audio_volume_t i_volume = atoi( newval.psz_string );
- if ( i_volume > AOUT_VOLUME_MAX )
+ if ( (i_volume > (audio_volume_t)AOUT_VOLUME_MAX) )
{
- 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_libvlc, "key-pressed", keyval );
+ }
+ i_error = aout_VolumeSet( p_this, i_volume );
+ osd_Volume( p_this );
+ msg_rc( STATUS_CHANGE "( audio volume: %d )", i_volume );
+ }
}
else
{
}
else
{
- printf( _("Volume is %d\n"), i_volume );
+ msg_rc( STATUS_CHANGE "( audio volume: %d )", i_volume );
i_error = VLC_SUCCESS;
}
}
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;
int i_nb_steps = atoi(newval.psz_string);
int i_error = VLC_SUCCESS;
+ int i_volume_step = 0;
+
+ p_input = vlc_object_find( p_this, VLC_OBJECT_INPUT, FIND_ANYWHERE );
+ if( !p_input )
+ return VLC_ENOOBJ;
- if ( i_nb_steps <= 0 || i_nb_steps > (AOUT_VOLUME_MAX/AOUT_VOLUME_STEP) )
+ if( p_input )
+ {
+ vlc_value_t val;
+
+ var_Get( p_input, "state", &val );
+ if( ( val.i_int == PAUSE_S ) || ( val.i_int == PLAYLIST_PAUSED ) )
+ {
+ msg_rc( _("Type 'menu select' or 'pause' to continue.") );
+ vlc_object_release( p_input );
+ return VLC_EGENERIC;
+ }
+ vlc_object_release( p_input );
+ }
+
+ i_volume_step = config_GetInt( p_intf->p_libvlc, "volume-step" );
+ if ( i_nb_steps <= 0 || i_nb_steps > (AOUT_VOLUME_MAX/i_volume_step) )
{
i_nb_steps = 1;
}
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;
+}
+
+
+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;
const char * psz_variable;
vlc_value_t val_name;
int i_error;
+ p_input = vlc_object_find( p_this, VLC_OBJECT_INPUT, FIND_ANYWHERE );
+ if( !p_input )
+ return VLC_ENOOBJ;
+
+ if( p_input )
+ {
+ vlc_value_t val;
+
+ var_Get( p_input, "state", &val );
+ if( ( val.i_int == PAUSE_S ) || ( val.i_int == PLAYLIST_PAUSED ) ) {
+ msg_rc( _("Type 'menu select' or 'pause' to continue.") );
+ vlc_object_release( p_input );
+ return VLC_EGENERIC;
+ }
+ vlc_object_release( p_input );
+ }
+
p_aout = vlc_object_find( p_this, VLC_OBJECT_AOUT, FIND_ANYWHERE );
if ( p_aout == NULL ) return VLC_ENOOBJ;
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 );
+ free( val_name.psz_string );
i_error = VLC_SUCCESS;
}
else
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 )
+{
+ 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;
+ int i_error = VLC_SUCCESS;
+ vlc_value_t val;
+
+ if ( !*newval.psz_string )
+ {
+ msg_rc( _("Please provide one of the following parameters:") );
+ msg_rc( "[on|off|up|down|left|right|select]" );
+ return VLC_EGENERIC;
+ }
+
+ p_playlist = pl_Yield( p_this );
+
+ if( p_playlist->p_input )
+ {
+ var_Get( p_playlist->p_input, "state", &val );
+ if( ( ( val.i_int == PAUSE_S ) || ( val.i_int == PLAYLIST_PAUSED ) ) &&
+ ( strcmp( newval.psz_string, "select" ) != 0 ) )
+ {
+ msg_rc( _("Type 'menu select' or 'pause' to continue.") );
+ vlc_object_release( p_playlist );
+ return VLC_EGENERIC;
+ }
+ }
+ vlc_object_release( p_playlist );
+
+ val.psz_string = strdup( newval.psz_string );
+ if( !val.psz_string )
+ return VLC_ENOMEM;
+ if( !strcmp( val.psz_string, "on" ) || !strcmp( val.psz_string, "show" ))
+ osd_MenuShow( p_this );
+ else if( !strcmp( val.psz_string, "off" )
+ || !strcmp( val.psz_string, "hide" ) )
+ osd_MenuHide( p_this );
+ else if( !strcmp( val.psz_string, "up" ) )
+ osd_MenuUp( p_this );
+ else if( !strcmp( val.psz_string, "down" ) )
+ osd_MenuDown( p_this );
+ else if( !strcmp( val.psz_string, "left" ) )
+ osd_MenuPrev( p_this );
+ else if( !strcmp( val.psz_string, "right" ) )
+ osd_MenuNext( p_this );
+ else if( !strcmp( val.psz_string, "select" ) )
+ osd_MenuActivate( p_this );
+ else
+ {
+ msg_rc( _("Please provide one of the following parameters:") );
+ msg_rc( "[on|off|up|down|left|right|select]" );
+ i_error = VLC_EGENERIC;
+ }
+
+ 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;
+ 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;
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 ) )
{
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;
#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 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 )
+ 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, false ) ) > 0 )
{
if( p_buffer[ *pi_size ] == '\r' || p_buffer[ *pi_size ] == '\n' )
break;
}
/* 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( VLC_OBJECT(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 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 input_item_t *parse_MRL( intf_thread_t *p_intf, char *psz_mrl )
+{
+#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;} }
+
+ 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;
+
+ 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 = input_ItemNew( p_intf, psz_item_mrl, NULL );
+ for( i = 0; i < i_options; i++ )
+ {
+ input_ItemAddOption( p_item, ppsz_options[i] );
+ }
+ }
+
+ if( i_options ) free( ppsz_options );
+ free( psz_orig );
+
+ return p_item;
}