#include <ctype.h>
#include <signal.h>
-#include <vlc/intf.h>
-#include <vlc/aout.h>
-#include <vlc/vout.h>
-#include <vlc_video.h>
+#include <vlc_interface.h>
+#include <vlc_aout.h>
+#include <vlc_vout.h>
#include <vlc_osd.h>
+#include <vlc_playlist.h>
#include <vlc_update.h>
#ifdef HAVE_UNISTD_H
#endif
#include <sys/types.h>
-#include "vlc_error.h"
-#include "network.h"
+#include <vlc_network.h>
#include "vlc_url.h"
-#include "charset.h"
+#include <vlc_charset.h>
#if defined(AF_UNIX) && !defined(AF_LOCAL)
# define AF_LOCAL AF_UNIX
__msg_rc( p_intf, psz_format, ## args )
#endif
-void __msg_rc( intf_thread_t *p_intf, const char *psz_fmt, ... )
+static void __msg_rc( intf_thread_t *p_intf, const char *psz_fmt, ... )
{
va_list args;
va_start( args, psz_fmt );
psz_unix_path = config_GetPsz( p_intf, "rc-unix" );
if( psz_unix_path )
{
- int i_socket;
+ int i_socket, i_overwrite;
+
+ i_overwrite = config_GetInt( p_intf, "rc-overwrite" );
#if !defined(AF_LOCAL) || defined(WIN32)
msg_Warn( p_intf, "your OS doesn't support filesystem sockets" );
return VLC_EGENERIC;
#else
struct sockaddr_un addr;
- int i_ret;
memset( &addr, 0, sizeof(struct sockaddr_un) );
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: %s",
+ psz_unix_path, strerror (errno));
+ 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));
free( psz_unix_path );
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, "enqueue", VLC_VAR_STRING | VLC_VAR_ISCOMMAND );
- var_AddCallback( p_intf, "enqueue", Playlist, NULL );
- var_Create( p_intf, "playlist", VLC_VAR_VOID | VLC_VAR_ISCOMMAND );
- var_AddCallback( p_intf, "playlist", Playlist, NULL );
- var_Create( p_intf, "sort", VLC_VAR_VOID | VLC_VAR_ISCOMMAND );
- var_AddCallback( p_intf, "sort", 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 );
+#define ADD( name, type, target ) \
+ var_Create( p_intf, name, VLC_VAR_ ## type | VLC_VAR_ISCOMMAND ); \
+ var_AddCallback( p_intf, name, target, NULL );
+ ADD( "quit", VOID, Quit )
+ ADD( "intf", STRING, Intf )
+
+ ADD( "add", STRING, Playlist )
+ ADD( "repeat", STRING, Playlist )
+ ADD( "loop", STRING, Playlist )
+ ADD( "enqueue", STRING, Playlist )
+ ADD( "playlist", VOID, Playlist )
+ ADD( "sort", VOID, Playlist )
+ ADD( "play", VOID, Playlist )
+ ADD( "stop", VOID, Playlist )
+ ADD( "clear", VOID, Playlist )
+ ADD( "prev", VOID, Playlist )
+ ADD( "next", VOID, Playlist )
+ ADD( "goto", INTEGER, Playlist )
+ ADD( "status", INTEGER, Playlist )
/* marquee on the fly items */
- 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-order", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND );
- var_AddCallback( p_intf, "mosaic-order", 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 );
+ ADD( "marq-marquee", STRING, Other )
+ ADD( "marq-x", INTEGER, Other )
+ ADD( "marq-y", INTEGER, Other )
+ ADD( "marq-position", INTEGER, Other )
+ ADD( "marq-color", INTEGER, Other )
+ ADD( "marq-opacity", INTEGER, Other )
+ ADD( "marq-timeout", INTEGER, Other )
+ ADD( "marq-size", INTEGER, Other )
+
+ ADD( "mosaic-alpha", INTEGER, Other )
+ ADD( "mosaic-height", INTEGER, Other )
+ ADD( "mosaic-width", INTEGER, Other )
+ ADD( "mosaic-xoffset", INTEGER, Other )
+ ADD( "mosaic-yoffset", INTEGER, Other )
+ ADD( "mosaic-offsets", STRING, Other )
+ ADD( "mosaic-align", INTEGER, Other )
+ ADD( "mosaic-vborder", INTEGER, Other )
+ ADD( "mosaic-hborder", INTEGER, Other )
+ ADD( "mosaic-position", INTEGER, Other )
+ ADD( "mosaic-rows", INTEGER, Other )
+ ADD( "mosaic-cols", INTEGER, Other )
+ ADD( "mosaic-order", STRING, Other )
+ ADD( "mosaic-keep-aspect-ratio", INTEGER, Other )
/* logo on the fly items */
- 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 );
+ ADD( "logo-file", STRING, Other )
+ ADD( "logo-x", INTEGER, Other )
+ ADD( "logo-y", INTEGER, Other )
+ ADD( "logo-position", INTEGER, Other )
+ ADD( "logo-transparency", INTEGER, Other )
/* OSD menu commands */
- 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 );
-
- var_Create( p_intf, "atrack", VLC_VAR_STRING | VLC_VAR_ISCOMMAND );
- var_AddCallback( p_intf, "atrack", Input, NULL );
- var_Create( p_intf, "vtrack", VLC_VAR_STRING | VLC_VAR_ISCOMMAND );
- var_AddCallback( p_intf, "vtrack", Input, NULL );
- var_Create( p_intf, "strack", VLC_VAR_STRING | VLC_VAR_ISCOMMAND );
- var_AddCallback( p_intf, "strack", 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 */
- var_Create( p_intf, "vratio", VLC_VAR_STRING | VLC_VAR_ISCOMMAND );
- var_AddCallback( p_intf, "vratio", VideoConfig, NULL );
- var_Create( p_intf, "vcrop", VLC_VAR_STRING | VLC_VAR_ISCOMMAND );
- var_AddCallback( p_intf, "vcrop", VideoConfig, NULL );
- var_Create( p_intf, "vzoom", VLC_VAR_STRING | VLC_VAR_ISCOMMAND );
- var_AddCallback( p_intf, "vzoom", VideoConfig, NULL );
+ ADD( "vratio", STRING, VideoConfig )
+ ADD( "vcrop", STRING, VideoConfig )
+ ADD( "vzoom", STRING, 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 )
+
+#undef ADD
}
/*****************************************************************************
}
#endif
- while( !p_intf->b_die )
+ while( !intf_ShouldDie( p_intf ) )
{
char *psz_cmd, *psz_arg;
vlc_bool_t b_complete;
{
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" ));
+ msg_rc( STATUS_CHANGE "( new input: %s )",
+ input_GetItem(p_input)->psz_uri );
+ msg_rc( STATUS_CHANGE "( audio volume: %d )",
+ config_GetInt( p_intf, "volume" ));
}
var_AddCallback( p_input, "state", StateChanged, p_intf );
var_AddCallback( p_input, "rate-faster", RateChanged, p_intf );
var_AddCallback( p_input, "rate-slower", RateChanged, p_intf );
var_AddCallback( p_input, "rate", RateChanged, p_intf );
- var_AddCallback( p_input, "time-offset", TimeOffsetChanged, p_intf );
+ var_AddCallback( p_input, "time-offset", TimeOffsetChanged,
+ p_intf );
}
}
else if( p_input->b_dead )
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;
p_intf->p_sys->i_last_state = PLAYLIST_STOPPED;
msg_rc( STATUS_CHANGE "( stop state: 0 )" );
}
- else if( (p_intf->p_sys->i_last_state != p_playlist->status.i_status) &&
+ else if(
+ (p_intf->p_sys->i_last_state != p_playlist->status.i_status) &&
(p_playlist->status.i_status == PLAYLIST_RUNNING) )
{
p_intf->p_sys->i_last_state = p_playlist->status.i_status;
msg_rc( STATUS_CHANGE "( play state: 1 )" );
}
- else if( (p_intf->p_sys->i_last_state != p_playlist->status.i_status) &&
+ 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;
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( "| " );
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
{
}
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 )
vlc_bool_t b_update = VLC_FALSE;
var_Get( p_vout, "fullscreen", &val );
val.b_bool = !val.b_bool;
- if( !strncmp(psz_arg, "on", 2) && (val.b_bool == VLC_TRUE) )
+ if( !strncmp( psz_arg, "on", 2 )
+ && ( val.b_bool == VLC_TRUE ) )
{
b_update = VLC_TRUE;
val.b_bool = VLC_TRUE;
}
- else if( !strncmp(psz_arg, "off", 3) && (val.b_bool == VLC_FALSE) )
+ else if( !strncmp( psz_arg, "off", 3 )
+ && ( val.b_bool == VLC_FALSE ) )
{
b_update = VLC_TRUE;
val.b_bool = VLC_FALSE;
}
- else if( strncmp(psz_arg, "off", 3) && strncmp(psz_arg, "on", 2) )
+ else if( strncmp( psz_arg, "off", 3 )
+ && strncmp( psz_arg, "on", 2 ) )
b_update = VLC_TRUE;
if( b_update ) var_Set( p_vout, "fullscreen", val );
vlc_object_release( p_vout );
msg_rc(_("| next . . . . . . . . . . . . next playlist item"));
msg_rc(_("| prev . . . . . . . . . . previous playlist item"));
msg_rc(_("| goto . . . . . . . . . . . . goto item at index"));
+ msg_rc(_("| repeat [on|off] . . toggle playlist item repeat"));
+ msg_rc(_("| loop [on|off] . . . . toggle playlist item loop"));
msg_rc(_("| clear . . . . . . . . . . . clear the playlist"));
msg_rc(_("| status . . . . . . . . . current playlist status"));
msg_rc(_("| title [X] . . . . set/get title in current item"));
msg_rc(_("| marq-timeout T. . . . . . . . . . timeout, in ms"));
msg_rc(_("| marq-size # . . . . . . . . font size, in pixels"));
msg_rc( "| ");
- msg_rc(_("| time-format STRING . . . overlay STRING in video"));
- msg_rc(_("| time-x X . . . . . . . . . . . .offset from left"));
- msg_rc(_("| time-y Y . . . . . . . . . . . . offset from top"));
- msg_rc(_("| time-position #. . . . . . . . relative position"));
- msg_rc(_("| time-color # . . . . . . . . . . font color, RGB"));
- msg_rc(_("| time-opacity # . . . . . . . . . . . . . opacity"));
- msg_rc(_("| time-size # . . . . . . . . font size, in pixels"));
- msg_rc( "| ");
msg_rc(_("| logo-file STRING . . .the overlay file path/name"));
msg_rc(_("| logo-x X . . . . . . . . . . . .offset from left"));
msg_rc(_("| logo-y Y . . . . . . . . . . . . offset from top"));
msg_rc(_("| mosaic-width # . . . . . . . . . . . . . . width"));
msg_rc(_("| mosaic-xoffset # . . . .top left corner position"));
msg_rc(_("| mosaic-yoffset # . . . .top left corner position"));
+ msg_rc(_("| mosaic-offsets x,y(,x,y)*. . . . list of offsets"));
msg_rc(_("| mosaic-align 0..2,4..6,8..10. . .mosaic alignment"));
msg_rc(_("| mosaic-vborder # . . . . . . . . vertical border"));
msg_rc(_("| mosaic-hborder # . . . . . . . horizontal border"));
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 );
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;
}
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 );
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
|| !strcmp( psz_cmd, "vtrack" )
|| !strcmp( psz_cmd, "strack" ) )
{
- char *psz_variable;
+ const char *psz_variable;
vlc_value_t val_name;
int i_error;
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;
- playlist_t *p_playlist;
+ vlc_value_t val;
- p_playlist = vlc_object_find( p_this, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
- if( !p_playlist )
- {
- msg_Err( p_this, "no playlist" );
- return VLC_ENOOBJ;
- }
+ intf_thread_t *p_intf = (intf_thread_t*)p_this;
+ playlist_t *p_playlist = pl_Yield( p_this );
+ PL_LOCK;
if( p_playlist->p_input )
{
- vlc_value_t val;
var_Get( p_playlist->p_input, "state", &val );
if( ( val.i_int == PAUSE_S ) || ( val.i_int == PLAYLIST_PAUSED ) )
{
msg_rc( _("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" ) )
msg_Warn( p_playlist, "play" );
playlist_Play( p_playlist );
}
+ else if( !strcmp( psz_cmd, "repeat" ) )
+ {
+ vlc_bool_t b_update = VLC_TRUE;
+
+ var_Get( p_playlist, "repeat", &val );
+
+ if( strlen( newval.psz_string ) > 0 )
+ {
+ if ( ( !strncmp( newval.psz_string, "on", 2 ) && ( val.b_bool == VLC_TRUE ) ) ||
+ ( !strncmp( newval.psz_string, "off", 3 ) && ( val.b_bool == VLC_FALSE ) ) )
+ {
+ b_update = VLC_FALSE;
+ }
+ }
+
+ if ( b_update )
+ {
+ val.b_bool = !val.b_bool;
+ var_Set( p_playlist, "repeat", val );
+ }
+ msg_rc( "Setting repeat to %d", val.b_bool );
+ }
+ else if( !strcmp( psz_cmd, "loop" ) )
+ {
+ vlc_bool_t b_update = VLC_TRUE;
+
+ var_Get( p_playlist, "loop", &val );
+
+ if( strlen( newval.psz_string ) > 0 )
+ {
+ if ( ( !strncmp( newval.psz_string, "on", 2 ) && ( val.b_bool == VLC_TRUE ) ) ||
+ ( !strncmp( newval.psz_string, "off", 3 ) && ( val.b_bool == VLC_FALSE ) ) )
+ {
+ b_update = VLC_FALSE;
+ }
+ }
+
+ if ( b_update )
+ {
+ val.b_bool = !val.b_bool;
+ var_Set( p_playlist, "loop", val );
+ }
+ msg_rc( "Setting loop to %d", val.b_bool );
+ }
else if (!strcmp( psz_cmd, "goto" ) )
{
+ msg_rc( _("goto is deprecated" ) );
msg_Err( p_playlist, "goto is deprecated" );
}
else if( !strcmp( psz_cmd, "stop" ) )
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 );
+ playlist_Clear( p_playlist, VLC_FALSE );
}
else if( !strcmp( psz_cmd, "add" ) &&
newval.psz_string && *newval.psz_string )
if( p_item )
{
msg_rc( "Trying to add %s to playlist.", newval.psz_string );
- playlist_PlaylistAddInput( p_playlist, p_item,
- PLAYLIST_GO|PLAYLIST_APPEND, PLAYLIST_END );
+ playlist_AddInput( p_playlist, p_item,
+ PLAYLIST_GO|PLAYLIST_APPEND, PLAYLIST_END, VLC_TRUE );
}
}
else if( !strcmp( psz_cmd, "enqueue" ) &&
if( p_item )
{
msg_rc( "trying to enqueue %s to playlist", newval.psz_string );
- playlist_PlaylistAddInput( p_playlist, p_item,
- PLAYLIST_APPEND, PLAYLIST_END );
+ playlist_AddInput( p_playlist, p_item,
+ PLAYLIST_APPEND, PLAYLIST_END, VLC_TRUE );
}
}
else if( !strcmp( psz_cmd, "playlist" ) )
}
else if( !strcmp( psz_cmd, "sort" ))
{
- playlist_RecursiveNodeSort( p_playlist, p_playlist->p_root_onelevel,
+ 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. */
- 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" ));
+ msg_rc( STATUS_CHANGE "( new input: %s )",
+ input_GetItem(p_playlist->p_input)->psz_uri );
+ msg_rc( STATUS_CHANGE "( audio volume: %d )",
+ config_GetInt( p_intf, "volume" ));
vlc_mutex_lock( &p_playlist->object_lock );
switch( p_playlist->status.i_status )
}
/* 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_global, "marq-marquee", val );
- }
- else
- {
- val.psz_string = "";
- var_Set( p_input->p_libvlc_global, "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_global, "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_global, "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_global, "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_global, "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_global, "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_global, "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_global, "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_global, "mosaic-height", val );
- }
- }
- else if( !strcmp( psz_cmd, "mosaic-width" ) )
- {
- if( strlen( newval.psz_string ) > 0)
- {
- val.i_int = atoi( newval.psz_string );
- var_Set( p_input->p_libvlc_global, "mosaic-width", val );
- }
- }
- else if( !strcmp( psz_cmd, "mosaic-xoffset" ) )
- {
- if( strlen( newval.psz_string ) > 0)
- {
- val.i_int = atoi( newval.psz_string );
- var_Set( p_input->p_libvlc_global, "mosaic-xoffset", val );
- }
- }
- else if( !strcmp( psz_cmd, "mosaic-yoffset" ) )
- {
- if( strlen( newval.psz_string ) > 0)
- {
- val.i_int = atoi( newval.psz_string );
- var_Set( p_input->p_libvlc_global, "mosaic-yoffset", val );
- }
- }
- else if( !strcmp( psz_cmd, "mosaic-align" ) )
- {
- if( strlen( newval.psz_string ) > 0 )
- {
- val.i_int = atoi( newval.psz_string );
- var_Set( p_input->p_libvlc_global, "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_global, "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_global, "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_global, "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_global, "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_global, "mosaic-cols", val );
- }
- }
- else if( !strcmp( psz_cmd, "mosaic-order" ) )
- {
- if( strlen( newval.psz_string ) > 0)
- {
- val.psz_string = newval.psz_string;
- var_Set( p_input->p_libvlc_global, "mosaic-order", val );
- }
- }
- else if( !strcmp( psz_cmd, "mosaic-keep-aspect-ratio" ) )
- {
- if( strlen( newval.psz_string ) > 0)
- {
- val.i_int = atoi( newval.psz_string );
- var_Set( p_input->p_libvlc_global, "mosaic-keep-aspect-ratio", val );
- }
- }
- else if( !strcmp( psz_cmd, "time-format" ) )
- {
- if( strlen( newval.psz_string ) > 0 )
- {
- val.psz_string = newval.psz_string;
- var_Set( p_input->p_libvlc_global, "time-format", val );
- }
- else
- {
- val.psz_string = "";
- var_Set( p_input->p_libvlc_global, "time-format", val);
- }
- }
- else if( !strcmp( psz_cmd, "time-x" ) )
- {
- if( strlen( newval.psz_string ) > 0)
- {
- val.i_int = atoi( newval.psz_string );
- var_Set( p_input->p_libvlc_global, "time-x", val );
- }
- }
- else if( !strcmp( psz_cmd, "time-y" ) )
- {
- if( strlen( newval.psz_string ) > 0)
- {
- val.i_int = atoi( newval.psz_string );
- var_Set( p_input->p_libvlc_global, "time-y", val );
- }
- }
- else if( !strcmp( psz_cmd, "time-position" ) )
- {
- if( strlen( newval.psz_string ) > 0)
- {
- val.i_int = atoi( newval.psz_string );
- var_Set( p_input->p_libvlc_global, "time-position", val );
- }
- }
- else if( !strcmp( psz_cmd, "time-color" ) )
- {
- if( strlen( newval.psz_string ) > 0)
- {
- val.i_int = strtol( newval.psz_string, NULL, 0 );
- var_Set( p_input->p_libvlc_global, "time-color", val );
- }
- }
- else if( !strcmp( psz_cmd, "time-opacity" ) )
- {
- if( strlen( newval.psz_string ) > 0)
- {
- val.i_int = strtol( newval.psz_string, NULL, 0 );
- var_Set( p_input->p_libvlc_global, "time-opacity", val );
- }
- }
- else if( !strcmp( psz_cmd, "time-size" ) )
- {
- if( strlen( newval.psz_string ) > 0)
- {
- val.i_int = atoi( newval.psz_string );
- var_Set( p_input->p_libvlc_global, "time-size", val );
- }
- }
- else if( !strcmp( psz_cmd, "logo-file" ) )
- {
- if( strlen( newval.psz_string ) > 0 )
- {
- val.psz_string = newval.psz_string;
- var_Set( p_input->p_libvlc_global, "logo-file", val );
- }
- }
- else if( !strcmp( psz_cmd, "logo-x" ) )
- {
- if( strlen( newval.psz_string ) > 0)
- {
- val.i_int = atoi( newval.psz_string );
- var_Set( p_input->p_libvlc_global, "logo-x", val );
- }
- }
- else if( !strcmp( psz_cmd, "logo-y" ) )
- {
- if( strlen( newval.psz_string ) > 0)
- {
- val.i_int = atoi( newval.psz_string );
- var_Set( p_input->p_libvlc_global, "logo-y", val );
- }
- }
- else if( !strcmp( psz_cmd, "logo-position" ) )
- {
- if( strlen( newval.psz_string ) > 0)
- {
- val.i_int = atoi( newval.psz_string );
- var_Set( p_input->p_libvlc_global, "logo-position", val );
- }
- }
- else if( !strcmp( psz_cmd, "logo-transparency" ) )
- {
- if( strlen( newval.psz_string ) > 0)
- {
- val.i_int = strtol( newval.psz_string, NULL, 0 );
- var_Set( p_input->p_libvlc_global, "logo-transparency", val );
+ static const char vars[] =
+ "marq-x\0" "marq-y\0" "marq-position\0" "marq-color\0"
+ "marq-opacity\0" "marq-size\0" "marq-timeout\0"
+ "mosaic-alpha\0" "mosaic-height\0" "mosaic-width\0"
+ "mosaic-xoffset\0" "mosaic-yoffset\0" "mosaic-align\0"
+ "mosaic-vborder\0" "mosaic-hborder\0" "mosaic-position\0"
+ "mosaic-rows\0" "mosaic-cols\0" "mosaic-order\0"
+ "mosaic-offsets\0" "mosaic-keep-aspect-ratio\0"
+ "logo-file\0" "logo-x\0" "logo-y\0" "logo-position\0"
+ "logo-transparency\0";
+ const char *psz_name = NULL;
+
+ if( newval.psz_string )
+ for( psz_name = vars; *psz_name; psz_name += strlen( psz_name ) + 1 )
+ {
+ if( strcmp( psz_name, psz_cmd ) == 0 )
+ {
+ int i_type = var_Type( p_input->p_libvlc_global, psz_name );
+
+ if( i_type & VLC_VAR_INTEGER )
+ {
+ var_SetInteger( p_input->p_libvlc_global, psz_name,
+ atoi( newval.psz_string ) );
+ break;
+ }
+ else if( i_type & VLC_VAR_STRING )
+ {
+ var_SetString( p_input->p_libvlc_global, psz_name,
+ newval.psz_string );
+ break;
+ }
+ }
}
- }
- /*
- * sanity check
- */
- else
- {
- msg_rc( "Unknown command!" );
+ if( *psz_name == '\0' )
+ msg_rc( "Unknown command!" );
}
vlc_object_release( p_playlist );
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 ) )
{
}
#endif
- while( !p_intf->b_die && *pi_size < MAX_LINE_LENGTH &&
+ while( !intf_ShouldDie( p_intf ) && *pi_size < MAX_LINE_LENGTH &&
(i_read = net_ReadNonBlock( p_intf, p_intf->p_sys->i_socket == -1 ?
0 /*STDIN_FILENO*/ : p_intf->p_sys->i_socket, NULL,
(uint8_t *)p_buffer + *pi_size, 1, INTF_IDLE_SLEEP ) ) > 0 )
/* Now create a playlist item */
if( psz_item_mrl )
{
- p_item = input_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++ )
{
- vlc_input_item_AddOption( p_item, ppsz_options[i] );
+ input_ItemAddOption( p_item, ppsz_options[i] );
}
}
projects / vlc / blobdiff