#include "vlc_error.h"
#include "network.h"
-#if defined(PF_UNIX) || defined(PF_LOCAL)
+#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
# include <sys/un.h>
-# if !defined(PF_UNIX)
-# define PF_UNIX PF_LOCAL
-# endif
#endif
#define MAX_LINE_LENGTH 256
static vlc_bool_t ReadCommand( intf_thread_t *, char *, int * );
+static playlist_item_t *parse_MRL( intf_thread_t *, char * );
+
static int Input ( vlc_object_t *, char const *,
vlc_value_t, vlc_value_t, void * );
static int Playlist ( vlc_object_t *, char const *,
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 *,
{
int i_socket_listen;
int i_socket;
-
+ char *psz_unix_path;
+ vlc_bool_t b_extend;
+
#ifdef WIN32
HANDLE hConsoleIn;
+ vlc_bool_t b_quiet;
#endif
};
#ifdef HAVE_VARIADIC_MACROS
-# define printf( psz_format, args... ) \
- Printf( p_intf, psz_format, ## args )
+# define msg_rc( psz_format, args... ) \
+ __msg_rc( p_intf, psz_format, ## args )
#endif
-void Printf( intf_thread_t *p_intf, const char *psz_fmt, ... )
+void __msg_rc( intf_thread_t *p_intf, const char *psz_fmt, ... )
{
va_list args;
va_start( args, psz_fmt );
if( p_intf->p_sys->i_socket == -1 ) vprintf( psz_fmt, args );
- else net_vaPrintf( p_intf, p_intf->p_sys->i_socket, psz_fmt, args );
+ else
+ { net_vaPrintf( p_intf, p_intf->p_sys->i_socket, NULL, psz_fmt, args );
+ net_Printf( VLC_OBJECT(p_intf), p_intf->p_sys->i_socket, NULL, "\r" ); }
va_end( args );
}
* Module descriptor
*****************************************************************************/
#define POS_TEXT N_("Show stream position")
-#define POS_LONGTEXT N_("Show the current position in seconds within the stream from time to time.")
+#define POS_LONGTEXT N_("Show the current position in seconds within the " \
+ "stream from time to time." )
#define TTY_TEXT N_("Fake TTY")
#define TTY_LONGTEXT N_("Force the rc module to use stdin as if it was a TTY.")
-#define HOST_TEXT N_("Command input")
+#define UNIX_TEXT N_("UNIX socket command input")
+#define UNIX_LONGTEXT N_("Accept commands over a Unix socket rather than " \
+ "stdin." )
+
+#define HOST_TEXT N_("TCP command input")
#define HOST_LONGTEXT N_("Accept commands over a socket rather than stdin. " \
- "You can set the address and port the interface will bind to." )
+ "You can set the address and port the interface will bind to." )
+#define EXTEND_TEXT N_("Extended help")
+#define EXTEND_LONGTEXT N_("List additional commands.")
+
+
+#ifdef WIN32
+#define QUIET_TEXT N_("Do not open a DOS command box interface")
+#define QUIET_LONGTEXT N_( \
+ "By default the rc interface plugin will start a DOS command box. " \
+ "Enabling the quiet mode will not bring this command box but can also " \
+ "be pretty annoying when you want to stop VLC and no video window is " \
+ "open." )
+#endif
vlc_module_begin();
+ set_category( CAT_INTERFACE );
+ set_subcategory( SUBCAT_INTERFACE_CONTROL );
set_description( _("Remote control interface") );
add_bool( "rc-show-pos", 0, NULL, POS_TEXT, POS_LONGTEXT, VLC_TRUE );
#ifdef HAVE_ISATTY
add_bool( "rc-fake-tty", 0, NULL, TTY_TEXT, TTY_LONGTEXT, VLC_TRUE );
#endif
+ add_string( "rc-unix", 0, NULL, UNIX_TEXT, UNIX_LONGTEXT, VLC_TRUE );
add_string( "rc-host", 0, NULL, HOST_TEXT, HOST_LONGTEXT, VLC_TRUE );
+
+#ifdef WIN32
+ add_bool( "rc-quiet", 0, NULL, QUIET_TEXT, QUIET_LONGTEXT, VLC_FALSE );
+#endif
+ add_bool( "rc-extend", 0, NULL, EXTEND_TEXT, EXTEND_LONGTEXT, VLC_FALSE );
+
set_capability( "interface", 20 );
set_callbacks( Activate, Deactivate );
vlc_module_end();
static int Activate( vlc_object_t *p_this )
{
intf_thread_t *p_intf = (intf_thread_t*)p_this;
- char *psz_host;
+ char *psz_host, *psz_unix_path;
int i_socket = -1;
#if defined(HAVE_ISATTY) && !defined(WIN32)
}
#endif
- psz_host = config_GetPsz( p_intf, "rc-host" );
- if( psz_host && (psz_host[0] == '/' || psz_host[0] == '.' ) )
+ psz_unix_path = config_GetPsz( p_intf, "rc-unix" );
+ if( psz_unix_path )
{
-#if !defined(PF_UNIX) && !defined(PF_LOCAL)
+#ifndef PF_LOCAL
msg_Warn( p_intf, "your OS doesn't support filesystem sockets" );
- free( psz_host );
+ free( psz_unix_path );
return VLC_EGENERIC;
-
#else
struct sockaddr_un addr;
int i_ret;
msg_Dbg( p_intf, "trying UNIX socket" );
- if( (i_socket = socket( PF_UNIX, SOCK_STREAM, 0 ) ) < 0 )
+ if( (i_socket = socket( PF_LOCAL, SOCK_STREAM, 0 ) ) < 0 )
{
msg_Warn( p_intf, "can't open socket: %s", strerror(errno) );
- free( psz_host );
+ free( psz_unix_path );
return VLC_EGENERIC;
}
- addr.sun_family = AF_UNIX;
- strcpy( addr.sun_path, psz_host );
+ addr.sun_family = AF_LOCAL;
+ 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 )
{
msg_Warn( p_intf, "couldn't bind socket to address: %s",
strerror(errno) );
- free( psz_host );
- close( i_socket );
+ free( psz_unix_path );
+ net_Close( i_socket );
return VLC_EGENERIC;
}
if( ( i_ret = listen( i_socket, 1 ) ) < 0 )
{
msg_Warn( p_intf, "can't listen on socket: %s", strerror(errno));
- free( psz_host );
- close( i_socket );
+ free( psz_unix_path );
+ net_Close( i_socket );
return VLC_EGENERIC;
}
#endif
}
- else if( psz_host && *psz_host )
+
+ if( ( i_socket == -1) &&
+ ( psz_host = config_GetPsz( p_intf, "rc-host" ) ) != NULL )
{
- char *psz_addr;
vlc_url_t url;
- memset( &url, 0, sizeof(vlc_url_t) );
-
- /* If it doesn't include a :, it's a port number rather than an URL */
- if( strchr( psz_host, ':' ) ) vlc_UrlParse( &url, psz_host, 0 );
- else url.i_port = atoi( psz_host );
- /* By default, we listen on localhost only for security reasons.
- * If you need to listen on all IP addresses, specify 0.0.0.0
- */
- psz_addr = url.psz_host ? url.psz_host : "127.0.0.1";
- msg_Dbg( p_intf, "base %s:%d", psz_addr, url.i_port );
+ vlc_UrlParse( &url, psz_host, 0 );
+
+ msg_Dbg( p_intf, "base %s port %d", url.psz_host, url.i_port );
- if( (i_socket = net_ListenTCP( p_this, psz_addr, url.i_port )) == -1 )
+ if( (i_socket = net_ListenTCP(p_this, url.psz_host, url.i_port)) == -1)
{
- msg_Warn( p_intf, "can't listen to %s:%i", psz_addr, url.i_port );
+ msg_Warn( p_intf, "can't listen to %s port %i",
+ url.psz_host, url.i_port );
vlc_UrlClean( &url );
free( psz_host );
return VLC_EGENERIC;
}
vlc_UrlClean( &url );
+ free( psz_host );
}
- if( psz_host ) free( psz_host );
p_intf->p_sys = malloc( sizeof( intf_sys_t ) );
if( !p_intf->p_sys )
p_intf->p_sys->i_socket_listen = i_socket;
p_intf->p_sys->i_socket = -1;
+ p_intf->p_sys->psz_unix_path = psz_unix_path;
/* Non-buffered stdout */
setvbuf( stdout, (char *)NULL, _IOLBF, 0 );
p_intf->pf_run = Run;
+#ifdef WIN32
+ 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, `h' for help\n") );
return VLC_SUCCESS;
}
net_Close( p_intf->p_sys->i_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
+ unlink( p_intf->p_sys->psz_unix_path );
+#endif
+ free( p_intf->p_sys->psz_unix_path );
+ }
free( p_intf->p_sys );
}
p_buffer[0] = 0;
p_input = NULL;
p_playlist = NULL;
-
+
+ p_intf->p_sys->b_extend = config_GetInt( p_intf, "rc-extend" );
/* Register commands that will be cleaned up upon object destruction */
var_Create( p_intf, "quit", VLC_VAR_VOID | VLC_VAR_ISCOMMAND );
var_AddCallback( p_intf, "quit", Quit, NULL );
var_AddCallback( p_intf, "prev", Playlist, NULL );
var_Create( p_intf, "next", VLC_VAR_VOID | VLC_VAR_ISCOMMAND );
var_AddCallback( p_intf, "next", Playlist, NULL );
+
+ var_Create( p_intf, "marq-marquee", VLC_VAR_VOID | VLC_VAR_ISCOMMAND );
+ var_AddCallback( p_intf, "marq-marquee", Other, NULL );
+ var_Create( p_intf, "marq-x", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND );
+ var_AddCallback( p_intf, "marq-x", Other, NULL );
+ var_Create( p_intf, "marq-y", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND );
+ var_AddCallback( p_intf, "marq-y", Other, NULL );
+ var_Create( p_intf, "marq-timeout", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND );
+ var_AddCallback( p_intf, "marq-timeout", Other, NULL );
var_Create( p_intf, "pause", VLC_VAR_VOID | VLC_VAR_ISCOMMAND );
var_AddCallback( p_intf, "pause", Input, NULL );
if( i_oldpos != i_newpos )
{
i_oldpos = i_newpos;
- printf( "pos: %d%%\n", i_newpos );
+ msg_rc( "pos: %d%%\n", i_newpos );
}
}
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)\n",
psz_cmd, i_ret, vlc_error( i_ret ) );
}
/* Or maybe it's a global command */
/* FIXME: it's a global command, but we should pass the
* local object as an argument, not p_intf->p_libvlc. */
i_ret = var_Set( p_intf->p_libvlc, psz_cmd, val );
- printf( _("%s: returned %i (%s)\n"),
- psz_cmd, i_ret, vlc_error( i_ret ) );
+ if( i_ret != 0 )
+ {
+ msg_rc( "%s: returned %i (%s)\n",
+ 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" ) )
{
info_category_t *p_category =
p_input->input.p_item->pp_categories[i];
- printf( "+----[ %s ]\n", p_category->psz_name );
- printf( "| \n" );
+ msg_rc( "+----[ %s ]\n", p_category->psz_name );
+ msg_rc( "| \n" );
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\n", p_info->psz_name,
p_info->psz_value );
}
- printf( "| \n" );
+ msg_rc( "| \n" );
}
- printf( _("+----[ end of stream info ]\n") );
+ msg_rc( "+----[ end of stream info ]\n" );
vlc_mutex_unlock( &p_input->input.p_item->lock );
}
else
{
- printf( _("no input\n") );
+ msg_rc( "no input\n" );
+ }
+ }
+ else if( !strcmp( psz_cmd, "is_playing" ) )
+ {
+ if( ! p_input )
+ {
+ msg_rc( "0\n" );
+ }
+ else
+ {
+ msg_rc( "1\n" );
+ }
+ }
+ else if( !strcmp( psz_cmd, "get_time" ) )
+ {
+ if( ! p_input )
+ {
+ msg_rc("0\n");
+ }
+ else
+ {
+ vlc_value_t time;
+ var_Get( p_input, "time", &time );
+ msg_rc( "%i\n", time.i_time / 1000000);
+ }
+ }
+ else if( !strcmp( psz_cmd, "get_length" ) )
+ {
+ if( ! p_input )
+ {
+ msg_rc("0\n");
+ }
+ else
+ {
+ vlc_value_t time;
+ var_Get( p_input, "length", &time );
+ msg_rc( "%i\n", time.i_time / 1000000);
+ }
+ }
+ else if( !strcmp( psz_cmd, "get_title" ) )
+ {
+ if( ! p_input )
+ {
+ msg_rc("\n");
+ }
+ else
+ {
+ msg_rc( "%s\n", p_input->input.p_item->psz_name );
}
}
else switch( psz_cmd[0] )
case '?':
case 'h':
case 'H':
- printf(_("+----[ Remote control commands ]\n"));
- printf("| \n");
- printf(_("| add XYZ . . . . . . . . . . add XYZ to playlist\n"));
- printf(_("| playlist . . . show items currently in playlist\n"));
- printf(_("| play . . . . . . . . . . . . . . . . play stream\n"));
- printf(_("| stop . . . . . . . . . . . . . . . . stop stream\n"));
- printf(_("| next . . . . . . . . . . . . next playlist item\n"));
- printf(_("| prev . . . . . . . . . . previous playlist item\n"));
- printf(_("| title [X] . . . . set/get title in current item\n"));
- printf(_("| title_n . . . . . . next title in current item\n"));
- printf(_("| title_p . . . . previous title in current item\n"));
- printf(_("| chapter [X] . . set/get chapter in current item\n"));
- printf(_("| chapter_n . . . . next chapter in current item\n"));
- printf(_("| chapter_p . . previous chapter in current item\n"));
- printf("| \n");
- printf(_("| seek X . seek in seconds, for instance `seek 12'\n"));
- printf(_("| pause . . . . . . . . . . . . . . toggle pause\n"));
- printf(_("| f . . . . . . . . . . . . . . toggle fullscreen\n"));
- printf(_("| info . . . information about the current stream\n"));
- printf("| \n");
- printf(_("| volume [X] . . . . . . . . set/get audio volume\n"));
- printf(_("| volup [X] . . . . . raise audio volume X steps\n"));
- printf(_("| voldown [X] . . . . lower audio volume X steps\n"));
- printf(_("| adev [X] . . . . . . . . . set/get audio device\n"));
- printf(_("| achan [X]. . . . . . . . set/get audio channels\n"));
- printf("| \n");
- printf(_("| help . . . . . . . . . . . . . this help message\n"));
- printf(_("| quit . . . . . . . . . . . . . . . . . quit vlc\n"));
- printf("| \n");
- printf(_("+----[ end of help ]\n"));
+ msg_rc(_("+----[ Remote control commands ]\n"));
+ msg_rc("| \n");
+ msg_rc(_("| add XYZ . . . . . . . . . . add XYZ to playlist\n"));
+ msg_rc(_("| playlist . . . show items currently in playlist\n"));
+ msg_rc(_("| play . . . . . . . . . . . . . . . . play stream\n"));
+ msg_rc(_("| stop . . . . . . . . . . . . . . . . stop stream\n"));
+ msg_rc(_("| next . . . . . . . . . . . . next playlist item\n"));
+ msg_rc(_("| prev . . . . . . . . . . previous playlist item\n"));
+ msg_rc(_("| title [X] . . . . set/get title in current item\n"));
+ msg_rc(_("| title_n . . . . . . next title in current item\n"));
+ msg_rc(_("| title_p . . . . previous title in current item\n"));
+ msg_rc(_("| chapter [X] . . set/get chapter in current item\n"));
+ msg_rc(_("| chapter_n . . . . next chapter in current item\n"));
+ msg_rc(_("| chapter_p . . previous chapter in current item\n"));
+ msg_rc("| \n");
+ msg_rc(_("| seek X . seek in seconds, for instance `seek 12'\n"));
+ msg_rc(_("| pause . . . . . . . . . . . . . . toggle pause\n"));
+ msg_rc(_("| f . . . . . . . . . . . . . . toggle fullscreen\n"));
+ msg_rc(_("| info . . . information about the current stream\n"));
+ msg_rc("| \n");
+ msg_rc(_("| volume [X] . . . . . . . . set/get audio volume\n"));
+ msg_rc(_("| volup [X] . . . . . raise audio volume X steps\n"));
+ msg_rc(_("| voldown [X] . . . . lower audio volume X steps\n"));
+ msg_rc(_("| adev [X] . . . . . . . . . set/get audio device\n"));
+ msg_rc(_("| achan [X]. . . . . . . . set/get audio channels\n"));
+ msg_rc("| \n");
+ if (p_intf->p_sys->b_extend)
+ {
+ msg_rc(_("| marq-marquee STRING . . overlay STRING in video\n"));
+ msg_rc(_("| marq-x X . . . . . .offset of marquee, from left\n"));
+ msg_rc(_("| marq-y Y . . . . . . offset of marquee, from top\n"));
+ msg_rc(_("| marq-timeout T. . . . .timeout of marquee, in ms\n"));
+ msg_rc("| \n");
+ }
+ msg_rc(_("| help . . . . . . . . . . . . . this help message\n"));
+ msg_rc(_("| logout . . . . . .exit (if in socket connection)\n"));
+ msg_rc(_("| quit . . . . . . . . . . . . . . . . . quit vlc\n"));
+ msg_rc("| \n");
+ msg_rc(_("+----[ end of help ]\n"));
break;
case '\0':
break;
default:
- printf(_("unknown command `%s', type `help' for help\n"), psz_cmd);
+ msg_rc(_("unknown command `%s', type `help' for help\n"), psz_cmd);
break;
}
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\n",
val.i_int, val_list.p_list->i_count );
var_Change( p_this, "chapter", VLC_VAR_FREELIST,
&val_list, NULL );
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\n",
val.i_int, val_list.p_list->i_count );
var_Change( p_this, "title", VLC_VAR_FREELIST,
&val_list, NULL );
{
playlist_Stop( p_playlist );
}
- else if( !strcmp( psz_cmd, "add" ) )
+ else if( !strcmp( psz_cmd, "add" ) &&
+ newval.psz_string && *newval.psz_string )
{
- 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_item_t *p_item = parse_MRL( p_intf, newval.psz_string );
+
+ if( p_item )
+ {
+ msg_rc( "trying to add %s to playlist\n", newval.psz_string );
+ playlist_AddItem( p_playlist, p_item,
+ PLAYLIST_GO|PLAYLIST_APPEND, PLAYLIST_END );
+ }
}
else if( !strcmp( psz_cmd, "playlist" ) )
{
int i;
for ( i = 0; i < p_playlist->i_size; i++ )
{
- printf( "|%s%s %s|\n", i == p_playlist->i_index?"*":" ",
+ msg_rc( "|%s%s %s|\n", i == p_playlist->i_index?"*":" ",
p_playlist->pp_items[i]->input.psz_name,
p_playlist->pp_items[i]->input.psz_uri );
}
if ( i == 0 )
{
- printf( _("| no entries\n") );
+ msg_rc( "| no entries\n" );
}
}
+
/*
* sanity check
*/
else
{
- printf( _("unknown command!\n") );
+ msg_rc( "unknown command!\n" );
}
vlc_object_release( p_playlist );
return VLC_SUCCESS;
}
+static int Other( vlc_object_t *p_this, char const *psz_cmd,
+ vlc_value_t oldval, vlc_value_t newval, void *p_data )
+{
+ intf_thread_t *p_intf = (intf_thread_t*)p_this;
+ vlc_object_t *p_pl;
+ vlc_value_t val;
+ vlc_object_t *p_inp;
+
+ p_pl = vlc_object_find( p_this, VLC_OBJECT_PLAYLIST,
+ FIND_ANYWHERE );
+ if( !p_pl )
+ {
+ return VLC_ENOOBJ;
+ }
+
+ p_inp = vlc_object_find( p_this, VLC_OBJECT_INPUT,
+ FIND_ANYWHERE );
+ if( !p_inp )
+ {
+ return VLC_ENOOBJ;
+ }
+
+ /* Parse miscellaneous commands */
+ if( !strcmp( psz_cmd, "marq-marquee" ) )
+ {
+ if( strlen( newval.psz_string ) > 0 )
+ {
+ val.psz_string = newval.psz_string;
+ var_Set( p_inp->p_libvlc, "marq-marquee", val );
+ }
+ else
+ {
+ val.psz_string = "";
+ var_Set( p_inp->p_libvlc, "marq-marquee", val);
+ }
+ }
+ else if( !strcmp( psz_cmd, "marq-x" ) )
+ {
+ if( strlen( newval.psz_string ) > 0)
+ {
+ val.i_int = atoi( newval.psz_string );
+ var_Set( p_inp->p_libvlc, "marq-x", val );
+ }
+ }
+ else if( !strcmp( psz_cmd, "marq-y" ) )
+ {
+ if( strlen( newval.psz_string ) > 0)
+ {
+ val.i_int = atoi( newval.psz_string );
+ var_Set( p_inp->p_libvlc, "marq-y", val );
+ }
+ }
+ else if( !strcmp( psz_cmd, "marq-timeout" ) )
+ {
+ if( strlen( newval.psz_string ) > 0)
+ {
+ val.i_int = atoi( newval.psz_string );
+ var_Set( p_inp, "marq-timeout", val );
+ }
+ }
+
+ /*
+ * sanity check
+ */
+ else
+ {
+ msg_rc( "unknown command!\n" );
+ }
+
+ vlc_object_release( p_pl );
+ vlc_object_release( p_inp );
+ 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 )
{
audio_volume_t i_volume = atoi( newval.psz_string );
if ( i_volume > 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\n", AOUT_VOLUME_MIN,
AOUT_VOLUME_MAX );
i_error = VLC_EBADVAR;
}
}
else
{
- printf( _("Volume is %d\n"), i_volume );
+ msg_rc( "Volume is %d\n", i_volume );
i_error = VLC_SUCCESS;
}
}
i_error = VLC_EGENERIC;
}
- if ( !i_error ) printf( _("Volume is %d\n"), i_volume );
+ if ( !i_error ) msg_rc( "Volume is %d\n", i_volume );
return i_error;
}
return VLC_EGENERIC;
}
- printf( "+----[ %s ]\n", val_name.psz_string );
+ msg_rc( "+----[ %s ]\n", 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 *\n", 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\n", 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 ]\n", val_name.psz_string );
if( val_name.psz_string ) free( val_name.psz_string );
i_error = VLC_SUCCESS;
int i_read = 0;
#ifdef WIN32
- if( p_intf->p_sys->i_socket == -1 )
+ if( p_intf->p_sys->i_socket == -1 && !p_intf->p_sys->b_quiet )
return ReadWin32( p_intf, p_buffer, pi_size );
+ else if( p_intf->p_sys->i_socket == -1 )
+ {
+ msleep( INTF_IDLE_SLEEP );
+ return VLC_FALSE;
+ }
#endif
while( !p_intf->b_die && *pi_size < MAX_LINE_LENGTH &&
(i_read = net_ReadNonBlock( p_intf, p_intf->p_sys->i_socket == -1 ?
- STDIN_FILENO : p_intf->p_sys->i_socket,
+ 0 /*STDIN_FILENO*/ : p_intf->p_sys->i_socket, NULL,
p_buffer + *pi_size, 1, INTF_IDLE_SLEEP ) ) > 0 )
{
if( p_buffer[ *pi_size ] == '\r' || p_buffer[ *pi_size ] == '\n' )
return VLC_FALSE;
}
+
+/*****************************************************************************
+ * parse_MRL: build a playlist item from a full mrl
+ *****************************************************************************
+ * MRL format: "simplified-mrl [:option-name[=option-value]]"
+ * We don't check for '"' or '\'', we just assume that a ':' that follows a
+ * space is a new option. Should be good enough for our purpose.
+ *****************************************************************************/
+static playlist_item_t *parse_MRL( intf_thread_t *p_intf, char *psz_mrl )
+{
+#define SKIPSPACE( p ) { while( *p && ( *p == ' ' || *p == '\t' ) ) p++; }
+#define SKIPTRAILINGSPACE( p, d ) \
+ { char *e=d; while( e > p && (*(e-1)==' ' || *(e-1)=='\t') ){e--;*e=0;} }
+
+ playlist_item_t *p_item = NULL;
+ char *psz_item = NULL, *psz_item_mrl = NULL, *psz_orig;
+ char **ppsz_options = NULL;
+ int i, i_options = 0;
+
+ if( !psz_mrl ) return 0;
+
+ psz_mrl = psz_orig = strdup( psz_mrl );
+ while( *psz_mrl )
+ {
+ SKIPSPACE( psz_mrl );
+ psz_item = psz_mrl;
+
+ for( ; *psz_mrl; psz_mrl++ )
+ {
+ if( (*psz_mrl == ' ' || *psz_mrl == '\t') && psz_mrl[1] == ':' )
+ {
+ /* We have a complete item */
+ break;
+ }
+ if( (*psz_mrl == ' ' || *psz_mrl == '\t') &&
+ (psz_mrl[1] == '"' || psz_mrl[1] == '\'') && psz_mrl[2] == ':')
+ {
+ /* We have a complete item */
+ break;
+ }
+ }
+
+ if( *psz_mrl ) { *psz_mrl = 0; psz_mrl++; }
+ SKIPTRAILINGSPACE( psz_item, psz_item + strlen( psz_item ) );
+
+ /* Remove '"' and '\'' if necessary */
+ if( *psz_item == '"' && psz_item[strlen(psz_item)-1] == '"' )
+ { psz_item++; psz_item[strlen(psz_item)-1] = 0; }
+ if( *psz_item == '\'' && psz_item[strlen(psz_item)-1] == '\'' )
+ { psz_item++; psz_item[strlen(psz_item)-1] = 0; }
+
+ if( !psz_item_mrl ) psz_item_mrl = psz_item;
+ else if( *psz_item )
+ {
+ i_options++;
+ ppsz_options = realloc( ppsz_options, i_options * sizeof(char *) );
+ ppsz_options[i_options - 1] = &psz_item[1];
+ }
+
+ if( *psz_mrl ) SKIPSPACE( psz_mrl );
+ }
+
+ /* Now create a playlist item */
+ if( psz_item_mrl )
+ {
+ p_item = playlist_ItemNew( p_intf, psz_item_mrl, psz_item_mrl );
+ for( i = 0; i < i_options; i++ )
+ {
+ playlist_ItemAddOption( p_item, ppsz_options[i] );
+ }
+ }
+
+ if( i_options ) free( ppsz_options );
+ free( psz_orig );
+
+ return p_item;
+}
projects / vlc / blobdiff