/*****************************************************************************
* Preamble
*****************************************************************************/
+#include <vlc/vlc.h>
+
#include <stdlib.h> /* malloc(), free() */
#include <string.h>
#include <ctype.h>
#include <signal.h>
-#include <vlc/vlc.h>
#include <vlc/intf.h>
#include <vlc/aout.h>
#include <vlc/vout.h>
#include "network.h"
#include "vlc_url.h"
+#include "charset.h"
+
#if defined(AF_UNIX) && !defined(AF_LOCAL)
# define AF_LOCAL AF_UNIX
#endif
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 VolumeMove ( vlc_object_t *, char const *,
vlc_value_t, vlc_value_t, void * );
+static int VideoConfig ( vlc_object_t *, char const *,
+ vlc_value_t, vlc_value_t, void * );
static int AudioConfig ( vlc_object_t *, char const *,
vlc_value_t, vlc_value_t, void * );
static int Menu ( vlc_object_t *, char const *,
if( p_intf->p_sys->i_socket == -1 )
{
- vprintf( psz_fmt, args );
+ utf8_vfprintf( stdout, psz_fmt, args );
printf( "\r\n" );
}
else
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_Create( p_intf, "normal", VLC_VAR_VOID | VLC_VAR_ISCOMMAND );
var_AddCallback( p_intf, "normal", Input, NULL );
+ var_Create( p_intf, "atrack", VLC_VAR_STRING | VLC_VAR_ISCOMMAND );
+ var_AddCallback( p_intf, "atrack", Input, NULL );
+ var_Create( p_intf, "vtrack", VLC_VAR_STRING | VLC_VAR_ISCOMMAND );
+ var_AddCallback( p_intf, "vtrack", Input, NULL );
+ var_Create( p_intf, "strack", VLC_VAR_STRING | VLC_VAR_ISCOMMAND );
+ var_AddCallback( p_intf, "strack", Input, NULL );
+
+ /* video commands */
+ var_Create( p_intf, "vratio", VLC_VAR_STRING | VLC_VAR_ISCOMMAND );
+ var_AddCallback( p_intf, "vratio", VideoConfig, NULL );
+ var_Create( p_intf, "vcrop", VLC_VAR_STRING | VLC_VAR_ISCOMMAND );
+ var_AddCallback( p_intf, "vcrop", VideoConfig, NULL );
+ var_Create( p_intf, "vzoom", VLC_VAR_STRING | VLC_VAR_ISCOMMAND );
+ var_AddCallback( p_intf, "vzoom", VideoConfig, NULL );
+
/* audio commands */
var_Create( p_intf, "volume", VLC_VAR_STRING | VLC_VAR_ISCOMMAND );
var_AddCallback( p_intf, "volume", Volume, NULL );
/* status callbacks */
/* Listen to audio volume updates */
- var_AddCallback( p_intf->p_vlc, "volume-change", VolumeChanged, p_intf );
+ var_AddCallback( p_intf->p_libvlc, "volume-change", VolumeChanged, p_intf );
#ifdef WIN32
/* Get the file descriptor of the console input */
psz_cmd, i_ret, vlc_error( i_ret ) );
}
/* Or maybe it's a global command */
- else if( var_Type( p_intf->p_libvlc, psz_cmd ) & VLC_VAR_ISCOMMAND )
+ else if( var_Type( p_intf->p_libvlc_global, psz_cmd ) & VLC_VAR_ISCOMMAND )
{
vlc_value_t val;
int i_ret;
val.psz_string = psz_arg;
/* FIXME: it's a global command, but we should pass the
- * local object as an argument, not p_intf->p_libvlc. */
- i_ret = var_Set( p_intf->p_libvlc, psz_cmd, val );
+ * local object as an argument, not p_intf->p_libvlc_global. */
+ i_ret = var_Set( p_intf->p_libvlc_global, psz_cmd, val );
if( i_ret != 0 )
{
msg_rc( "%s: returned %i (%s)",
p_playlist = NULL;
}
- var_DelCallback( p_intf->p_vlc, "volume-change", VolumeChanged, p_intf );
+ var_DelCallback( p_intf->p_libvlc, "volume-change", VolumeChanged, p_intf );
}
static void Help( intf_thread_t *p_intf, vlc_bool_t b_longhelp)
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(_("| 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(_("| atrack [X] . . . . . . . . . set/get audio track"));
+ msg_rc(_("| vtrack [X] . . . . . . . . . set/get video track"));
+ 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(_("| strack [X] . . . . . . . set/get subtitles track"));
msg_rc(_("| menu [on|off|up|down|left|right|select] use menu"));
msg_rc( "| ");
if( !strcmp( psz_cmd, "pause" ) )
{
val.i_int = config_GetInt( p_intf, "key-play-pause" );
- var_Set( p_intf->p_vlc, "key-pressed", val );
+ var_Set( p_intf->p_libvlc, "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+extrashort" );
- var_Set( p_intf->p_vlc, "key-pressed", val );
+ var_Set( p_intf->p_libvlc, "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-extrashort" );
- var_Set( p_intf->p_vlc, "key-pressed", val );
+ var_Set( p_intf->p_libvlc, "key-pressed", val );
vlc_object_release( p_input );
return VLC_SUCCESS;
}
vlc_object_release( p_input );
return VLC_SUCCESS;
}
+ else if( !strcmp( psz_cmd, "atrack" )
+ || !strcmp( psz_cmd, "vtrack" )
+ || !strcmp( psz_cmd, "strack" ) )
+ {
+ char *psz_variable;
+ vlc_value_t val_name;
+ int i_error;
+
+ if( !strcmp( psz_cmd, "atrack" ) )
+ {
+ psz_variable = "audio-es";
+ }
+ else if( !strcmp( psz_cmd, "vtrack" ) )
+ {
+ psz_variable = "video-es";
+ }
+ else
+ {
+ psz_variable = "spu-es";
+ }
+
+ /* Get the descriptive name of the variable */
+ var_Change( p_input, psz_variable, VLC_VAR_GETTEXT,
+ &val_name, NULL );
+ if( !val_name.psz_string ) val_name.psz_string = strdup(psz_variable);
+
+ if( newval.psz_string && *newval.psz_string )
+ {
+ /* set */
+ vlc_value_t val;
+ val.i_int = atoi( newval.psz_string );
+
+ i_error = var_Set( p_input, psz_variable, val );
+ }
+ else
+ {
+ /* get */
+ vlc_value_t val, text;
+ int i, i_value;
+
+ if ( var_Get( p_input, psz_variable, &val ) < 0 )
+ {
+ vlc_object_release( p_input );
+ return VLC_EGENERIC;
+ }
+ i_value = val.i_int;
+
+ if ( var_Change( p_input, psz_variable,
+ VLC_VAR_GETLIST, &val, &text ) < 0 )
+ {
+ vlc_object_release( p_input );
+ return VLC_EGENERIC;
+ }
+
+ 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 *", val.p_list->p_values[i].i_int,
+ text.p_list->p_values[i].psz_string );
+ else
+ msg_rc( "| %i - %s", val.p_list->p_values[i].i_int,
+ text.p_list->p_values[i].psz_string );
+ }
+ var_Change( p_input, psz_variable, VLC_VAR_FREELIST,
+ &val, &text );
+ msg_rc( "+----[ end of %s ]", val_name.psz_string );
+
+ if( val_name.psz_string ) free( val_name.psz_string );
+
+ i_error = VLC_SUCCESS;
+ }
+ vlc_object_release( p_input );
+ return i_error;
+ }
/* Never reached. */
vlc_object_release( p_input );
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,
-// PLAYLIST_GO|PLAYLIST_APPEND, PLAYLIST_END );
+ playlist_PlaylistAddInput( p_playlist, p_item,
+ PLAYLIST_GO|PLAYLIST_APPEND, PLAYLIST_END );
+ }
+ }
+ else if( !strcmp( psz_cmd, "enqueue" ) &&
+ newval.psz_string && *newval.psz_string )
+ {
+ input_item_t *p_item = parse_MRL( p_intf, newval.psz_string );
+
+ if( p_item )
+ {
+ 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 )
if( strlen( newval.psz_string ) > 0 )
{
val.psz_string = newval.psz_string;
- var_Set( p_input->p_libvlc, "marq-marquee", val );
+ var_Set( p_input->p_libvlc_global, "marq-marquee", val );
}
else
{
val.psz_string = "";
- var_Set( p_input->p_libvlc, "marq-marquee", val);
+ var_Set( p_input->p_libvlc_global, "marq-marquee", val);
}
}
else if( !strcmp( psz_cmd, "marq-x" ) )
if( strlen( newval.psz_string ) > 0)
{
val.i_int = atoi( newval.psz_string );
- var_Set( p_input->p_libvlc, "marq-x", val );
+ var_Set( p_input->p_libvlc_global, "marq-x", val );
}
}
else if( !strcmp( psz_cmd, "marq-y" ) )
if( strlen( newval.psz_string ) > 0)
{
val.i_int = atoi( newval.psz_string );
- var_Set( p_input->p_libvlc, "marq-y", val );
+ var_Set( p_input->p_libvlc_global, "marq-y", val );
}
}
else if( !strcmp( psz_cmd, "marq-position" ) )
if( strlen( newval.psz_string ) > 0)
{
val.i_int = atoi( newval.psz_string );
- var_Set( p_input->p_libvlc, "marq-position", val );
+ var_Set( p_input->p_libvlc_global, "marq-position", val );
}
}
else if( !strcmp( psz_cmd, "marq-color" ) )
if( strlen( newval.psz_string ) > 0)
{
val.i_int = strtol( newval.psz_string, NULL, 0 );
- var_Set( p_input->p_libvlc, "marq-color", val );
+ var_Set( p_input->p_libvlc_global, "marq-color", val );
}
}
else if( !strcmp( psz_cmd, "marq-opacity" ) )
if( strlen( newval.psz_string ) > 0)
{
val.i_int = strtol( newval.psz_string, NULL, 0 );
- var_Set( p_input->p_libvlc, "marq-opacity", val );
+ var_Set( p_input->p_libvlc_global, "marq-opacity", val );
}
}
else if( !strcmp( psz_cmd, "marq-size" ) )
if( strlen( newval.psz_string ) > 0)
{
val.i_int = atoi( newval.psz_string );
- var_Set( p_input->p_libvlc, "marq-size", val );
+ var_Set( p_input->p_libvlc_global, "marq-size", val );
}
}
else if( !strcmp( psz_cmd, "marq-timeout" ) )
if( strlen( newval.psz_string ) > 0)
{
val.i_int = atoi( newval.psz_string );
- var_Set( p_input->p_libvlc, "mosaic-alpha", val );
+ var_Set( p_input->p_libvlc_global, "mosaic-alpha", val );
}
}
else if( !strcmp( psz_cmd, "mosaic-height" ) )
if( strlen( newval.psz_string ) > 0)
{
val.i_int = atoi( newval.psz_string );
- var_Set( p_input->p_libvlc, "mosaic-height", val );
+ var_Set( p_input->p_libvlc_global, "mosaic-height", val );
}
}
else if( !strcmp( psz_cmd, "mosaic-width" ) )
if( strlen( newval.psz_string ) > 0)
{
val.i_int = atoi( newval.psz_string );
- var_Set( p_input->p_libvlc, "mosaic-width", val );
+ var_Set( p_input->p_libvlc_global, "mosaic-width", val );
}
}
else if( !strcmp( psz_cmd, "mosaic-xoffset" ) )
if( strlen( newval.psz_string ) > 0)
{
val.i_int = atoi( newval.psz_string );
- var_Set( p_input->p_libvlc, "mosaic-xoffset", val );
+ var_Set( p_input->p_libvlc_global, "mosaic-xoffset", val );
}
}
else if( !strcmp( psz_cmd, "mosaic-yoffset" ) )
if( strlen( newval.psz_string ) > 0)
{
val.i_int = atoi( newval.psz_string );
- var_Set( p_input->p_libvlc, "mosaic-yoffset", val );
+ var_Set( p_input->p_libvlc_global, "mosaic-yoffset", val );
}
}
else if( !strcmp( psz_cmd, "mosaic-align" ) )
if( strlen( newval.psz_string ) > 0 )
{
val.i_int = atoi( newval.psz_string );
- var_Set( p_input->p_libvlc, "mosaic-align", val );
+ var_Set( p_input->p_libvlc_global, "mosaic-align", val );
}
}
else if( !strcmp( psz_cmd, "mosaic-vborder" ) )
if( strlen( newval.psz_string ) > 0)
{
val.i_int = atoi( newval.psz_string );
- var_Set( p_input->p_libvlc, "mosaic-vborder", val );
+ var_Set( p_input->p_libvlc_global, "mosaic-vborder", val );
}
}
else if( !strcmp( psz_cmd, "mosaic-hborder" ) )
if( strlen( newval.psz_string ) > 0)
{
val.i_int = atoi( newval.psz_string );
- var_Set( p_input->p_libvlc, "mosaic-hborder", val );
+ var_Set( p_input->p_libvlc_global, "mosaic-hborder", val );
}
}
else if( !strcmp( psz_cmd, "mosaic-position" ) )
if( strlen( newval.psz_string ) > 0)
{
val.i_int = atoi( newval.psz_string );
- var_Set( p_input->p_libvlc, "mosaic-position", val );
+ var_Set( p_input->p_libvlc_global, "mosaic-position", val );
}
}
else if( !strcmp( psz_cmd, "mosaic-rows" ) )
if( strlen( newval.psz_string ) > 0)
{
val.i_int = atoi( newval.psz_string );
- var_Set( p_input->p_libvlc, "mosaic-rows", val );
+ var_Set( p_input->p_libvlc_global, "mosaic-rows", val );
}
}
else if( !strcmp( psz_cmd, "mosaic-cols" ) )
if( strlen( newval.psz_string ) > 0)
{
val.i_int = atoi( newval.psz_string );
- var_Set( p_input->p_libvlc, "mosaic-cols", val );
+ var_Set( p_input->p_libvlc_global, "mosaic-cols", val );
}
}
else if( !strcmp( psz_cmd, "mosaic-order" ) )
if( strlen( newval.psz_string ) > 0)
{
val.psz_string = newval.psz_string;
- var_Set( p_input->p_libvlc, "mosaic-order", val );
+ var_Set( p_input->p_libvlc_global, "mosaic-order", val );
}
}
else if( !strcmp( psz_cmd, "mosaic-keep-aspect-ratio" ) )
if( strlen( newval.psz_string ) > 0)
{
val.i_int = atoi( newval.psz_string );
- var_Set( p_input->p_libvlc, "mosaic-keep-aspect-ratio", val );
+ var_Set( p_input->p_libvlc_global, "mosaic-keep-aspect-ratio", val );
}
}
else if( !strcmp( psz_cmd, "time-format" ) )
if( strlen( newval.psz_string ) > 0 )
{
val.psz_string = newval.psz_string;
- var_Set( p_input->p_libvlc, "time-format", val );
+ var_Set( p_input->p_libvlc_global, "time-format", val );
}
else
{
val.psz_string = "";
- var_Set( p_input->p_libvlc, "time-format", val);
+ var_Set( p_input->p_libvlc_global, "time-format", val);
}
}
else if( !strcmp( psz_cmd, "time-x" ) )
if( strlen( newval.psz_string ) > 0)
{
val.i_int = atoi( newval.psz_string );
- var_Set( p_input->p_libvlc, "time-x", val );
+ var_Set( p_input->p_libvlc_global, "time-x", val );
}
}
else if( !strcmp( psz_cmd, "time-y" ) )
if( strlen( newval.psz_string ) > 0)
{
val.i_int = atoi( newval.psz_string );
- var_Set( p_input->p_libvlc, "time-y", val );
+ var_Set( p_input->p_libvlc_global, "time-y", val );
}
}
else if( !strcmp( psz_cmd, "time-position" ) )
if( strlen( newval.psz_string ) > 0)
{
val.i_int = atoi( newval.psz_string );
- var_Set( p_input->p_libvlc, "time-position", val );
+ var_Set( p_input->p_libvlc_global, "time-position", val );
}
}
else if( !strcmp( psz_cmd, "time-color" ) )
if( strlen( newval.psz_string ) > 0)
{
val.i_int = strtol( newval.psz_string, NULL, 0 );
- var_Set( p_input->p_libvlc, "time-color", val );
+ var_Set( p_input->p_libvlc_global, "time-color", val );
}
}
else if( !strcmp( psz_cmd, "time-opacity" ) )
if( strlen( newval.psz_string ) > 0)
{
val.i_int = strtol( newval.psz_string, NULL, 0 );
- var_Set( p_input->p_libvlc, "time-opacity", val );
+ var_Set( p_input->p_libvlc_global, "time-opacity", val );
}
}
else if( !strcmp( psz_cmd, "time-size" ) )
if( strlen( newval.psz_string ) > 0)
{
val.i_int = atoi( newval.psz_string );
- var_Set( p_input->p_libvlc, "time-size", val );
+ var_Set( p_input->p_libvlc_global, "time-size", val );
}
}
else if( !strcmp( psz_cmd, "logo-file" ) )
if( strlen( newval.psz_string ) > 0 )
{
val.psz_string = newval.psz_string;
- var_Set( p_input->p_libvlc, "logo-file", val );
+ var_Set( p_input->p_libvlc_global, "logo-file", val );
}
}
else if( !strcmp( psz_cmd, "logo-x" ) )
if( strlen( newval.psz_string ) > 0)
{
val.i_int = atoi( newval.psz_string );
- var_Set( p_input->p_libvlc, "logo-x", val );
+ var_Set( p_input->p_libvlc_global, "logo-x", val );
}
}
else if( !strcmp( psz_cmd, "logo-y" ) )
if( strlen( newval.psz_string ) > 0)
{
val.i_int = atoi( newval.psz_string );
- var_Set( p_input->p_libvlc, "logo-y", val );
+ var_Set( p_input->p_libvlc_global, "logo-y", val );
}
}
else if( !strcmp( psz_cmd, "logo-position" ) )
if( strlen( newval.psz_string ) > 0)
{
val.i_int = atoi( newval.psz_string );
- var_Set( p_input->p_libvlc, "logo-position", val );
+ var_Set( p_input->p_libvlc_global, "logo-position", val );
}
}
else if( !strcmp( psz_cmd, "logo-transparency" ) )
if( strlen( newval.psz_string ) > 0)
{
val.i_int = strtol( newval.psz_string, NULL, 0 );
- var_Set( p_input->p_libvlc, "logo-transparency", val );
+ var_Set( p_input->p_libvlc_global, "logo-transparency", val );
}
}
playlist_Stop( p_playlist );
vlc_object_release( p_playlist );
}
- p_this->p_vlc->b_die = VLC_TRUE;
+ p_this->p_libvlc->b_die = VLC_TRUE;
return VLC_SUCCESS;
}
{
intf_thread_t *p_newintf = NULL;
- p_newintf = intf_Create( p_this->p_vlc, newval.psz_string, 0, NULL );
+ p_newintf = intf_Create( p_this->p_libvlc, newval.psz_string, 0, NULL );
if( p_newintf )
{
p_newintf->b_block = VLC_FALSE;
vlc_value_t keyval;
keyval.i_int = config_GetInt( p_intf, "key-vol-mute" );
- var_Set( p_intf->p_vlc, "key-pressed", keyval );
+ var_Set( p_intf->p_libvlc, "key-pressed", keyval );
}
i_error = aout_VolumeSet( p_this, i_volume );
osd_Volume( p_this );
vlc_object_release( p_input );
}
- i_volume_step = config_GetInt( p_intf->p_vlc, "volume-step" );
+ i_volume_step = config_GetInt( p_intf->p_libvlc, "volume-step" );
if ( i_nb_steps <= 0 || i_nb_steps > (AOUT_VOLUME_MAX/i_volume_step) )
{
i_nb_steps = 1;
return i_error;
}
+
+static int VideoConfig( vlc_object_t *p_this, char const *psz_cmd,
+ vlc_value_t oldval, vlc_value_t newval, void *p_data )
+{
+ intf_thread_t *p_intf = (intf_thread_t*)p_this;
+ input_thread_t *p_input = NULL;
+ vout_thread_t * p_vout;
+ 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;
+
+ p_vout = vlc_object_find( p_input, VLC_OBJECT_VOUT, FIND_CHILD );
+ vlc_object_release( p_input );
+ if( !p_vout )
+ return VLC_ENOOBJ;
+
+ if( !strcmp( psz_cmd, "vcrop" ) )
+ {
+ psz_variable = "crop";
+ }
+ else if( !strcmp( psz_cmd, "vratio" ) )
+ {
+ psz_variable = "aspect-ratio";
+ }
+ 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);
+
+ if( newval.psz_string && *newval.psz_string )
+ {
+ /* set */
+ if( !strcmp( psz_variable, "zoom" ) )
+ {
+ vlc_value_t val;
+ val.f_float = atof( newval.psz_string );
+ i_error = var_Set( p_vout, psz_variable, val );
+ }
+ else
+ {
+ i_error = var_Set( p_vout, psz_variable, newval );
+ }
+ }
+ else
+ {
+ /* get */
+ vlc_value_t val, text;
+ int i;
+ float f_value = 0.;
+ char *psz_value = NULL;
+
+ if ( var_Get( p_vout, psz_variable, &val ) < 0 )
+ {
+ vlc_object_release( p_vout );
+ return VLC_EGENERIC;
+ }
+ if( !strcmp( psz_variable, "zoom" ) )
+ {
+ f_value = val.f_float;
+ }
+ else
+ {
+ psz_value = strdup( val.psz_string );
+ }
+
+ if ( var_Change( p_vout, psz_variable,
+ VLC_VAR_GETLIST, &val, &text ) < 0 )
+ {
+ vlc_object_release( p_vout );
+ return VLC_EGENERIC;
+ }
+
+ msg_rc( "+----[ %s ]", val_name.psz_string );
+ if( !strcmp( psz_variable, "zoom" ) )
+ {
+ for ( i = 0; i < val.p_list->i_count; i++ )
+ {
+ if ( f_value == val.p_list->p_values[i].f_float )
+ msg_rc( "| %f - %s *", val.p_list->p_values[i].f_float,
+ text.p_list->p_values[i].psz_string );
+ else
+ msg_rc( "| %f - %s", val.p_list->p_values[i].f_float,
+ text.p_list->p_values[i].psz_string );
+ }
+ }
+ else
+ {
+ for ( i = 0; i < val.p_list->i_count; i++ )
+ {
+ if ( !strcmp( psz_value, val.p_list->p_values[i].psz_string ) )
+ msg_rc( "| %s - %s *", val.p_list->p_values[i].psz_string,
+ text.p_list->p_values[i].psz_string );
+ else
+ msg_rc( "| %s - %s", val.p_list->p_values[i].psz_string,
+ text.p_list->p_values[i].psz_string );
+ }
+ free( psz_value );
+ }
+ var_Change( p_vout, psz_variable, VLC_VAR_FREELIST,
+ &val, &text );
+ msg_rc( "+----[ end of %s ]", val_name.psz_string );
+
+ if( val_name.psz_string ) free( val_name.psz_string );
+
+ i_error = VLC_SUCCESS;
+ }
+ vlc_object_release( p_vout );
+ return i_error;
+}
+
static int AudioConfig( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
}
/*****************************************************************************
- * 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] );
}
}
projects / vlc / blobdiff