*
* 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/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 vlc_bool_t ReadCommand( intf_thread_t *, char *, int * );
-static playlist_item_t *parse_MRL( intf_thread_t *, char * );
+static input_item_t *parse_MRL( intf_thread_t *, char * );
static int Input ( vlc_object_t *, char const *,
vlc_value_t, vlc_value_t, void * );
vlc_value_t, vlc_value_t, void * );
static int 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 *,
vlc_module_begin();
set_shortname( _("RC"));
set_category( CAT_INTERFACE );
- set_subcategory( SUBCAT_INTERFACE_GENERAL );
+ set_subcategory( SUBCAT_INTERFACE_MAIN );
set_description( _("Remote control interface") );
add_bool( "rc-show-pos", 0, NULL, POS_TEXT, POS_LONGTEXT, VLC_TRUE );
#ifdef HAVE_ISATTY
static int Activate( vlc_object_t *p_this )
{
intf_thread_t *p_intf = (intf_thread_t*)p_this;
- playlist_t *p_playlist;
char *psz_host, *psz_unix_path;
int *pi_socket = NULL;
vlc_UrlParse( &url, psz_host, 0 );
- msg_Dbg( p_intf, "base %s port %d", url.psz_host, url.i_port );
+ msg_Dbg( p_intf, "base: %s, port: %d", url.psz_host, url.i_port );
pi_socket = net_ListenTCP(p_this, url.psz_host, url.i_port);
if( pi_socket == NULL )
CONSOLE_INTRO_MSG;
#endif
- /* Force "no-view" mode */
- p_playlist = (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
- if( p_playlist )
- {
- vlc_mutex_lock( &p_playlist->object_lock );
- p_playlist->status.i_view = -1;
- vlc_mutex_unlock( &p_playlist->object_lock );
- vlc_object_release( p_playlist );
- }
-
- msg_rc( _("Remote control interface initialized, `h' for help") );
+ msg_rc( _("Remote control interface initialized. Type `help' 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 );
}
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, "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 );
/* 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 );
p_intf->p_sys->hConsoleIn = GetStdHandle(STD_INPUT_HANDLE);
if( p_intf->p_sys->hConsoleIn == INVALID_HANDLE_VALUE )
{
- msg_Err( p_intf, "Couldn't open STD_INPUT_HANDLE" );
+ msg_Err( p_intf, "couldn't find user input handle" );
p_intf->b_die = VLC_TRUE;
}
#endif
{
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 "( 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 );
Help( p_intf, b_longhelp );
}
+ else if( !strcmp( psz_cmd, "check-updates" ) )
+ {
+ checkUpdates( p_intf, psz_arg );
+ }
else switch( psz_cmd[0] )
{
case 'f':
break;
default:
- msg_rc(_("unknown command `%s', type `help' for help"), psz_cmd);
+ msg_rc(_("Unknown command `%s'. Type `help' for help."), psz_cmd);
break;
}
msg_rc(_("+----[ Remote control commands ]"));
msg_rc( "| ");
msg_rc(_("| add XYZ . . . . . . . . . . add XYZ to playlist"));
+ msg_rc(_("| enqueue XYZ . . . . . . . queue XYZ to playlist"));
msg_rc(_("| playlist . . . show items currently in playlist"));
msg_rc(_("| play . . . . . . . . . . . . . . . . play stream"));
msg_rc(_("| stop . . . . . . . . . . . . . . . . stop stream"));
msg_rc(_("| normal . . . . . . . . normal playing of stream"));
msg_rc(_("| f [on|off] . . . . . . . . . . toggle fullscreen"));
msg_rc(_("| info . . . information about the current stream"));
+ msg_rc(_("| get_time . . seconds elapsed since stream's beginning"));
+ msg_rc(_("| is_playing . . 1 if a stream plays, 0 otherwise"));
+ msg_rc(_("| get_title . . . the title of the current stream"));
+ msg_rc(_("| get_length . . the length of the current stream"));
msg_rc( "| ");
msg_rc(_("| volume [X] . . . . . . . . set/get audio volume"));
msg_rc(_("| volup [X] . . . . . raise audio volume X steps"));
msg_rc(_("| 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-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(_("| mosaic-position {0=auto,1=fixed} . . . .position"));
msg_rc(_("| mosaic-rows #. . . . . . . . . . .number of rows"));
msg_rc(_("| mosaic-cols #. . . . . . . . . . .number of cols"));
+ msg_rc(_("| mosaic-order id(,id)* . . . . order of pictures "));
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"));
if( ( ( val.i_int == PAUSE_S ) || ( val.i_int == PLAYLIST_PAUSED ) ) &&
( strcmp( psz_cmd, "pause" ) != 0 ) )
{
- msg_rc( _("press menu select or pause to continue") );
+ msg_rc( _("Press menu select or pause to continue.") );
vlc_object_release( p_input );
return VLC_EGENERIC;
}
}
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;
var_Get( p_input, "chapter", &val );
var_Change( p_input, "chapter", VLC_VAR_GETCHOICES,
&val_list, NULL );
- msg_rc( "Currently playing chapter %d/%d",
+ 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 );
var_Get( p_input, "title", &val );
var_Change( p_input, "title", VLC_VAR_GETCHOICES,
&val_list, NULL );
- msg_rc( "Currently playing title %d/%d",
+ 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 );
static int Playlist( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
- vlc_value_t val;
intf_thread_t *p_intf = (intf_thread_t*)p_this;
playlist_t *p_playlist;
FIND_ANYWHERE );
if( !p_playlist )
{
+ msg_Err( p_this, "no playlist" );
return VLC_ENOOBJ;
}
{
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( _("press menu select or pause to continue") );
+ 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 );
return VLC_EGENERIC;
}
}
else if( !strcmp( psz_cmd, "play" ) )
{
- if( p_playlist->p_input )
- {
- vlc_value_t val;
-
- var_Get( p_playlist->p_input, "rate", &val );
- if( val.i_int != INPUT_RATE_DEFAULT )
- {
- val.i_int = INPUT_RATE_DEFAULT;
- var_Set( p_playlist->p_input, "rate", val );
- }
- else
- {
- playlist_Play( p_playlist );
- }
- }
+ msg_Warn( p_playlist, "play" );
+ playlist_Play( p_playlist );
}
else if (!strcmp( psz_cmd, "goto" ) )
{
- if( strlen( newval.psz_string ) > 0)
- {
- val.i_int = atoi( newval.psz_string );
- playlist_Goto( p_playlist, val.i_int);
- }
+ msg_Err( p_playlist, "goto is deprecated" );
}
else if( !strcmp( psz_cmd, "stop" ) )
{
else if( !strcmp( psz_cmd, "add" ) &&
newval.psz_string && *newval.psz_string )
{
- playlist_item_t *p_item = parse_MRL( p_intf, newval.psz_string );
+ input_item_t *p_item = parse_MRL( p_intf, newval.psz_string );
if( p_item )
{
- msg_rc( "trying to add %s to playlist", newval.psz_string );
- playlist_AddItem( p_playlist, 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 );
}
}
- else if( !strcmp( psz_cmd, "playlist" ) )
+ else if( !strcmp( psz_cmd, "enqueue" ) &&
+ newval.psz_string && *newval.psz_string )
{
- int i;
+ playlist_item_t *p_item = parse_MRL( p_intf, newval.psz_string );
- for ( i = 0; i < p_playlist->i_size; i++ )
- {
- 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 ?
- p_playlist->pp_items[i]->pp_parents[0]->p_parent->input.psz_name : "" );
- }
- if ( i == 0 )
+ if( p_item )
{
- msg_rc( "| no entries" );
+ msg_rc( "trying to enqueue %s to playlist", newval.psz_string );
+ playlist_PlaylistAddInput( p_playlist, p_item,
+ PLAYLIST_APPEND, PLAYLIST_END );
}
}
+ else if( !strcmp( psz_cmd, "playlist" ) )
+ {
+ msg_Dbg( p_playlist, "Dumping category" );
+ playlist_NodeDump( p_playlist, p_playlist->p_root_category, 0 );
+ msg_Dbg( p_playlist, "Dumping Onelevel" );
+ playlist_NodeDump( p_playlist, p_playlist->p_root_onelevel, 0 );
+ }
+ else if( !strcmp( psz_cmd, "sort" ))
+ {
+ playlist_RecursiveNodeSort( p_playlist, p_playlist->p_root_onelevel,
+ SORT_ARTIST, ORDER_NORMAL );
+ }
else if( !strcmp( psz_cmd, "status" ) )
{
if( p_playlist->p_input )
{
/* Replay the current state of the system. */
- msg_rc( STATUS_CHANGE "( New input: %s )", p_playlist->p_input->input.p_item->psz_uri );
+ 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 );
var_Get( p_input, "state", &val );
if( ( val.i_int == PAUSE_S ) || ( val.i_int == PLAYLIST_PAUSED ) )
{
- msg_rc( _("press pause to continue") );
+ msg_rc( _("Type 'pause' to continue.") );
vlc_object_release( p_playlist );
vlc_object_release( p_input );
return VLC_EGENERIC;
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 );
var_Set( p_input->p_libvlc, "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, "mosaic-order", val );
+ }
+ }
else if( !strcmp( psz_cmd, "mosaic-keep-aspect-ratio" ) )
{
if( strlen( newval.psz_string ) > 0)
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!" );
+ msg_rc( "Unknown command!" );
}
vlc_object_release( p_playlist );
{
playlist_Stop( p_playlist );
vlc_object_release( p_playlist );
- }
+ }
p_this->p_vlc->b_die = VLC_TRUE;
return VLC_SUCCESS;
}
{
intf_thread_t *p_newintf = NULL;
- p_newintf = intf_Create( p_this->p_vlc, newval.psz_string );
+ p_newintf = intf_Create( p_this->p_vlc, newval.psz_string, 0, NULL );
if( p_newintf )
{
p_newintf->b_block = VLC_FALSE;
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") );
+ msg_rc( _("Type 'menu select' or 'pause' to continue.") );
vlc_object_release( p_input );
return VLC_EGENERIC;
}
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", AOUT_VOLUME_MIN,
+ msg_rc( "Volume must be in the range %d-%d.", AOUT_VOLUME_MIN,
AOUT_VOLUME_MAX );
i_error = VLC_EBADVAR;
}
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") );
+ msg_rc( _("Type 'menu select' or 'pause' to continue.") );
vlc_object_release( p_input );
return VLC_EGENERIC;
}
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") );
+ msg_rc( _("Type 'menu select' or 'pause' to continue.") );
vlc_object_release( p_input );
return VLC_EGENERIC;
}
if ( !*newval.psz_string )
{
- msg_rc( _("please provide one of the following paramaters") );
+ msg_rc( _("Please provide one of the following parameters:") );
msg_rc( "[on|off|up|down|left|right|select]" );
return i_error;
}
if( ( ( val.i_int == PAUSE_S ) || ( val.i_int == PLAYLIST_PAUSED ) ) &&
( strcmp( newval.psz_string, "select" ) != 0 ) )
{
- msg_rc( _("press menu select or pause to continue") );
+ msg_rc( _("Type 'menu select' or 'pause' to continue.") );
vlc_object_release( p_playlist );
return VLC_EGENERIC;
}
osd_MenuActivate( p_this );
else
{
- msg_rc( _("please provide one of the following paramaters") );
+ msg_rc( _("Please provide one of the following parameters:") );
msg_rc( "[on|off|up|down|left|right|select]" );
if( val.psz_string ) free( val.psz_string );
return i_error;
}
/*****************************************************************************
- * parse_MRL: build a playlist item from a full mrl
+ * parse_MRL: build a input item from a full mrl
*****************************************************************************
* MRL format: "simplified-mrl [:option-name[=option-value]]"
* We don't check for '"' or '\'', we just assume that a ':' that follows a
* space is a new option. Should be good enough for our purpose.
*****************************************************************************/
-static playlist_item_t *parse_MRL( intf_thread_t *p_intf, char *psz_mrl )
+static input_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;
+ input_item_t *p_item = NULL;
char *psz_item = NULL, *psz_item_mrl = NULL, *psz_orig;
char **ppsz_options = NULL;
int i, i_options = 0;
/* Now create a playlist item */
if( psz_item_mrl )
{
- p_item = playlist_ItemNew( p_intf, psz_item_mrl, psz_item_mrl );
+ p_item = input_ItemNew( p_intf, psz_item_mrl, psz_item_mrl );
for( i = 0; i < i_options; i++ )
{
- playlist_ItemAddOption( p_item, ppsz_options[i] );
+ vlc_input_item_AddOption( p_item, ppsz_options[i] );
}
}
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