/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#include <vlc/vlc.h>
#include <errno.h> /* ENOMEM */
#include <ctype.h>
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 );
+static int Statistics ( vlc_object_t *, char const *,
+ vlc_value_t, vlc_value_t, void * );
+
+static int updateStatistics( intf_thread_t *, input_item_t *);
+#if 0 && defined( UPDATE_CHECK )
+static void checkUpdates( intf_thread_t *p_intf );
+#endif
/* Status Callbacks */
static int TimeOffsetChanged( vlc_object_t *, char const *,
#endif
};
-#ifdef HAVE_VARIADIC_MACROS
-# define msg_rc( psz_format, args... ) \
- __msg_rc( p_intf, psz_format, ## args )
-#endif
+#define msg_rc( ... ) __msg_rc( p_intf, __VA_ARGS__ )
static void __msg_rc( intf_thread_t *p_intf, const char *psz_fmt, ... )
{
add_string( "rc-host", 0, NULL, HOST_TEXT, HOST_LONGTEXT, VLC_TRUE );
set_capability( "interface", 20 );
+
set_callbacks( Activate, Deactivate );
vlc_module_end();
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 )
ADD( "adev", STRING, AudioConfig )
ADD( "achan", STRING, AudioConfig )
+ /* misc menu commands */
+ ADD( "stats", BOOL, Statistics )
+
#undef ADD
}
/* Is there something to do? */
if( !b_complete ) continue;
-
/* Skip heading spaces */
psz_cmd = p_buffer;
while( *psz_cmd == ' ' )
}
else
{
- psz_arg = "";
+ psz_arg = (char*)"";
}
/* module specfic commands: @<module name> <command> <args...> */
Help( p_intf, b_longhelp );
}
+#if 0 && defined( 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(_("| normal . . . . . . . . . . normal playing of stream"));
msg_rc(_("| f [on|off] . . . . . . . . . . . . toggle fullscreen"));
msg_rc(_("| info . . . . . information about the current stream"));
+ msg_rc(_("| stats . . . . . . . . show statistical information"));
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(_("| 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"));
+#if 0 && defined( 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"));
static int TimeOffsetChanged( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
+ VLC_UNUSED(p_this); VLC_UNUSED(psz_cmd);
+ VLC_UNUSED(oldval); VLC_UNUSED(newval);
intf_thread_t *p_intf = (intf_thread_t*)p_data;
input_thread_t *p_input = NULL;
static int VolumeChanged( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
+ VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval); VLC_UNUSED(newval);
intf_thread_t *p_intf = (intf_thread_t*)p_data;
vlc_mutex_lock( &p_intf->p_sys->status_lock );
static int StateChanged( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
+ VLC_UNUSED(p_this); VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval);
intf_thread_t *p_intf = (intf_thread_t*)p_data;
playlist_t *p_playlist = NULL;
input_thread_t *p_input = NULL;
p_playlist = vlc_object_find( p_input, VLC_OBJECT_PLAYLIST, FIND_PARENT );
if( p_playlist )
{
- char cmd[5] = "";
+ char cmd[6];
switch( p_playlist->status.i_status )
{
case PLAYLIST_STOPPED:
- strncpy( &cmd[0], "stop", 4);
- cmd[4] = '\0';
+ strcpy( cmd, "stop" );
break;
case PLAYLIST_RUNNING:
- strncpy( &cmd[0], "play", 4);
- cmd[4] = '\0';
+ strcpy( cmd, "play" );
break;
case PLAYLIST_PAUSED:
- strncpy( &cmd[0], "pause", 5);
- cmd[5] = '\0';
+ strcpy( cmd, "pause" );
break;
+ default:
+ cmd[0] = '\0';
} /* var_GetInteger( p_input, "state" ) */
msg_rc( STATUS_CHANGE "( %s state: %d )", &cmd[0], newval.i_int );
vlc_object_release( p_playlist );
static int RateChanged( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
+ VLC_UNUSED(p_this); VLC_UNUSED(psz_cmd);
+ VLC_UNUSED(oldval); VLC_UNUSED(newval);
intf_thread_t *p_intf = (intf_thread_t*)p_data;
input_thread_t *p_input = NULL;
static int Input( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
+ VLC_UNUSED(oldval); VLC_UNUSED(p_data);
intf_thread_t *p_intf = (intf_thread_t*)p_this;
input_thread_t *p_input;
vlc_value_t val;
}
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;
&val, &text );
msg_rc( "+----[ end of %s ]", val_name.psz_string );
- if( val_name.psz_string ) free( val_name.psz_string );
+ free( val_name.psz_string );
i_error = VLC_SUCCESS;
}
static int Playlist( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
+ VLC_UNUSED(oldval); VLC_UNUSED(p_data);
vlc_value_t val;
intf_thread_t *p_intf = (intf_thread_t*)p_this;
}
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" ) )
{
if( p_item )
{
msg_rc( "Trying to add %s to playlist.", newval.psz_string );
- playlist_AddInput( p_playlist, p_item,
+ if( playlist_AddInput( p_playlist, p_item,
PLAYLIST_GO|PLAYLIST_APPEND, PLAYLIST_END, VLC_TRUE,
- VLC_FALSE );
+ VLC_FALSE ) != VLC_SUCCESS );
+ {
+ return VLC_EGENERIC;
+ }
}
}
else if( !strcmp( psz_cmd, "enqueue" ) &&
if( p_item )
{
msg_rc( "trying to enqueue %s to playlist", newval.psz_string );
- playlist_AddInput( p_playlist, p_item,
+ if( playlist_AddInput( p_playlist, p_item,
PLAYLIST_APPEND, PLAYLIST_END, VLC_TRUE,
- VLC_FALSE);
+ VLC_FALSE ) != VLC_SUCCESS )
+ {
+ return VLC_EGENERIC;
+ }
}
}
else if( !strcmp( psz_cmd, "playlist" ) )
msg_rc( STATUS_CHANGE "( audio volume: %d )",
config_GetInt( p_intf, "volume" ));
- vlc_mutex_lock( &p_playlist->object_lock );
+ PL_LOCK;
switch( p_playlist->status.i_status )
{
case PLAYLIST_STOPPED:
msg_rc( STATUS_CHANGE "( state unknown )" );
break;
}
- vlc_mutex_unlock( &p_playlist->object_lock );
+ PL_UNLOCK;
}
}
static int Quit( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
+ VLC_UNUSED(p_data); VLC_UNUSED(psz_cmd);
+ VLC_UNUSED(oldval); VLC_UNUSED(newval);
playlist_t *p_playlist;
p_playlist = vlc_object_find( p_this, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
static int Intf( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
+ VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval); VLC_UNUSED(p_data);
intf_thread_t *p_newintf = NULL;
p_newintf = intf_Create( p_this->p_libvlc, newval.psz_string, 0, NULL );
static int Volume( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
+ VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval); VLC_UNUSED(p_data);
intf_thread_t *p_intf = (intf_thread_t*)p_this;
input_thread_t *p_input = NULL;
int i_error = VLC_EGENERIC;
static int VolumeMove( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
+ VLC_UNUSED(oldval); VLC_UNUSED(p_data);
intf_thread_t *p_intf = (intf_thread_t*)p_this;
audio_volume_t i_volume;
input_thread_t *p_input = NULL;
static int VideoConfig( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
+ VLC_UNUSED(oldval); VLC_UNUSED(p_data);
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" ) )
{
&val, &text );
msg_rc( "+----[ end of %s ]", val_name.psz_string );
- if( val_name.psz_string ) free( val_name.psz_string );
+ free( val_name.psz_string );
i_error = VLC_SUCCESS;
}
static int AudioConfig( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
+ VLC_UNUSED(oldval); VLC_UNUSED(p_data);
intf_thread_t *p_intf = (intf_thread_t*)p_this;
input_thread_t *p_input = NULL;
aout_instance_t * p_aout;
&val, &text );
msg_rc( "+----[ end of %s ]", val_name.psz_string );
- if( val_name.psz_string ) free( val_name.psz_string );
+ free( val_name.psz_string );
i_error = VLC_SUCCESS;
}
else
static int Menu( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
+ VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval); VLC_UNUSED(p_data);
intf_thread_t *p_intf = (intf_thread_t*)p_this;
playlist_t *p_playlist = NULL;
vlc_value_t val;
{
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;
+ free( val.psz_string );
+ return i_error;
}
i_error = VLC_SUCCESS;
- if( val.psz_string ) free( val.psz_string );
+ free( val.psz_string );
return i_error;
}
+static int Statistics ( vlc_object_t *p_this, char const *psz_cmd,
+ vlc_value_t oldval, vlc_value_t newval, void *p_data )
+{
+ VLC_UNUSED(oldval); VLC_UNUSED(newval); VLC_UNUSED(p_data);
+ intf_thread_t *p_intf = (intf_thread_t*)p_this;
+ input_thread_t *p_input = NULL;
+ int i_error;
+
+ p_input = vlc_object_find( p_this, VLC_OBJECT_INPUT, FIND_ANYWHERE );
+ if( !p_input )
+ return VLC_ENOOBJ;
+
+ if( !strcmp( psz_cmd, "stats" ) )
+ {
+ vlc_mutex_lock( &input_GetItem(p_input)->lock );
+ updateStatistics( p_intf, input_GetItem(p_input) );
+ vlc_mutex_unlock( &input_GetItem(p_input)->lock );
+ }
+ /*
+ * sanity check
+ */
+ else
+ {
+ msg_rc(_("Unknown command!") );
+ }
+
+ vlc_object_release( p_input );
+ i_error = VLC_SUCCESS;
+ return i_error;
+}
+
+static int updateStatistics( intf_thread_t *p_intf, input_item_t *p_item )
+{
+ if( !p_item ) return VLC_EGENERIC;
+
+ vlc_mutex_lock( &p_item->p_stats->lock );
+ msg_rc( "+----[ begin of statistical info ]" );
+
+ /* Input */
+ msg_rc(_("+-[Incoming]"));
+ msg_rc(_("| input bytes read : %8.0f kB"),
+ (float)(p_item->p_stats->i_read_bytes)/1000 );
+ msg_rc(_("| input bitrate : %6.0f kb/s"),
+ (float)(p_item->p_stats->f_input_bitrate)*8000 );
+ msg_rc(_("| demux bytes read : %8.0f kB"),
+ (float)(p_item->p_stats->i_demux_read_bytes)/1000 );
+ msg_rc(_("| demux bitrate : %6.0f kb/s"),
+ (float)(p_item->p_stats->f_demux_bitrate)*8000 );
+ msg_rc("|");
+ /* Video */
+ msg_rc(_("+-[Video Decoding]"));
+ msg_rc(_("| video decoded : %5i"),
+ p_item->p_stats->i_decoded_video );
+ msg_rc(_("| frames displayed : %5i"),
+ p_item->p_stats->i_displayed_pictures );
+ msg_rc(_("| frames lost : %5i"),
+ p_item->p_stats->i_lost_pictures );
+ msg_rc("|");
+ /* Audio*/
+ msg_rc(_("+-[Audio Decoding]"));
+ msg_rc(_("| audio decoded : %5i"),
+ p_item->p_stats->i_decoded_audio );
+ msg_rc(_("| buffers played : %5i"),
+ p_item->p_stats->i_played_abuffers );
+ msg_rc(_("| buffers lost : %5i"),
+ p_item->p_stats->i_lost_abuffers );
+ msg_rc("|");
+ /* Sout */
+ msg_rc(_("+-[Streaming]"));
+ msg_rc(_("| packets sent : %5i"), p_item->p_stats->i_sent_packets );
+ msg_rc(_("| bytes sent : %8.0f kB"),
+ (float)(p_item->p_stats->i_sent_bytes)/1000 );
+ msg_rc(_("| sending bitrate : %6.0f kb/s"),
+ (float)(p_item->p_stats->f_send_bitrate*8)*1000 );
+ msg_rc("|");
+ msg_rc( "+----[ end of statistical info ]" );
+ vlc_mutex_unlock( &p_item->p_stats->lock );
+
+ return VLC_SUCCESS;
+}
+
#ifdef WIN32
vlc_bool_t ReadWin32( intf_thread_t *p_intf, char *p_buffer, int *pi_size )
{
}
#endif
- int i_socket = p_intf->p_sys->i_socket == -1 ? 0 : p_intf->p_sys->i_socket;
- /* 0 == STDIN_FILENO */
-
- while( !intf_ShouldDie( p_intf ) && *pi_size < MAX_LINE_LENGTH )
+ while( !intf_ShouldDie( p_intf ) && *pi_size < MAX_LINE_LENGTH &&
+ (i_read = net_Read( 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, VLC_FALSE ) ) > 0 )
{
- i_read = net_Read( p_intf, i_socket, NULL,
- (uint8_t *)p_buffer + *pi_size, 1, VLC_FALSE );
-
- if( i_read > 0 )
- {
- if( p_buffer[ *pi_size ] == '\r' || p_buffer[ *pi_size ] == '\n' )
- break;
-
- (*pi_size)++;
- }
- else if( i_read == 0 )
- break;
- else if( errno != EINTR )
- /* we try again if a system call was interrupted */
+ if( p_buffer[ *pi_size ] == '\r' || p_buffer[ *pi_size ] == '\n' )
break;
+
+ (*pi_size)++;
}
/* Connection closed */
/*****************************************************************************
* checkUpdates : check for updates
****************************************************************************/
-static void checkUpdates( intf_thread_t *p_intf, char *psz_arg )
+#if 0 && defined( UPDATE_CHECK )
+static void checkUpdates( intf_thread_t *p_intf )
{
- update_iterator_t *p_uit;
+ /*TODO: - modify this to delete p_update to avoid a memory leak !
+ - complete the function wich is not working obiously !
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 );
+ var_AddCallback( p_intf->p_libvlc, "update-notify", updatesCallback, p_intf );
+
+ msg_rc( "\nChecking for updates" );
+ update_Check( p_u );*/
}
+#endif
projects / vlc / blobdiff