*
* 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.
*****************************************************************************/
/*****************************************************************************
#include <vlc/intf.h>
#include <vlc/aout.h>
#include <vlc/vout.h>
+#include <vlc_video.h>
#include <vlc_osd.h>
+#include <vlc_update.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#include "vlc_error.h"
#include "network.h"
+#include "vlc_url.h"
#if defined(AF_UNIX) && !defined(AF_LOCAL)
# define AF_LOCAL AF_UNIX
static void Run ( intf_thread_t * );
static void Help ( intf_thread_t *, vlc_bool_t );
+static void RegisterCallbacks( intf_thread_t * );
static vlc_bool_t ReadCommand( intf_thread_t *, char *, int * );
vlc_value_t, vlc_value_t, void * );
static int Menu ( vlc_object_t *, char const *,
vlc_value_t, vlc_value_t, void * );
+static void checkUpdates( intf_thread_t *p_intf, char *psz_arg );
/* Status Callbacks */
static int TimeOffsetChanged( vlc_object_t *, char const *,
/* status changes */
vlc_mutex_t status_lock;
playlist_status_t i_last_state;
-
+
#ifdef WIN32
HANDLE hConsoleIn;
vlc_bool_t b_quiet;
{
va_list args;
va_start( args, psz_fmt );
+
if( p_intf->p_sys->i_socket == -1 )
+ {
vprintf( psz_fmt, args );
+ printf( "\r\n" );
+ }
else
{
net_vaPrintf( p_intf, p_intf->p_sys->i_socket, NULL, psz_fmt, args );
- net_Printf( VLC_OBJECT(p_intf), p_intf->p_sys->i_socket, NULL, "\r" );
+ net_Write( p_intf, p_intf->p_sys->i_socket, NULL, (uint8_t*)"\r\n", 2 );
}
va_end( args );
}
p_intf->p_sys->psz_unix_path = psz_unix_path;
vlc_mutex_init( p_intf, &p_intf->p_sys->status_lock );
p_intf->p_sys->i_last_state = PLAYLIST_STOPPED;
-
+
/* Non-buffered stdout */
setvbuf( stdout, (char *)NULL, _IOLBF, 0 );
vlc_object_release( p_playlist );
}
- msg_rc( _("Remote control interface initialized, `h' for help\n") );
+ msg_rc( _("Remote control interface initialized, `h' for help") );
return VLC_SUCCESS;
}
#endif
free( p_intf->p_sys->psz_unix_path );
}
- vlc_mutex_destroy( &p_intf->p_sys->status_lock );
+ vlc_mutex_destroy( &p_intf->p_sys->status_lock );
free( p_intf->p_sys );
}
/*****************************************************************************
- * Run: rc thread
- *****************************************************************************
- * This part of the interface is in a separate thread so that we can call
- * exec() from within it without annoying the rest of the program.
+ * RegisterCallbacks: Register callbacks to dynamic variables
*****************************************************************************/
-static void Run( intf_thread_t *p_intf )
+static void RegisterCallbacks( intf_thread_t *p_intf )
{
- input_thread_t * p_input;
- playlist_t * p_playlist;
-
- char p_buffer[ MAX_LINE_LENGTH + 1 ];
- vlc_bool_t b_showpos = config_GetInt( p_intf, "rc-show-pos" );
- vlc_bool_t b_longhelp = VLC_FALSE;
-
- int i_size = 0;
- int i_oldpos = 0;
- int i_newpos;
-
- p_buffer[0] = 0;
- p_input = NULL;
- p_playlist = NULL;
-
/* Register commands that will be cleaned up upon object destruction */
var_Create( p_intf, "quit", VLC_VAR_VOID | VLC_VAR_ISCOMMAND );
var_AddCallback( p_intf, "quit", Quit, NULL );
var_AddCallback( p_intf, "play", Playlist, NULL );
var_Create( p_intf, "stop", VLC_VAR_VOID | VLC_VAR_ISCOMMAND );
var_AddCallback( p_intf, "stop", Playlist, NULL );
+ var_Create( p_intf, "clear", VLC_VAR_VOID | VLC_VAR_ISCOMMAND );
+ var_AddCallback( p_intf, "clear", Playlist, NULL );
var_Create( p_intf, "prev", VLC_VAR_VOID | VLC_VAR_ISCOMMAND );
var_AddCallback( p_intf, "prev", Playlist, NULL );
var_Create( p_intf, "next", VLC_VAR_VOID | VLC_VAR_ISCOMMAND );
var_AddCallback( p_intf, "next", Playlist, NULL );
var_Create( p_intf, "goto", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND );
var_AddCallback( p_intf, "goto", Playlist, NULL );
-
+ var_Create( p_intf, "status", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND );
+ var_AddCallback( p_intf, "status", Playlist, NULL );
+
/* marquee on the fly items */
var_Create( p_intf, "marq-marquee", VLC_VAR_VOID | VLC_VAR_ISCOMMAND );
var_AddCallback( p_intf, "marq-marquee", Other, NULL );
var_AddCallback( p_intf, "time-opacity", Other, NULL );
var_Create( p_intf, "time-size", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND );
var_AddCallback( p_intf, "time-size", Other, NULL );
-
+
/* logo on the fly items */
var_Create( p_intf, "logo-file", VLC_VAR_VOID | VLC_VAR_ISCOMMAND );
var_AddCallback( p_intf, "logo-file", Other, NULL );
/* OSD menu commands */
var_Create( p_intf, "menu", VLC_VAR_STRING | VLC_VAR_ISCOMMAND );
- var_AddCallback( p_intf, "menu", Menu, NULL );
+ var_AddCallback( p_intf, "menu", Menu, NULL );
/* DVD commands */
var_Create( p_intf, "pause", VLC_VAR_VOID | 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 );
+}
+
+/*****************************************************************************
+ * Run: rc thread
+ *****************************************************************************
+ * This part of the interface is in a separate thread so that we can call
+ * exec() from within it without annoying the rest of the program.
+ *****************************************************************************/
+static void Run( intf_thread_t *p_intf )
+{
+ input_thread_t * p_input;
+ playlist_t * p_playlist;
+
+ char p_buffer[ MAX_LINE_LENGTH + 1 ];
+ vlc_bool_t b_showpos = config_GetInt( p_intf, "rc-show-pos" );
+ vlc_bool_t b_longhelp = VLC_FALSE;
+
+ int i_size = 0;
+ int i_oldpos = 0;
+ int i_newpos;
+
+ p_buffer[0] = 0;
+ p_input = NULL;
+ p_playlist = NULL;
+
+ /* Register commands that will be cleaned up upon object destruction */
+ RegisterCallbacks( p_intf );
/* status callbacks */
/* Listen to audio volume updates */
- var_AddCallback( p_intf->p_vlc, "volume", VolumeChanged, p_intf );
-
+ var_AddCallback( p_intf->p_vlc, "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_input->b_dead || !p_input->b_die )
{
- msg_rc( STATUS_CHANGE "( New input: %s )\r\n", p_input->input.p_item->psz_uri );
- msg_rc( STATUS_CHANGE "( audio volume: %d )\r\n", config_GetInt( p_intf, "volume" ));
+ msg_rc( STATUS_CHANGE "( New input: %s )", p_input->input.p_item->psz_uri );
+ msg_rc( STATUS_CHANGE "( audio volume: %d )", config_GetInt( p_intf, "volume" ));
}
var_AddCallback( p_input, "state", StateChanged, p_intf );
var_AddCallback( p_input, "rate-faster", RateChanged, p_intf );
{
vlc_mutex_lock( &p_playlist->object_lock );
p_intf->p_sys->i_last_state = (int) PLAYLIST_STOPPED;
- msg_rc( STATUS_CHANGE "( stop state: 0 )\r\n" );
+ msg_rc( STATUS_CHANGE "( stop state: 0 )" );
vlc_mutex_unlock( &p_playlist->object_lock );
}
}
-
+
if( (p_input != NULL) && !p_input->b_dead && !p_input->b_die &&
(p_playlist != NULL) )
{
(p_playlist->status.i_status == PLAYLIST_STOPPED) )
{
p_intf->p_sys->i_last_state = PLAYLIST_STOPPED;
- msg_rc( STATUS_CHANGE "( stop state: 0 )\r\n" );
+ msg_rc( STATUS_CHANGE "( stop state: 0 )" );
}
else if( (p_intf->p_sys->i_last_state != p_playlist->status.i_status) &&
(p_playlist->status.i_status == PLAYLIST_RUNNING) )
{
p_intf->p_sys->i_last_state = p_playlist->status.i_status;
- msg_rc( STATUS_CHANGE "( play state: 1 )\r\n" );
+ msg_rc( STATUS_CHANGE "( play state: 1 )" );
}
else if( (p_intf->p_sys->i_last_state != p_playlist->status.i_status) &&
(p_playlist->status.i_status == PLAYLIST_PAUSED) )
{
p_intf->p_sys->i_last_state = p_playlist->status.i_status;
- msg_rc( STATUS_CHANGE "( pause state: 2 )\r\n" );
+ msg_rc( STATUS_CHANGE "( pause state: 2 )" );
}
vlc_mutex_unlock( &p_playlist->object_lock );
}
if( i_oldpos != i_newpos )
{
i_oldpos = i_newpos;
- msg_rc( "pos: %d%%\n", i_newpos );
+ msg_rc( "pos: %d%%", i_newpos );
}
}
val.psz_string = psz_arg;
i_ret = var_Set( p_intf, psz_cmd, val );
- msg_rc( "%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 )
{
- msg_rc( "%s: returned %i (%s)\n",
+ msg_rc( "%s: returned %i (%s)",
psz_cmd, i_ret, vlc_error( i_ret ) );
}
}
info_category_t *p_category =
p_input->input.p_item->pp_categories[i];
- msg_rc( "+----[ %s ]\n", p_category->psz_name );
- msg_rc( "| \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];
- msg_rc( "| %s: %s\n", p_info->psz_name,
+ msg_rc( "| %s: %s", p_info->psz_name,
p_info->psz_value );
}
- msg_rc( "| \n" );
+ msg_rc( "| " );
}
- msg_rc( "+----[ end of stream info ]\n" );
+ msg_rc( "+----[ end of stream info ]" );
vlc_mutex_unlock( &p_input->input.p_item->lock );
}
else
{
- msg_rc( "no input\n" );
+ msg_rc( "no input" );
}
}
else if( !strcmp( psz_cmd, "is_playing" ) )
{
if( ! p_input )
{
- msg_rc( "0\n" );
+ msg_rc( "0" );
}
else
{
- msg_rc( "1\n" );
-
- /* FIXME: This is a hack */
- /* Replay the current state of the system. */
- msg_rc( STATUS_CHANGE "( New input: %s )\r\n", p_input->input.p_item->psz_uri );
- msg_rc( STATUS_CHANGE "( audio volume: %d )\r\n", config_GetInt( p_intf, "volume" ));
-
- if( p_playlist )
- {
- vlc_mutex_lock( &p_playlist->object_lock );
- switch( p_playlist->status.i_status )
- {
- case PLAYLIST_STOPPED:
- msg_rc( STATUS_CHANGE "( stop state: 0 )\r\n" );
- break;
- case PLAYLIST_RUNNING:
- msg_rc( STATUS_CHANGE "( play state: %d )\r\n", var_GetInteger( p_input, "state" ) );
- break;
- case PLAYLIST_PAUSED:
- msg_rc( STATUS_CHANGE "( pause state: 2 )\r\n" );
- break;
- default:
- msg_rc( STATUS_CHANGE "( state unknown )\r\n" );
- break;
- }
- vlc_mutex_unlock( &p_playlist->object_lock );
- } /* End of current playlist status */
+ msg_rc( "1" );
}
}
else if( !strcmp( psz_cmd, "get_time" ) )
{
if( ! p_input )
{
- msg_rc("0\n");
+ msg_rc("0");
}
else
{
vlc_value_t time;
var_Get( p_input, "time", &time );
- msg_rc( "%i\n", time.i_time / 1000000);
+ msg_rc( "%i", time.i_time / 1000000);
}
}
else if( !strcmp( psz_cmd, "get_length" ) )
{
if( ! p_input )
{
- msg_rc("0\n");
+ msg_rc("0");
}
else
{
vlc_value_t time;
var_Get( p_input, "length", &time );
- msg_rc( "%i\n", time.i_time / 1000000);
+ msg_rc( "%i", time.i_time / 1000000);
}
}
else if( !strcmp( psz_cmd, "get_title" ) )
{
if( ! p_input )
{
- msg_rc("\n");
+ msg_rc("");
}
else
{
- msg_rc( "%s\n", p_input->input.p_item->psz_name );
+ msg_rc( "%s", p_input->input.p_item->psz_name );
}
}
else if( !strcmp( psz_cmd, "longhelp" ) || !strncmp( psz_cmd, "h", 1 )
Help( p_intf, b_longhelp );
}
+ else if( !strcmp( psz_cmd, "check-updates" ) )
+ {
+ checkUpdates( 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;
+ vlc_bool_t b_update = VLC_FALSE;
+ var_Get( p_vout, "fullscreen", &val );
+ val.b_bool = !val.b_bool;
+ if( !strncmp(psz_arg, "on", 2) && (val.b_bool == VLC_TRUE) )
+ {
+ b_update = VLC_TRUE;
+ val.b_bool = VLC_TRUE;
+ }
+ else if( !strncmp(psz_arg, "off", 3) && (val.b_bool == VLC_FALSE) )
+ {
+ b_update = VLC_TRUE;
+ val.b_bool = VLC_FALSE;
+ }
+ else if( strncmp(psz_arg, "off", 3) && strncmp(psz_arg, "on", 2) )
+ b_update = VLC_TRUE;
+ if( b_update ) var_Set( p_vout, "fullscreen", val );
vlc_object_release( p_vout );
}
}
break;
default:
- msg_rc(_("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 )\r\n" );
- msg_rc( STATUS_CHANGE "( quit )\r\n" );
+ msg_rc( STATUS_CHANGE "( stop state: 0 )" );
+ msg_rc( STATUS_CHANGE "( quit )" );
if( p_input )
{
vlc_object_release( p_playlist );
p_playlist = NULL;
}
-
- var_DelCallback( p_intf->p_vlc, "volume", VolumeChanged, p_intf );
+
+ var_DelCallback( p_intf->p_vlc, "volume-change", VolumeChanged, p_intf );
}
static void Help( intf_thread_t *p_intf, vlc_bool_t b_longhelp)
-{
- msg_rc(_("+----[ Remote control commands ]\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(_("| goto . . . . . . . . . . . . goto item at index\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(_("| fastforward . . . . . . . set to maximum rate\n"));
- msg_rc(_("| rewind . . . . . . . . . . set to minimum rate\n"));
- msg_rc(_("| faster . . . . . . . . faster playing of stream\n"));
- msg_rc(_("| slower . . . . . . . . slower playing of stream\n"));
- msg_rc(_("| normal . . . . . . . . normal playing of stream\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(_("| menu [on|off|up|down|left|right|select] use menu\n"));
- msg_rc( "| \n");
-
+{
+ msg_rc(_("+----[ Remote control commands ]"));
+ msg_rc( "| ");
+ msg_rc(_("| add XYZ . . . . . . . . . . add XYZ to playlist"));
+ msg_rc(_("| playlist . . . show items currently in playlist"));
+ msg_rc(_("| play . . . . . . . . . . . . . . . . play stream"));
+ msg_rc(_("| stop . . . . . . . . . . . . . . . . stop stream"));
+ msg_rc(_("| next . . . . . . . . . . . . next playlist item"));
+ msg_rc(_("| prev . . . . . . . . . . previous playlist item"));
+ msg_rc(_("| goto . . . . . . . . . . . . goto item at index"));
+ msg_rc(_("| clear . . . . . . . . . . . clear the playlist"));
+ msg_rc(_("| status . . . . . . . . . current playlist status"));
+ msg_rc(_("| title [X] . . . . set/get title in current item"));
+ msg_rc(_("| title_n . . . . . . next title in current item"));
+ msg_rc(_("| title_p . . . . previous title in current item"));
+ msg_rc(_("| chapter [X] . . set/get chapter in current item"));
+ msg_rc(_("| chapter_n . . . . next chapter in current item"));
+ msg_rc(_("| chapter_p . . previous chapter in current item"));
+ msg_rc( "| ");
+ msg_rc(_("| seek X . seek in seconds, for instance `seek 12'"));
+ msg_rc(_("| pause . . . . . . . . . . . . . . toggle pause"));
+ msg_rc(_("| fastforward . . . . . . . set to maximum rate"));
+ msg_rc(_("| rewind . . . . . . . . . . set to minimum rate"));
+ msg_rc(_("| faster . . . . . . . . faster playing of stream"));
+ msg_rc(_("| slower . . . . . . . . slower playing of stream"));
+ msg_rc(_("| normal . . . . . . . . normal playing of stream"));
+ msg_rc(_("| f [on|off] . . . . . . . . . . toggle fullscreen"));
+ msg_rc(_("| info . . . information about the current stream"));
+ msg_rc( "| ");
+ msg_rc(_("| volume [X] . . . . . . . . set/get audio volume"));
+ msg_rc(_("| volup [X] . . . . . raise audio volume X steps"));
+ msg_rc(_("| voldown [X] . . . . lower audio volume X steps"));
+ msg_rc(_("| adev [X] . . . . . . . . . set/get audio device"));
+ msg_rc(_("| achan [X]. . . . . . . . set/get audio channels"));
+ msg_rc(_("| menu [on|off|up|down|left|right|select] use menu"));
+ msg_rc( "| ");
+
if (b_longhelp)
{
- msg_rc(_("| marq-marquee STRING . . overlay STRING in video\n"));
- msg_rc(_("| marq-x X . . . . . . . . . . . .offset from left\n"));
- msg_rc(_("| marq-y Y . . . . . . . . . . . . offset from top\n"));
- msg_rc(_("| marq-position #. . . .relative position control\n"));
- msg_rc(_("| marq-color # . . . . . . . . . . font color, RGB\n"));
- msg_rc(_("| marq-opacity # . . . . . . . . . . . . . opacity\n"));
- msg_rc(_("| marq-timeout T. . . . . . . . . . timeout, in ms\n"));
- msg_rc(_("| marq-size # . . . . . . . . font size, in pixels\n"));
- msg_rc( "| \n");
- msg_rc(_("| time-format STRING . . . overlay STRING in video\n"));
- msg_rc(_("| time-x X . . . . . . . . . . . .offset from left\n"));
- msg_rc(_("| time-y Y . . . . . . . . . . . . offset from top\n"));
- msg_rc(_("| time-position #. . . . . . . . relative position\n"));
- msg_rc(_("| time-color # . . . . . . . . . . font color, RGB\n"));
- msg_rc(_("| time-opacity # . . . . . . . . . . . . . opacity\n"));
- msg_rc(_("| time-size # . . . . . . . . font size, in pixels\n"));
- msg_rc( "| \n");
- msg_rc(_("| logo-file STRING . . . the overlay file path/name\n"));
- msg_rc(_("| logo-x X . . . . . . . . . . . .offset from left\n"));
- msg_rc(_("| logo-y Y . . . . . . . . . . . . offset from top\n"));
- msg_rc(_("| logo-position #. . . . . . . . relative position\n"));
- msg_rc(_("| logo-transparency #. . . . . . . . .transparency\n"));
- msg_rc( "| \n");
- msg_rc(_("| mosaic-alpha # . . . . . . . . . . . . . . alpha\n"));
- msg_rc(_("| mosaic-height #. . . . . . . . . . . . . .height\n"));
- msg_rc(_("| mosaic-width # . . . . . . . . . . . . . . width\n"));
- msg_rc(_("| mosaic-xoffset # . . . .top left corner position\n"));
- msg_rc(_("| mosaic-yoffset # . . . .top left corner position\n"));
- msg_rc(_("| mosaic-align 0..2,4..6,8..10. . .mosaic alignment\n"));
- msg_rc(_("| mosaic-vborder # . . . . . . . . vertical border\n"));
- msg_rc(_("| mosaic-hborder # . . . . . . . horizontal border\n"));
- msg_rc(_("| mosaic-position {0=auto,1=fixed} . . . .position\n"));
- msg_rc(_("| mosaic-rows #. . . . . . . . . . .number of rows\n"));
- msg_rc(_("| mosaic-cols #. . . . . . . . . . .number of cols\n"));
- msg_rc(_("| mosaic-keep-aspect-ratio {0,1} . . .aspect ratio\n"));
- msg_rc( "| \n");
- }
- msg_rc(_("| help . . . . . . . . . . . . . this help message\n"));
- msg_rc(_("| longhelp . . . . . . . . . a longer 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"));
+ msg_rc(_("| marq-marquee STRING . . overlay STRING in video"));
+ msg_rc(_("| marq-x X . . . . . . . . . . . .offset from left"));
+ msg_rc(_("| marq-y Y . . . . . . . . . . . . offset from top"));
+ msg_rc(_("| marq-position #. . . .relative position control"));
+ msg_rc(_("| marq-color # . . . . . . . . . . font color, RGB"));
+ msg_rc(_("| marq-opacity # . . . . . . . . . . . . . opacity"));
+ msg_rc(_("| marq-timeout T. . . . . . . . . . timeout, in ms"));
+ msg_rc(_("| marq-size # . . . . . . . . font size, in pixels"));
+ msg_rc( "| ");
+ msg_rc(_("| time-format STRING . . . overlay STRING in video"));
+ msg_rc(_("| time-x X . . . . . . . . . . . .offset from left"));
+ msg_rc(_("| time-y Y . . . . . . . . . . . . offset from top"));
+ msg_rc(_("| time-position #. . . . . . . . relative position"));
+ msg_rc(_("| time-color # . . . . . . . . . . font color, RGB"));
+ msg_rc(_("| time-opacity # . . . . . . . . . . . . . opacity"));
+ msg_rc(_("| time-size # . . . . . . . . font size, in pixels"));
+ msg_rc( "| ");
+ msg_rc(_("| logo-file STRING . . . the overlay file path/name"));
+ msg_rc(_("| logo-x X . . . . . . . . . . . .offset from left"));
+ msg_rc(_("| logo-y Y . . . . . . . . . . . . offset from top"));
+ msg_rc(_("| logo-position #. . . . . . . . relative position"));
+ msg_rc(_("| logo-transparency #. . . . . . . . .transparency"));
+ msg_rc( "| ");
+ msg_rc(_("| mosaic-alpha # . . . . . . . . . . . . . . alpha"));
+ msg_rc(_("| mosaic-height #. . . . . . . . . . . . . .height"));
+ msg_rc(_("| mosaic-width # . . . . . . . . . . . . . . width"));
+ msg_rc(_("| mosaic-xoffset # . . . .top left corner position"));
+ msg_rc(_("| mosaic-yoffset # . . . .top left corner position"));
+ msg_rc(_("| mosaic-align 0..2,4..6,8..10. . .mosaic alignment"));
+ msg_rc(_("| mosaic-vborder # . . . . . . . . vertical border"));
+ msg_rc(_("| mosaic-hborder # . . . . . . . horizontal border"));
+ msg_rc(_("| mosaic-position {0=auto,1=fixed} . . . .position"));
+ msg_rc(_("| mosaic-rows #. . . . . . . . . . .number of rows"));
+ msg_rc(_("| mosaic-cols #. . . . . . . . . . .number of cols"));
+ msg_rc(_("| mosaic-keep-aspect-ratio {0,1} . . .aspect ratio"));
+ msg_rc( "| ");
+ msg_rc(_("| check-updates [newer] [equal] [older]\n"
+ "| [undef] [info] [source] [binary] [plugin]"));
+ msg_rc( "| ");
+ }
+ msg_rc(_("| help . . . . . . . . . . . . . this help message"));
+ msg_rc(_("| longhelp . . . . . . . . . a longer help message"));
+ msg_rc(_("| logout . . . . . exit (if in socket connection)"));
+ msg_rc(_("| quit . . . . . . . . . . . . . . . . . quit vlc"));
+ msg_rc( "| ");
+ msg_rc(_("+----[ end of help ]"));
}
/********************************************************************
{
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 )\r\n", 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 );
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
intf_thread_t *p_intf = (intf_thread_t*)p_data;
-
+
vlc_mutex_lock( &p_intf->p_sys->status_lock );
- msg_rc( STATUS_CHANGE "( audio volume: %d )\r\n", newval.i_int );
+ msg_rc( STATUS_CHANGE "( audio volume: %d )", config_GetInt( p_this, "volume") );
vlc_mutex_unlock( &p_intf->p_sys->status_lock );
return VLC_SUCCESS;
}
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 )
cmd[5] = '\0';
break;
} /* var_GetInteger( p_input, "state" ) */
- msg_rc( STATUS_CHANGE "( %s state: %d )\r\n", &cmd[0], newval.i_int );
+ msg_rc( STATUS_CHANGE "( %s state: %d )", &cmd[0], newval.i_int );
vlc_object_release( p_playlist );
}
vlc_object_release( p_input );
{
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 )\r\n", 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( ( ( val.i_int == PAUSE_S ) || ( val.i_int == PLAYLIST_PAUSED ) ) &&
( strcmp( psz_cmd, "pause" ) != 0 ) )
{
- msg_rc( _("press pause to continue\r\n") );
+ msg_rc( _("press menu select or pause to continue") );
vlc_object_release( p_input );
return VLC_EGENERIC;
}
-
+
/* Parse commands that only require an input */
if( !strcmp( psz_cmd, "pause" ) )
{
- val.i_int = PAUSE_S;
-
- var_Set( p_input, "state", val );
+ val.i_int = config_GetInt( p_intf, "key-play-pause" );
+ var_Set( p_intf->p_vlc, "key-pressed", val );
vlc_object_release( p_input );
return VLC_SUCCESS;
}
}
else if ( !strcmp( psz_cmd, "fastforward" ) )
{
- val.i_int = config_GetInt( p_intf, "key-jump+3sec" );
+ val.i_int = config_GetInt( p_intf, "key-jump+extrashort" );
var_Set( p_intf->p_vlc, "key-pressed", val );
-
vlc_object_release( p_input );
return VLC_SUCCESS;
}
else if ( !strcmp( psz_cmd, "rewind" ) )
{
- val.i_int = config_GetInt( p_intf, "key-jump-3sec" );
+ val.i_int = config_GetInt( p_intf, "key-jump-extrashort" );
var_Set( p_intf->p_vlc, "key-pressed", val );
-
vlc_object_release( p_input );
return VLC_SUCCESS;
}
else if ( !strcmp( psz_cmd, "faster" ) )
{
val.b_bool = VLC_TRUE;
-
var_Set( p_input, "rate-faster", val );
vlc_object_release( p_input );
return VLC_SUCCESS;
else if ( !strcmp( psz_cmd, "slower" ) )
{
val.b_bool = VLC_TRUE;
-
var_Set( p_input, "rate-slower", val );
vlc_object_release( p_input );
return VLC_SUCCESS;
else if ( !strcmp( psz_cmd, "normal" ) )
{
val.i_int = INPUT_RATE_DEFAULT;
-
var_Set( p_input, "rate", val );
vlc_object_release( p_input );
return VLC_SUCCESS;
var_Get( p_input, "chapter", &val );
var_Change( p_input, "chapter", VLC_VAR_GETCHOICES,
&val_list, NULL );
- msg_rc( "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 );
val.b_bool = VLC_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 );
- msg_rc( "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 );
}
/* Never reached. */
+ vlc_object_release( p_input );
return VLC_EGENERIC;
}
{
vlc_value_t val;
var_Get( p_playlist->p_input, "state", &val );
- if( ( ( val.i_int == PAUSE_S ) || ( val.i_int == PLAYLIST_PAUSED ) ) &&
- ( strcmp( psz_cmd, "pause" ) != 0 ) )
- {
- msg_rc( _("press pause to continue\r\n") );
+ if( ( val.i_int == PAUSE_S ) || ( val.i_int == PLAYLIST_PAUSED ) ) {
+ msg_rc( _("press menu select or pause to continue") );
vlc_object_release( p_playlist );
return VLC_EGENERIC;
}
- }
-
+ }
+
/* Parse commands that require a playlist */
if( !strcmp( psz_cmd, "prev" ) )
{
if( p_playlist->p_input )
{
vlc_value_t val;
-
+
var_Get( p_playlist->p_input, "rate", &val );
if( val.i_int != INPUT_RATE_DEFAULT )
{
}
else if (!strcmp( psz_cmd, "goto" ) )
{
- if( strlen( newval.psz_string ) > 0)
+ if( strlen( newval.psz_string ) > 0)
{
val.i_int = atoi( newval.psz_string );
- playlist_Goto( p_playlist, val.i_int);
+ playlist_Goto( p_playlist, val.i_int);
}
}
else if( !strcmp( psz_cmd, "stop" ) )
{
playlist_Stop( p_playlist );
}
+ else if( !strcmp( psz_cmd, "clear" ) )
+ {
+ playlist_Stop( p_playlist );
+ vlc_mutex_lock( &p_playlist->object_lock );
+ playlist_Clear( p_playlist );
+ vlc_mutex_unlock( &p_playlist->object_lock );
+ }
else if( !strcmp( psz_cmd, "add" ) &&
newval.psz_string && *newval.psz_string )
{
if( p_item )
{
- msg_rc( "trying to add %s to playlist\n", newval.psz_string );
+ msg_rc( "trying to add %s to playlist", newval.psz_string );
playlist_AddItem( p_playlist, p_item,
PLAYLIST_GO|PLAYLIST_APPEND, PLAYLIST_END );
}
else if( !strcmp( psz_cmd, "playlist" ) )
{
int i;
+
for ( i = 0; i < p_playlist->i_size; i++ )
{
- msg_rc( "|%s%s %s|%s|\n", i == p_playlist->i_index ? "*" : " ",
+ msg_rc( "|%s%s %s|%s|", i == p_playlist->i_index ? "*" : " ",
p_playlist->pp_items[i]->input.psz_name,
p_playlist->pp_items[i]->input.psz_uri,
p_playlist->pp_items[i]->i_parents > 0 ?
}
if ( i == 0 )
{
- msg_rc( "| no entries\n" );
+ msg_rc( "| no entries" );
+ }
+ }
+ else if( !strcmp( psz_cmd, "status" ) )
+ {
+ if( p_playlist->p_input )
+ {
+ /* Replay the current state of the system. */
+ msg_rc( STATUS_CHANGE "( New input: %s )", p_playlist->p_input->input.p_item->psz_uri );
+ msg_rc( STATUS_CHANGE "( audio volume: %d )", config_GetInt( p_intf, "volume" ));
+
+ vlc_mutex_lock( &p_playlist->object_lock );
+ switch( p_playlist->status.i_status )
+ {
+ case PLAYLIST_STOPPED:
+ msg_rc( STATUS_CHANGE "( stop state: 0 )" );
+ break;
+ case PLAYLIST_RUNNING:
+ msg_rc( STATUS_CHANGE "( play state: 1 )" );
+ break;
+ case PLAYLIST_PAUSED:
+ msg_rc( STATUS_CHANGE "( pause state: 2 )" );
+ break;
+ default:
+ msg_rc( STATUS_CHANGE "( state unknown )" );
+ break;
+ }
+ vlc_mutex_unlock( &p_playlist->object_lock );
}
}
-
+
/*
* sanity check
*/
else
{
- msg_rc( "unknown command!\n" );
+ msg_rc( "unknown command!" );
}
vlc_object_release( p_playlist );
{
return VLC_ENOOBJ;
}
-
+
p_input = vlc_object_find( p_this, VLC_OBJECT_INPUT, FIND_ANYWHERE );
if( !p_input )
{
if( p_input )
{
var_Get( p_input, "state", &val );
- if( ( ( val.i_int == PAUSE_S ) || ( val.i_int == PLAYLIST_PAUSED ) ) &&
- ( strcmp( psz_cmd, "pause" ) != 0 ) )
+ if( ( val.i_int == PAUSE_S ) || ( val.i_int == PLAYLIST_PAUSED ) )
{
- msg_rc( _("press pause to continue\r\n") );
+ msg_rc( _("press pause to continue") );
vlc_object_release( p_playlist );
vlc_object_release( p_input );
return VLC_EGENERIC;
}
}
-
+
/* Parse miscellaneous commands */
if( !strcmp( psz_cmd, "marq-marquee" ) )
{
val.psz_string = newval.psz_string;
var_Set( p_input->p_libvlc, "marq-marquee", val );
}
- else
+ else
{
val.psz_string = "";
var_Set( p_input->p_libvlc, "marq-marquee", val);
}
else if( !strcmp( psz_cmd, "marq-x" ) )
{
- if( strlen( newval.psz_string ) > 0)
+ if( strlen( newval.psz_string ) > 0)
{
val.i_int = atoi( newval.psz_string );
var_Set( p_input->p_libvlc, "marq-x", val );
}
else if( !strcmp( psz_cmd, "marq-y" ) )
{
- if( strlen( newval.psz_string ) > 0)
+ if( strlen( newval.psz_string ) > 0)
{
val.i_int = atoi( newval.psz_string );
var_Set( p_input->p_libvlc, "marq-y", val );
}
else if( !strcmp( psz_cmd, "marq-position" ) )
{
- if( strlen( newval.psz_string ) > 0)
+ if( strlen( newval.psz_string ) > 0)
{
val.i_int = atoi( newval.psz_string );
var_Set( p_input->p_libvlc, "marq-position", val );
}
else if( !strcmp( psz_cmd, "marq-color" ) )
{
- if( strlen( newval.psz_string ) > 0)
+ if( strlen( newval.psz_string ) > 0)
{
val.i_int = strtol( newval.psz_string, NULL, 0 );
var_Set( p_input->p_libvlc, "marq-color", val );
}
else if( !strcmp( psz_cmd, "marq-opacity" ) )
{
- if( strlen( newval.psz_string ) > 0)
+ if( strlen( newval.psz_string ) > 0)
{
val.i_int = strtol( newval.psz_string, NULL, 0 );
var_Set( p_input->p_libvlc, "marq-opacity", val );
}
else if( !strcmp( psz_cmd, "marq-size" ) )
{
- if( strlen( newval.psz_string ) > 0)
+ if( strlen( newval.psz_string ) > 0)
{
val.i_int = atoi( newval.psz_string );
var_Set( p_input->p_libvlc, "marq-size", val );
}
else if( !strcmp( psz_cmd, "marq-timeout" ) )
{
- if( strlen( newval.psz_string ) > 0)
+ if( strlen( newval.psz_string ) > 0)
{
val.i_int = atoi( newval.psz_string );
var_Set( p_input, "marq-timeout", val );
val.psz_string = newval.psz_string;
var_Set( p_input->p_libvlc, "time-format", val );
}
- else
+ else
{
val.psz_string = "";
var_Set( p_input->p_libvlc, "time-format", val);
}
else if( !strcmp( psz_cmd, "time-x" ) )
{
- if( strlen( newval.psz_string ) > 0)
+ if( strlen( newval.psz_string ) > 0)
{
val.i_int = atoi( newval.psz_string );
var_Set( p_input->p_libvlc, "time-x", val );
}
else if( !strcmp( psz_cmd, "time-y" ) )
{
- if( strlen( newval.psz_string ) > 0)
+ if( strlen( newval.psz_string ) > 0)
{
val.i_int = atoi( newval.psz_string );
var_Set( p_input->p_libvlc, "time-y", val );
}
else if( !strcmp( psz_cmd, "time-position" ) )
{
- if( strlen( newval.psz_string ) > 0)
+ if( strlen( newval.psz_string ) > 0)
{
val.i_int = atoi( newval.psz_string );
var_Set( p_input->p_libvlc, "time-position", val );
}
else if( !strcmp( psz_cmd, "time-color" ) )
{
- if( strlen( newval.psz_string ) > 0)
+ if( strlen( newval.psz_string ) > 0)
{
val.i_int = strtol( newval.psz_string, NULL, 0 );
var_Set( p_input->p_libvlc, "time-color", val );
}
else if( !strcmp( psz_cmd, "time-opacity" ) )
{
- if( strlen( newval.psz_string ) > 0)
+ if( strlen( newval.psz_string ) > 0)
{
val.i_int = strtol( newval.psz_string, NULL, 0 );
var_Set( p_input->p_libvlc, "time-opacity", val );
}
else if( !strcmp( psz_cmd, "time-size" ) )
{
- if( strlen( newval.psz_string ) > 0)
+ if( strlen( newval.psz_string ) > 0)
{
val.i_int = atoi( newval.psz_string );
var_Set( p_input->p_libvlc, "time-size", val );
}
else if( !strcmp( psz_cmd, "logo-x" ) )
{
- if( strlen( newval.psz_string ) > 0)
+ if( strlen( newval.psz_string ) > 0)
{
val.i_int = atoi( newval.psz_string );
var_Set( p_input->p_libvlc, "logo-x", val );
}
else if( !strcmp( psz_cmd, "logo-y" ) )
{
- if( strlen( newval.psz_string ) > 0)
+ if( strlen( newval.psz_string ) > 0)
{
val.i_int = atoi( newval.psz_string );
var_Set( p_input->p_libvlc, "logo-y", val );
}
else if( !strcmp( psz_cmd, "logo-position" ) )
{
- if( strlen( newval.psz_string ) > 0)
+ if( strlen( newval.psz_string ) > 0)
{
val.i_int = atoi( newval.psz_string );
var_Set( p_input->p_libvlc, "logo-position", val );
}
else if( !strcmp( psz_cmd, "logo-transparency" ) )
{
- if( strlen( newval.psz_string ) > 0)
+ if( strlen( newval.psz_string ) > 0)
{
val.i_int = strtol( newval.psz_string, NULL, 0 );
var_Set( p_input->p_libvlc, "logo-transparency", val );
*/
else
{
- msg_rc( "unknown command!\n" );
+ msg_rc( "unknown command!" );
}
vlc_object_release( p_playlist );
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
playlist_t *p_playlist;
-
+
p_playlist = vlc_object_find( p_this, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
if( p_playlist )
{
playlist_Stop( p_playlist );
vlc_object_release( p_playlist );
- }
+ }
p_this->p_vlc->b_die = VLC_TRUE;
return VLC_SUCCESS;
}
static int Intf( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
- intf_thread_t *p_newintf;
-
- p_newintf = intf_Create( p_this->p_vlc, newval.psz_string );
+ intf_thread_t *p_newintf = NULL;
+ p_newintf = intf_Create( p_this->p_vlc, newval.psz_string, 0, NULL );
if( p_newintf )
{
p_newintf->b_block = VLC_FALSE;
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
intf_thread_t *p_intf = (intf_thread_t*)p_this;
- int i_error;
+ input_thread_t *p_input = NULL;
+ int i_error = VLC_EGENERIC;
+
+ p_input = vlc_object_find( p_this, VLC_OBJECT_INPUT, FIND_ANYWHERE );
+ if( !p_input )
+ return VLC_ENOOBJ;
+
+ if( p_input )
+ {
+ vlc_value_t val;
+
+ var_Get( p_input, "state", &val );
+ if( ( val.i_int == PAUSE_S ) || ( val.i_int == PLAYLIST_PAUSED ) )
+ {
+ msg_rc( _("press menu select or pause to continue") );
+ vlc_object_release( p_input );
+ return VLC_EGENERIC;
+ }
+ vlc_object_release( p_input );
+ }
if ( *newval.psz_string )
{
audio_volume_t i_volume = atoi( newval.psz_string );
if ( (i_volume > (audio_volume_t)AOUT_VOLUME_MAX) )
{
- msg_rc( "Volume must be in the range %d-%d\n", AOUT_VOLUME_MIN,
+ msg_rc( "Volume must be in the range %d-%d", AOUT_VOLUME_MIN,
AOUT_VOLUME_MAX );
i_error = VLC_EBADVAR;
}
keyval.i_int = config_GetInt( p_intf, "key-vol-mute" );
var_Set( p_intf->p_vlc, "key-pressed", keyval );
- }
+ }
i_error = aout_VolumeSet( p_this, i_volume );
+ osd_Volume( p_this );
+ msg_rc( STATUS_CHANGE "( audio volume: %d )", i_volume );
}
}
else
}
else
{
- msg_rc( STATUS_CHANGE "( audio volume: %d )\r\n", i_volume );
+ msg_rc( STATUS_CHANGE "( audio volume: %d )", i_volume );
i_error = VLC_SUCCESS;
}
}
{
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( p_input )
+ {
+ vlc_value_t val;
+
+ var_Get( p_input, "state", &val );
+ if( ( val.i_int == PAUSE_S ) || ( val.i_int == PLAYLIST_PAUSED ) )
+ {
+ msg_rc( _("press menu select or pause to continue") );
+ vlc_object_release( p_input );
+ return VLC_EGENERIC;
+ }
+ vlc_object_release( p_input );
+ }
- if ( i_nb_steps <= 0 || i_nb_steps > (AOUT_VOLUME_MAX/AOUT_VOLUME_STEP) )
+ i_volume_step = config_GetInt( p_intf->p_vlc, "volume-step" );
+ if ( i_nb_steps <= 0 || i_nb_steps > (AOUT_VOLUME_MAX/i_volume_step) )
{
i_nb_steps = 1;
}
{
if ( aout_VolumeUp( p_this, i_nb_steps, &i_volume ) < 0 )
i_error = VLC_EGENERIC;
- osd_VolumeUp( p_this );
}
else
{
if ( aout_VolumeDown( p_this, i_nb_steps, &i_volume ) < 0 )
i_error = VLC_EGENERIC;
- osd_VolumeDown( p_this );
}
+ osd_Volume( p_this );
- if ( !i_error ) msg_rc( STATUS_CHANGE "( audio volume: %d )\r\n", i_volume );
+ if ( !i_error ) msg_rc( STATUS_CHANGE "( audio volume: %d )", i_volume );
return i_error;
}
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
intf_thread_t *p_intf = (intf_thread_t*)p_this;
+ input_thread_t *p_input = NULL;
aout_instance_t * p_aout;
const char * psz_variable;
vlc_value_t val_name;
int i_error;
+ p_input = vlc_object_find( p_this, VLC_OBJECT_INPUT, FIND_ANYWHERE );
+ if( !p_input )
+ return VLC_ENOOBJ;
+
+ if( p_input )
+ {
+ vlc_value_t val;
+
+ var_Get( p_input, "state", &val );
+ if( ( val.i_int == PAUSE_S ) || ( val.i_int == PLAYLIST_PAUSED ) ) {
+ msg_rc( _("press menu select or pause to continue") );
+ vlc_object_release( p_input );
+ return VLC_EGENERIC;
+ }
+ vlc_object_release( p_input );
+ }
+
p_aout = vlc_object_find( p_this, VLC_OBJECT_AOUT, FIND_ANYWHERE );
if ( p_aout == NULL ) return VLC_ENOOBJ;
return VLC_EGENERIC;
}
- msg_rc( "+----[ %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 )
- msg_rc( "| %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
- msg_rc( "| %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 );
- msg_rc( "+----[ end of %s ]\n", val_name.psz_string );
+ msg_rc( "+----[ end of %s ]", val_name.psz_string );
if( val_name.psz_string ) free( val_name.psz_string );
i_error = VLC_SUCCESS;
if ( !*newval.psz_string )
{
- msg_rc( "please provide one of the following paramaters\r\n[on|off|up|down|left|right|select]\r\n" );
+ msg_rc( _("please provide one of the following paramaters") );
+ msg_rc( "[on|off|up|down|left|right|select]" );
return i_error;
}
-
+
p_playlist = vlc_object_find( p_this, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
if( !p_playlist )
return VLC_ENOOBJ;
if( ( ( val.i_int == PAUSE_S ) || ( val.i_int == PLAYLIST_PAUSED ) ) &&
( strcmp( newval.psz_string, "select" ) != 0 ) )
{
- msg_rc( _("press menu select to continue\r\n") );
+ msg_rc( _("press menu select or pause to continue") );
vlc_object_release( p_playlist );
return VLC_EGENERIC;
}
- vlc_object_release( p_playlist );
}
-
+ vlc_object_release( p_playlist );
+
val.psz_string = strdup( newval.psz_string );
if( !strcmp( val.psz_string, "on" ) || !strcmp( val.psz_string, "show" ))
osd_MenuShow( p_this );
osd_MenuActivate( p_this );
else
{
- msg_rc( "please provide one of the following paramaters\r\n[on|off|up|down|left|right|select]\r\n" );
+ msg_rc( _("please provide one of the following paramaters") );
+ msg_rc( "[on|off|up|down|left|right|select]" );
if( val.psz_string ) free( val.psz_string );
return i_error;
}
while( !p_intf->b_die && *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,
- p_buffer + *pi_size, 1, INTF_IDLE_SLEEP ) ) > 0 )
+ (uint8_t *)p_buffer + *pi_size, 1, INTF_IDLE_SLEEP ) ) > 0 )
{
if( p_buffer[ *pi_size ] == '\r' || p_buffer[ *pi_size ] == '\n' )
break;
return p_item;
}
+
+/*****************************************************************************
+ * checkUpdates : check for updates
+ ****************************************************************************/
+static void checkUpdates( intf_thread_t *p_intf, char *psz_arg )
+{
+ update_iterator_t *p_uit;
+ update_t *p_u = update_New( p_intf );
+ if( p_u == NULL ) return;
+ p_uit = update_iterator_New( p_u );
+ if( p_uit )
+ {
+ int s = 0, t = 0;
+
+ if( strstr( psz_arg, "newer" ) )
+ s |= UPDATE_RELEASE_STATUS_NEWER;
+ if( strstr( psz_arg, "equal" ) )
+ s |= UPDATE_RELEASE_STATUS_EQUAL;
+ if( strstr( psz_arg, "older" ) )
+ s |= UPDATE_RELEASE_STATUS_OLDER;
+ if( s ) p_uit->i_rs = s;
+ else p_uit->i_rs = UPDATE_RELEASE_STATUS_NEWER;
+
+ if( strstr( psz_arg, "undef" ) )
+ t |= UPDATE_FILE_TYPE_UNDEF;
+ if( strstr( psz_arg, "info" ) )
+ t |= UPDATE_FILE_TYPE_INFO;
+ if( strstr( psz_arg, "source" ) )
+ t |= UPDATE_FILE_TYPE_SOURCE;
+ if( strstr( psz_arg, "binary" ) )
+ t |= UPDATE_FILE_TYPE_BINARY;
+ if( strstr( psz_arg, "plugin" ) )
+ t |= UPDATE_FILE_TYPE_PLUGIN;
+ if( t ) p_uit->i_t = t;
+
+ update_Check( p_u, VLC_FALSE );
+ update_iterator_Action( p_uit, UPDATE_MIRROR );
+ msg_rc( "\nUsing mirror: %s (%s) [%s]",
+ p_uit->mirror.psz_name,
+ p_uit->mirror.psz_location,
+ p_uit->mirror.psz_type );
+ while( (s = update_iterator_Action( p_uit, UPDATE_FILE )) != UPDATE_FAIL )
+ {
+ char *psz_tmp;
+ if( s & UPDATE_RELEASE )
+ {
+ switch( p_uit->release.i_status )
+ {
+ case UPDATE_RELEASE_STATUS_OLDER:
+ psz_tmp = strdup( "older" );
+ break;
+ case UPDATE_RELEASE_STATUS_EQUAL:
+ psz_tmp = strdup( "equal" );
+ break;
+ case UPDATE_RELEASE_STATUS_NEWER:
+ psz_tmp = strdup( "newer" );
+ break;
+ default:
+ psz_tmp = strdup( "?!?" );
+ break;
+ }
+ msg_rc( "\n+----[ VLC %s %s (%s) ] ",
+ p_uit->release.psz_version,
+ p_uit->release.psz_svn_revision,
+ psz_tmp );
+ free( psz_tmp );
+ }
+ switch( p_uit->file.i_type )
+ {
+ case UPDATE_FILE_TYPE_UNDEF:
+ psz_tmp = strdup( "undef" );
+ break;
+ case UPDATE_FILE_TYPE_INFO:
+ psz_tmp = strdup( "info" );
+ break;
+ case UPDATE_FILE_TYPE_SOURCE:
+ psz_tmp = strdup( "source" );
+ break;
+ case UPDATE_FILE_TYPE_BINARY:
+ psz_tmp = strdup( "binary" );
+ break;
+ case UPDATE_FILE_TYPE_PLUGIN:
+ psz_tmp = strdup( "plugin" );
+ break;
+ default:
+ psz_tmp = strdup( "?!?" );
+ break;
+ }
+ msg_rc( "| %s (%s)", p_uit->file.psz_description, psz_tmp );
+ free( psz_tmp );
+ if( p_uit->file.l_size )
+ {
+ if( p_uit->file.l_size > 1024 * 1024 * 1024 )
+ asprintf( &psz_tmp, "(%ld GB)",
+ p_uit->file.l_size / (1024*1024*1024) );
+ if( p_uit->file.l_size > 1024 * 1024 )
+ asprintf( &psz_tmp, "(%ld MB)",
+ p_uit->file.l_size / (1024*1024) );
+ else if( p_uit->file.l_size > 1024 )
+ asprintf( &psz_tmp, "(%ld kB)",
+ p_uit->file.l_size / 1024 );
+ else
+ asprintf( &psz_tmp, "(%ld B)", p_uit->file.l_size );
+ }
+ else
+ {
+ psz_tmp = strdup( "" );
+ }
+ msg_rc( "| %s %s", p_uit->file.psz_url, psz_tmp );
+ msg_rc( "+----" );
+ free( psz_tmp );
+ }
+ msg_rc( "" );
+ update_iterator_Delete( p_uit );
+ }
+ update_Delete( p_u );
+}
projects / vlc / blobdiff