/*****************************************************************************
* 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>
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 *,
var_Create( p_intf, "add", VLC_VAR_STRING | VLC_VAR_ISCOMMAND );
var_AddCallback( p_intf, "add", Playlist, NULL );
+ var_Create( p_intf, "repeat", VLC_VAR_STRING | VLC_VAR_ISCOMMAND );
+ var_AddCallback( p_intf, "repeat", Playlist, NULL );
+ var_Create( p_intf, "loop", VLC_VAR_STRING | VLC_VAR_ISCOMMAND );
+ var_AddCallback( p_intf, "loop", 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, "mosaic-xoffset", Other, NULL );
var_Create( p_intf, "mosaic-yoffset", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND );
var_AddCallback( p_intf, "mosaic-yoffset", Other, NULL );
+ var_Create( p_intf, "mosaic-offsets", VLC_VAR_STRING | VLC_VAR_ISCOMMAND );
+ var_AddCallback( p_intf, "mosaic-offsets", Other, NULL );
var_Create( p_intf, "mosaic-align", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND );
var_AddCallback( p_intf, "mosaic-align", Other, NULL );
var_Create( p_intf, "mosaic-vborder", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND );
VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND );
var_AddCallback( p_intf, "mosaic-keep-aspect-ratio", Other, NULL );
- /* time on the fly items */
- var_Create( p_intf, "time-format", VLC_VAR_VOID | VLC_VAR_ISCOMMAND );
- var_AddCallback( p_intf, "time-format", Other, NULL );
- var_Create( p_intf, "time-x", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND );
- var_AddCallback( p_intf, "time-x", Other, NULL );
- var_Create( p_intf, "time-y", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND );
- var_AddCallback( p_intf, "time-y", Other, NULL );
- var_Create( p_intf, "time-position", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND );
- var_AddCallback( p_intf, "time-position", Other, NULL );
- var_Create( p_intf, "time-color", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND );
- var_AddCallback( p_intf, "time-color", Other, NULL );
- var_Create( p_intf, "time-opacity", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND );
- 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 );
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 */
}
#endif
- while( !p_intf->b_die )
+ while( !intf_ShouldDie( p_intf ) )
{
char *psz_cmd, *psz_arg;
vlc_bool_t b_complete;
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(_("| next . . . . . . . . . . . . next playlist item"));
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(_("| status . . . . . . . . . current playlist status"));
msg_rc(_("| title [X] . . . . set/get title in current item"));
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( "| ");
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(_("| mosaic-width # . . . . . . . . . . . . . . width"));
msg_rc(_("| mosaic-xoffset # . . . .top left corner position"));
msg_rc(_("| mosaic-yoffset # . . . .top left corner position"));
+ msg_rc(_("| mosaic-offsets x,y(,x,y)*. . . . list of offsets"));
msg_rc(_("| mosaic-align 0..2,4..6,8..10. . .mosaic alignment"));
msg_rc(_("| mosaic-vborder # . . . . . . . . vertical border"));
msg_rc(_("| mosaic-hborder # . . . . . . . horizontal border"));
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;
}
static int Playlist( 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;
- playlist_t *p_playlist;
+ vlc_value_t val;
- p_playlist = vlc_object_find( p_this, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
- if( !p_playlist )
- {
- msg_Err( p_this, "no playlist" );
- return VLC_ENOOBJ;
- }
+ intf_thread_t *p_intf = (intf_thread_t*)p_this;
+ playlist_t *p_playlist = pl_Yield( p_this );
+ PL_LOCK;
if( p_playlist->p_input )
{
- 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( _("Type 'menu select' or 'pause' to continue.") );
vlc_object_release( p_playlist );
+ PL_UNLOCK;
return VLC_EGENERIC;
}
}
+ PL_UNLOCK;
/* Parse commands that require a playlist */
if( !strcmp( psz_cmd, "prev" ) )
msg_Warn( p_playlist, "play" );
playlist_Play( p_playlist );
}
+ else if( !strcmp( psz_cmd, "repeat" ) )
+ {
+ vlc_bool_t b_update = VLC_TRUE;
+
+ var_Get( p_playlist, "repeat", &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, "repeat", val );
+ }
+ msg_rc( "Setting repeat to %d", val.b_bool );
+ }
+ else if( !strcmp( psz_cmd, "loop" ) )
+ {
+ vlc_bool_t b_update = VLC_TRUE;
+
+ var_Get( p_playlist, "loop", &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, "loop", val );
+ }
+ msg_rc( "Setting loop to %d", val.b_bool );
+ }
else if (!strcmp( psz_cmd, "goto" ) )
{
+ msg_rc( _("goto is deprecated" ) );
msg_Err( p_playlist, "goto is deprecated" );
}
else if( !strcmp( psz_cmd, "stop" ) )
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" ) )
+ else if( !strcmp( psz_cmd, "mosaic-offsets" ) )
{
if( strlen( newval.psz_string ) > 0)
- {
- val.i_int = atoi( newval.psz_string );
- var_Set( p_input->p_libvlc, "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 );
- }
- 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)
- {
- 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)
- {
- val.i_int = atoi( newval.psz_string );
- var_Set( p_input->p_libvlc, "time-y", val );
+ var_Set( p_input->p_libvlc_global, "mosaic-offsets", 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 );
- }
- }
- 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 );
- }
- }
- 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 );
- }
- }
- else if( !strcmp( psz_cmd, "time-size" ) )
+ 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, "time-size", val );
+ var_Set( p_input->p_libvlc_global, "mosaic-keep-aspect-ratio", 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 )
{
while( WaitForSingleObject( p_intf->p_sys->hConsoleIn,
INTF_IDLE_SLEEP/1000 ) == WAIT_OBJECT_0 )
{
- while( !p_intf->b_die && *pi_size < MAX_LINE_LENGTH &&
+ while( !intf_ShouldDie( p_intf ) && *pi_size < MAX_LINE_LENGTH &&
ReadConsoleInput( p_intf->p_sys->hConsoleIn, &input_record,
1, &i_dw ) )
{
}
#endif
- while( !p_intf->b_die && *pi_size < MAX_LINE_LENGTH &&
+ while( !intf_ShouldDie( p_intf ) && *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,
(uint8_t *)p_buffer + *pi_size, 1, INTF_IDLE_SLEEP ) ) > 0 )
/* Now create a playlist item */
if( psz_item_mrl )
{
- p_item = input_ItemNew( p_intf, psz_item_mrl, psz_item_mrl );
+ p_item = input_ItemNew( p_intf, psz_item_mrl, NULL );
for( i = 0; i < i_options; i++ )
{
- vlc_input_item_AddOption( p_item, ppsz_options[i] );
+ input_ItemAddOption( p_item, ppsz_options[i] );
}
}
projects / vlc / blobdiff