/*****************************************************************************
* rc.c : remote control stdin/stdout module for vlc
*****************************************************************************
- * Copyright (C) 2004 - 2005 the VideoLAN team
+ * Copyright (C) 2004-2007 the VideoLAN team
* $Id$
*
* Author: Peter Surda <shurdeek@panorama.sth.ac.at>
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 );
+#ifdef UPDATE_CHECK
+static void checkUpdates( intf_thread_t *p_intf );
+#endif
/* Status Callbacks */
static int TimeOffsetChanged( vlc_object_t *, char const *,
add_string( "rc-host", 0, NULL, HOST_TEXT, HOST_LONGTEXT, VLC_TRUE );
set_capability( "interface", 20 );
+
set_callbacks( Activate, Deactivate );
vlc_module_end();
if( (i_socket = socket( AF_LOCAL, SOCK_STREAM, 0 ) ) < 0 )
{
- msg_Warn( p_intf, "can't open socket: %s", strerror(errno) );
+ msg_Warn( p_intf, "can't open socket: %m" );
free( psz_unix_path );
return VLC_EGENERIC;
}
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));
+ msg_Err (p_intf, "cannot bind UNIX socket at %s: %m",
+ psz_unix_path);
free (psz_unix_path);
net_Close (i_socket);
return VLC_EGENERIC;
if( listen( i_socket, 1 ) )
{
- msg_Warn( p_intf, "can't listen on socket: %s", strerror(errno));
+ msg_Warn( p_intf, "can't listen on socket: %m");
free( psz_unix_path );
net_Close( i_socket );
return VLC_EGENERIC;
ADD( "add", STRING, Playlist )
ADD( "repeat", STRING, Playlist )
ADD( "loop", STRING, Playlist )
+ ADD( "random", STRING, Playlist )
ADD( "enqueue", STRING, Playlist )
ADD( "playlist", VOID, Playlist )
ADD( "sort", VOID, Playlist )
ADD( "vratio", STRING, VideoConfig )
ADD( "vcrop", STRING, VideoConfig )
ADD( "vzoom", STRING, VideoConfig )
+ ADD( "snapshot", VOID, VideoConfig )
/* audio commands */
ADD( "volume", STRING, Volume )
Help( p_intf, b_longhelp );
}
+#ifdef UPDATE_CHECK
else if( !strcmp( psz_cmd, "check-updates" ) )
{
- checkUpdates( p_intf, psz_arg );
+ checkUpdates( p_intf );
}
+#endif
else if( !strcmp( psz_cmd, "key" ) || !strcmp( psz_cmd, "hotkey" ) )
{
var_SetInteger( p_intf->p_libvlc, "key-pressed",
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(_("| loop [on|off] . . . . . . . . . toggle playlist loop"));
+ msg_rc(_("| random [on|off] . . . . . . . toggle random jumping"));
+ msg_rc(_("| clear . . . . . . . . . . . . . . clear the playlist"));
msg_rc(_("| status . . . . . . . . . . . current playlist status"));
msg_rc(_("| title [X] . . . . . . set/get title in current item"));
msg_rc(_("| title_n . . . . . . . . next title in current item"));
msg_rc(_("| vratio [X] . . . . . . . set/get video aspect ratio"));
msg_rc(_("| vcrop [X] . . . . . . . . . . . set/get video crop"));
msg_rc(_("| vzoom [X] . . . . . . . . . . . set/get video zoom"));
+ msg_rc(_("| snapshot . . . . . . . . . . . . take video snapshot"));
msg_rc(_("| strack [X] . . . . . . . . . set/get subtitles track"));
msg_rc(_("| key [hotkey name] . . . . . . simulate hotkey press"));
msg_rc(_("| menu . . [on|off|up|down|left|right|select] use menu"));
msg_rc(_("| @name mosaic-cols #. . . . . . . . . . .number of cols"));
msg_rc(_("| @name mosaic-order id(,id)* . . . . order of pictures "));
msg_rc(_("| @name mosaic-keep-aspect-ratio {0,1} . . .aspect ratio"));
+#ifdef UPDATE_CHECK
msg_rc( "| ");
msg_rc(_("| check-updates [newer] [equal] [older]\n"
"| [undef] [info] [source] [binary] [plugin]"));
+#endif
msg_rc( "| ");
}
msg_rc(_("| help . . . . . . . . . . . . . . . this help message"));
}
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;
}
msg_rc( "Setting loop to %d", val.b_bool );
}
+ else if( !strcmp( psz_cmd, "random" ) )
+ {
+ vlc_bool_t b_update = VLC_TRUE;
+
+ var_Get( p_playlist, "random", &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, "random", val );
+ }
+ msg_rc( "Setting random to %d", val.b_bool );
+ }
else if (!strcmp( psz_cmd, "goto" ) )
{
- msg_rc( _("goto is deprecated" ) );
- msg_Err( p_playlist, "goto is deprecated" );
+ int i_pos = atoi( newval.psz_string );
+ /* The playlist stores 2 times the same item: onelevel & category */
+ int i_size = p_playlist->items.i_size / 2;
+
+ if( i_pos <= 0 )
+ msg_rc( _("Error: `goto' needs an argument greater than zero.") );
+ else if( i_pos <= i_size )
+ {
+ playlist_item_t *p_item, *p_parent;
+ p_item = p_parent = p_playlist->items.p_elems[i_pos*2-1];
+ while( p_parent->p_parent )
+ p_parent = p_parent->p_parent;
+ playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, VLC_TRUE,
+ p_parent, p_item );
+ }
+ else
+ msg_rc( _("Playlist has only %d elements"), i_size );
}
else if( !strcmp( psz_cmd, "stop" ) )
{
intf_thread_t *p_intf = (intf_thread_t*)p_this;
input_thread_t *p_input = NULL;
vout_thread_t * p_vout;
- const char * psz_variable;
- vlc_value_t val_name;
+ const char * psz_variable = NULL;
int i_error;
p_input = vlc_object_find( p_this, VLC_OBJECT_INPUT, FIND_ANYWHERE );
{
psz_variable = "aspect-ratio";
}
- else /* if( !strcmp( psz_cmd, "vzoom" ) ) */
+ else if( !strcmp( psz_cmd, "vzoom" ) )
{
psz_variable = "zoom";
}
-
-
- /* Get the descriptive name of the variable */
- var_Change( p_vout, psz_variable, VLC_VAR_GETTEXT,
- &val_name, NULL );
- if( !val_name.psz_string ) val_name.psz_string = strdup(psz_variable);
+ else if( !strcmp( psz_cmd, "snapshot" ) )
+ {
+ psz_variable = "video-snapshot";
+ }
if( newval.psz_string && *newval.psz_string )
{
i_error = var_Set( p_vout, psz_variable, newval );
}
}
+ else if( !strcmp( psz_cmd, "snapshot" ) )
+ {
+ i_error = var_Set( p_vout, psz_variable, newval );
+ }
else
{
/* get */
+ vlc_value_t val_name;
vlc_value_t val, text;
int i;
float f_value = 0.;
return VLC_EGENERIC;
}
+ /* Get the descriptive name of the variable */
+ var_Change( p_vout, psz_variable, VLC_VAR_GETTEXT,
+ &val_name, NULL );
+ if( !val_name.psz_string ) val_name.psz_string = strdup(psz_variable);
+
msg_rc( "+----[ %s ]", val_name.psz_string );
if( !strcmp( psz_variable, "zoom" ) )
{
/*****************************************************************************
* checkUpdates : check for updates
****************************************************************************/
-static void checkUpdates( intf_thread_t *p_intf, char *psz_arg )
+#ifdef UPDATE_CHECK
+static void checkUpdates( intf_thread_t *p_intf )
{
- 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_Check( p_u );
+ msg_rc( "\nChecking for updates" );
+
+ if( update_CompareReleaseToCurrent( p_u ) == UpdateReleaseStatusNewer )
+ msg_rc( "\n+----[ VLC %i.%i.%i%s ] ", p_u->release.i_major,
+ p_u->release.i_minor,
+ p_u->release.i_revision,
+ p_u->release.psz_extra );
+ else
+ msg_rc( "\n+----Last version" );
update_Delete( p_u );
}
+#endif
projects / vlc / blobdiff