* rc.c : remote control stdin/stdout plugin for vlc
*****************************************************************************
* Copyright (C) 2001 VideoLAN
- * $Id: rc.c,v 1.8 2002/10/11 22:32:56 sam Exp $
+ * $Id: rc.c,v 1.27 2003/02/20 01:52:46 sigmunau Exp $
*
* Authors: Peter Surda <shurdeek@panorama.sth.ac.at>
*
#include <vlc/vlc.h>
#include <vlc/intf.h>
+#include <vlc/aout.h>
#include <vlc/vout.h>
#ifdef HAVE_UNISTD_H
#endif
#include <sys/types.h>
-#if defined( WIN32 )
-#include <winsock2.h> /* select() */
-#endif
+#include "error.h"
#define MAX_LINE_LENGTH 256
static int Activate ( vlc_object_t * );
static void Run ( intf_thread_t *p_intf );
+static int Input ( vlc_object_t *, char const *,
+ vlc_value_t, vlc_value_t, void * );
+static int Playlist ( vlc_object_t *, char const *,
+ vlc_value_t, vlc_value_t, void * );
+static int Quit ( vlc_object_t *, char const *,
+ vlc_value_t, vlc_value_t, void * );
+static int Intf ( vlc_object_t *, char const *,
+ vlc_value_t, vlc_value_t, void * );
+static int Volume ( vlc_object_t *, char const *,
+ vlc_value_t, vlc_value_t, void * );
+static int VolumeMove ( 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 * );
+
/*****************************************************************************
* Module descriptor
*****************************************************************************/
#define TTY_LONGTEXT N_("Force the rc plugin to use stdin as if it was a TTY.")
vlc_module_begin();
- add_category_hint( N_("Remote control"), NULL );
- add_bool( "rc-show-pos", 0, NULL, POS_TEXT, POS_LONGTEXT );
+ add_category_hint( N_("Remote control"), NULL, VLC_TRUE );
+ add_bool( "rc-show-pos", 0, NULL, POS_TEXT, POS_LONGTEXT, VLC_TRUE );
#ifdef HAVE_ISATTY
- add_bool( "fake-tty", 0, NULL, TTY_TEXT, TTY_LONGTEXT );
+ add_bool( "fake-tty", 0, NULL, TTY_TEXT, TTY_LONGTEXT, VLC_TRUE );
#endif
set_description( _("remote control interface module") );
set_capability( "interface", 20 );
{
intf_thread_t *p_intf = (intf_thread_t*)p_this;
-#ifdef HAVE_ISATTY
+#if defined(HAVE_ISATTY) && !defined(WIN32)
/* Check that stdin is a TTY */
if( !config_GetInt( p_intf, "fake-tty" ) && !isatty( 0 ) )
{
msg_Warn( p_intf, "fd 0 is not a TTY" );
- return 1;
+ return VLC_EGENERIC;
}
#endif
CONSOLE_INTRO_MSG;
printf( "remote control interface initialized, `h' for help\n" );
- return 0;
+ return VLC_SUCCESS;
}
/*****************************************************************************
playlist_t * p_playlist;
char p_buffer[ MAX_LINE_LENGTH + 1 ];
- vlc_bool_t b_complete = 0;
vlc_bool_t b_showpos = config_GetInt( p_intf, "rc-show-pos" );
input_info_category_t * p_category;
input_info_t * p_info;
int i_dummy;
off_t i_oldpos = 0;
off_t i_newpos;
- fd_set fds; /* stdin changed? */
- struct timeval tv; /* how long to wait */
- double f_ratio = 1;
+ double f_ratio = 1.0;
p_input = NULL;
p_playlist = NULL;
- var_Create( p_intf, "foo", VLC_VAR_STRING );
- var_Set( p_intf, "foo", (vlc_value_t)"test" );
+#ifdef WIN32
+ HANDLE hConsoleIn;
+ INPUT_RECORD input_record;
+ DWORD i_dummy2;
+#endif
+
+ /* Register commands that will be cleaned up upon object destruction */
+ var_Create( p_intf, "quit", VLC_VAR_VOID | VLC_VAR_ISCOMMAND );
+ var_AddCallback( p_intf, "quit", Quit, NULL );
+ var_Create( p_intf, "intf", VLC_VAR_STRING | VLC_VAR_ISCOMMAND );
+ var_AddCallback( p_intf, "intf", Intf, NULL );
+
+ var_Create( p_intf, "add", VLC_VAR_STRING | VLC_VAR_ISCOMMAND );
+ var_AddCallback( p_intf, "add", Playlist, NULL );
+ var_Create( p_intf, "playlist", VLC_VAR_VOID | VLC_VAR_ISCOMMAND );
+ var_AddCallback( p_intf, "playlist", 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, "stop", Playlist, NULL );
+ var_Create( p_intf, "prev", VLC_VAR_VOID | VLC_VAR_ISCOMMAND );
+ var_AddCallback( p_intf, "prev", Playlist, NULL );
+ var_Create( p_intf, "next", VLC_VAR_VOID | VLC_VAR_ISCOMMAND );
+ var_AddCallback( p_intf, "next", Playlist, NULL );
+
+ var_Create( p_intf, "pause", VLC_VAR_VOID | VLC_VAR_ISCOMMAND );
+ var_AddCallback( p_intf, "pause", Input, NULL );
+ var_Create( p_intf, "seek", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND );
+ var_AddCallback( p_intf, "seek", Input, NULL );
+ var_Create( p_intf, "title", VLC_VAR_STRING | VLC_VAR_ISCOMMAND );
+ var_AddCallback( p_intf, "title", Input, NULL );
+ var_Create( p_intf, "title_n", VLC_VAR_VOID | VLC_VAR_ISCOMMAND );
+ var_AddCallback( p_intf, "title_n", Input, NULL );
+ var_Create( p_intf, "title_p", VLC_VAR_VOID | VLC_VAR_ISCOMMAND );
+ var_AddCallback( p_intf, "title_p", Input, NULL );
+ var_Create( p_intf, "chapter", VLC_VAR_STRING | VLC_VAR_ISCOMMAND );
+ var_AddCallback( p_intf, "chapter", Input, NULL );
+ var_Create( p_intf, "chapter_n", VLC_VAR_VOID | VLC_VAR_ISCOMMAND );
+ var_AddCallback( p_intf, "chapter_n", Input, NULL );
+ var_Create( p_intf, "chapter_p", VLC_VAR_VOID | VLC_VAR_ISCOMMAND );
+ var_AddCallback( p_intf, "chapter_p", Input, NULL );
+
+ var_Create( p_intf, "volume", VLC_VAR_STRING | VLC_VAR_ISCOMMAND );
+ var_AddCallback( p_intf, "volume", Volume, NULL );
+ var_Create( p_intf, "volup", VLC_VAR_STRING | VLC_VAR_ISCOMMAND );
+ var_AddCallback( p_intf, "volup", VolumeMove, NULL );
+ var_Create( p_intf, "voldown", VLC_VAR_STRING | VLC_VAR_ISCOMMAND );
+ var_AddCallback( p_intf, "voldown", VolumeMove, NULL );
+ var_Create( p_intf, "adev", VLC_VAR_STRING | VLC_VAR_ISCOMMAND );
+ var_AddCallback( p_intf, "adev", AudioConfig, NULL );
+ var_Create( p_intf, "achan", VLC_VAR_STRING | VLC_VAR_ISCOMMAND );
+ var_AddCallback( p_intf, "achan", AudioConfig, NULL );
+
+#ifdef WIN32
+ /* Get the file descriptor of the console input */
+ hConsoleIn = GetStdHandle(STD_INPUT_HANDLE);
+ if( hConsoleIn == INVALID_HANDLE_VALUE )
+ {
+ msg_Err( p_intf, "Couldn't open STD_INPUT_HANDLE" );
+ p_intf->b_die = VLC_TRUE;
+ }
+#endif
while( !p_intf->b_die )
{
- b_complete = 0;
+ vlc_bool_t b_complete = VLC_FALSE;
+
+#ifndef WIN32
+ fd_set fds;
+ struct timeval tv;
/* Check stdin */
tv.tv_sec = 0;
- tv.tv_usec = 50000;
+ tv.tv_usec = (long)INTF_IDLE_SLEEP;
FD_ZERO( &fds );
FD_SET( STDIN_FILENO, &fds );
- i_dummy = select( 32, &fds, NULL, NULL, &tv );
+ i_dummy = select( STDIN_FILENO + 1, &fds, NULL, NULL, &tv );
+#else
+ /* On Win32, select() only works on socket descriptors */
+ i_dummy = ( WaitForSingleObject( hConsoleIn, INTF_IDLE_SLEEP/1000 )
+ == WAIT_OBJECT_0 );
+#endif
if( i_dummy > 0 )
{
int i_size = 0;
while( !p_intf->b_die
&& i_size < MAX_LINE_LENGTH
+#ifndef WIN32
&& read( STDIN_FILENO, p_buffer + i_size, 1 ) > 0
- && p_buffer[ i_size ] != '\r'
- && p_buffer[ i_size ] != '\n' )
+#else
+ && ReadConsoleInput( hConsoleIn, &input_record, 1,
+ &i_dummy2 )
+#endif
+ )
{
+#ifdef WIN32
+ if( input_record.EventType != KEY_EVENT ||
+ !input_record.Event.KeyEvent.bKeyDown )
+ {
+ /* nothing interesting */
+ continue;
+ }
+
+ p_buffer[ i_size ] =
+ input_record.Event.KeyEvent.uChar.AsciiChar;
+#endif
+
+ if( p_buffer[ i_size ] == '\r' || p_buffer[ i_size ] == '\n' )
+ {
+ break;
+ }
+
i_size++;
}
|| p_buffer[ i_size ] == '\n' )
{
p_buffer[ i_size ] = 0;
- b_complete = 1;
+ b_complete = VLC_TRUE;
}
}
}
/* Is there something to do? */
- if( b_complete == 1 )
+ if( b_complete )
{
- char *p_cmd = p_buffer;
+ char *psz_cmd, *psz_arg;
- if( !strcmp( p_cmd, "quit" ) )
- {
- p_intf->p_vlc->b_die = VLC_TRUE;
- }
- else if( !strcmp( p_cmd, "segfault" ) )
+ /* Skip heading spaces */
+ psz_cmd = p_buffer;
+ while( *psz_cmd == ' ' )
{
- raise( SIGSEGV );
+ psz_cmd++;
}
- else if( !strcmp( p_cmd, "prev" ) )
- {
- if( p_playlist ) playlist_Prev( p_playlist );
- }
- else if( !strcmp( p_cmd, "next" ) )
- {
- if( p_playlist ) playlist_Next( p_playlist );
- }
- else if( !strcmp( p_cmd, "play" ) )
- {
- if( p_playlist ) playlist_Play( p_playlist );
- }
- else if( !strcmp( p_cmd, "stop" ) )
- {
- if( p_playlist ) playlist_Stop( p_playlist );
- }
- else if( !strcmp( p_cmd, "pause" ) )
- {
- if( p_input ) input_SetStatus( p_input, INPUT_STATUS_PAUSE );
- }
- else if( !strcmp( p_cmd, "tree" ) )
+
+ /* Split psz_cmd at the first space and make sure that
+ * psz_arg is valid */
+ psz_arg = strchr( psz_cmd, ' ' );
+ if( psz_arg )
{
- vlc_dumpstructure( p_intf->p_vlc );
+ *psz_arg++ = 0;
+ while( *psz_arg == ' ' )
+ {
+ psz_arg++;
+ }
}
- else if( !strcmp( p_cmd, "list" ) )
+ else
{
- vlc_liststructure( p_intf->p_vlc );
+ psz_arg = "";
}
- else if( !strncmp( p_cmd, "setfoo ", 7 ) )
+
+ /* If the user typed a registered local command, try it */
+ if( var_Type( p_intf, psz_cmd ) & VLC_VAR_ISCOMMAND )
{
- vlc_value_t value;
- value.psz_string = p_cmd + 7;
- var_Set( p_intf, "foo", value );
+ vlc_value_t val;
+ int i_ret;
+
+ val.psz_string = psz_arg;
+ i_ret = var_Set( p_intf, psz_cmd, val );
+ printf( "%s: returned %i (%s)\n",
+ psz_cmd, i_ret, vlc_error( i_ret ) );
}
- else if( !strncmp( p_cmd, "getfoo", 6 ) )
+ /* Or maybe it's a global command */
+ else if( var_Type( p_intf->p_libvlc, psz_cmd ) & VLC_VAR_ISCOMMAND )
{
- vlc_value_t value;
- var_Get( p_intf, "foo", &value );
- printf( "current value is '%s'\n", value.psz_string );
+ 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 );
+ printf( "%s: returned %i (%s)\n",
+ psz_cmd, i_ret, vlc_error( i_ret ) );
}
- else if( !strncmp( p_cmd, "intf ", 5 ) )
- {
- intf_thread_t *p_newintf;
- char *psz_oldmodule = config_GetPsz( p_intf->p_vlc, "intf" );
-
- config_PutPsz( p_intf->p_vlc, "intf", p_cmd + 5 );
- p_newintf = intf_Create( p_intf->p_vlc );
- config_PutPsz( p_intf->p_vlc, "intf", psz_oldmodule );
-
- if( psz_oldmodule )
- {
- free( psz_oldmodule );
- }
-
- if( p_newintf )
- {
- p_newintf->b_block = VLC_FALSE;
- if( intf_RunThread( p_newintf ) )
- {
- vlc_object_detach( p_newintf );
- intf_Destroy( p_newintf );
- }
- }
- }
- else if( !strcmp( p_cmd, "info" ) )
+ else if( !strcmp( psz_cmd, "info" ) )
{
if ( p_input )
{
printf( "no input\n" );
}
}
- else switch( p_cmd[0] )
+ else switch( psz_cmd[0] )
{
- case 'a':
- case 'A':
- if( p_cmd[1] == ' ' && p_playlist )
- {
- playlist_Add( p_playlist, p_cmd + 2,
- PLAYLIST_APPEND | PLAYLIST_GO, PLAYLIST_END );
- }
- break;
-
case 'f':
case 'F':
if( p_input )
;
break;
- case 'r':
- case 'R':
- if( p_input )
- {
- for( i_dummy = 1;
- i_dummy < MAX_LINE_LENGTH && p_cmd[ i_dummy ] >= '0'
- && p_cmd[ i_dummy ] <= '9';
- i_dummy++ )
- {
- ;
- }
-
- p_cmd[ i_dummy ] = 0;
- input_Seek( p_input, (off_t)atoi( p_cmd + 1 ),
- INPUT_SEEK_SECONDS | INPUT_SEEK_SET );
- /* rcreseek(f_cpos); */
- }
- break;
-
case '?':
case 'h':
case 'H':
printf("+----[ remote control commands ]\n");
printf("| \n");
- printf("| a XYZ . . . . . . . . . . . add XYZ to playlist\n");
+ printf("| add XYZ . . . . . . . . . . add XYZ to playlist\n");
+ printf("| playlist . . . show items currently in playlist\n");
printf("| play . . . . . . . . . . . . . . . . play stream\n");
printf("| stop . . . . . . . . . . . . . . . . stop stream\n");
printf("| next . . . . . . . . . . . . next playlist item\n");
printf("| prev . . . . . . . . . . previous playlist item\n");
+ printf("| title [X] . . . . set/get title in current item\n");
+ printf("| title_n . . . . . . next title in current item\n");
+ printf("| title_p . . . . previous title in current item\n");
+ printf("| chapter [X] . . set/get chapter in current item\n");
+ printf("| chapter_n . . . . next chapter in current item\n");
+ printf("| chapter_p . . previous chapter in current item\n");
printf("| \n");
- printf("| r X . . . seek in seconds, for instance `r 3.5'\n");
+ printf("| seek X . seek in seconds, for instance `seek 12'\n");
printf("| pause . . . . . . . . . . . . . . toggle pause\n");
printf("| f . . . . . . . . . . . . . . toggle fullscreen\n");
printf("| info . . . information about the current stream\n");
printf("| \n");
+ printf("| volume [X] . . . . . . . . set/get audio volume\n");
+ printf("| volup [X] . . . . . raise audio volume X steps\n");
+ printf("| voldown [X] . . . . lower audio volume X steps\n");
+ printf("| adev [X] . . . . . . . . . set/get audio device\n");
+ printf("| achan [X]. . . . . . . . set/get audio channels\n");
+ printf("| \n");
printf("| help . . . . . . . . . . . . . this help message\n");
printf("| quit . . . . . . . . . . . . . . . . . quit vlc\n");
printf("| \n");
/* Ignore empty lines */
break;
default:
- printf( "unknown command `%s', type `help' for help\n", p_cmd );
+ printf( "unknown command `%s', type `help' for help\n", psz_cmd );
break;
}
}
vlc_object_release( p_playlist );
p_playlist = NULL;
}
+}
+
+static int Input( vlc_object_t *p_this, char const *psz_cmd,
+ vlc_value_t oldval, vlc_value_t newval, void *p_data )
+{
+ input_thread_t * p_input;
+
+ p_input = vlc_object_find( p_this, VLC_OBJECT_INPUT, FIND_ANYWHERE );
+
+ if( !p_input )
+ {
+ return VLC_ENOOBJ;
+ }
+
+ /* Parse commands that only require an input */
+ if( !strcmp( psz_cmd, "pause" ) )
+ {
+ input_SetStatus( p_input, INPUT_STATUS_PAUSE );
+ vlc_object_release( p_input );
+ return VLC_SUCCESS;
+ }
+ else if( !strcmp( psz_cmd, "seek" ) )
+ {
+ input_Seek( p_input, atoi( newval.psz_string ),
+ INPUT_SEEK_SECONDS | INPUT_SEEK_SET );
+ }
+ else if( !strcmp( psz_cmd, "chapter" ) ||
+ !strcmp( psz_cmd, "chapter_n" ) ||
+ !strcmp( psz_cmd, "chapter_p" ) )
+ {
+ unsigned int i_chapter = 0;
+
+ if( !strcmp( psz_cmd, "chapter" ) )
+ {
+ if ( *newval.psz_string )
+ {
+ /* Set. */
+ i_chapter = atoi( newval.psz_string );
+ }
+ else
+ {
+ /* Get. */
+ vlc_mutex_lock( &p_input->stream.stream_lock );
+ printf( "Currently playing chapter %d/%d\n",
+ p_input->stream.p_selected_area->i_part,
+ p_input->stream.p_selected_area->i_part_nb - 1 );
+ vlc_mutex_unlock( &p_input->stream.stream_lock );
+
+ vlc_object_release( p_input );
+ return VLC_SUCCESS;
+ }
+ }
+ else if( !strcmp( psz_cmd, "chapter_n" ) )
+ {
+ vlc_mutex_lock( &p_input->stream.stream_lock );
+ i_chapter = p_input->stream.p_selected_area->i_part + 1;
+ vlc_mutex_unlock( &p_input->stream.stream_lock );
+ }
+ else if( !strcmp( psz_cmd, "chapter_p" ) )
+ {
+ vlc_mutex_lock( &p_input->stream.stream_lock );
+ i_chapter = p_input->stream.p_selected_area->i_part - 1;
+ vlc_mutex_unlock( &p_input->stream.stream_lock );
+ }
+
+ vlc_mutex_lock( &p_input->stream.stream_lock );
+ if( ( i_chapter > 0 ) && ( i_chapter <
+ p_input->stream.p_selected_area->i_part_nb ) )
+ {
+ input_area_t *p_area = p_input->stream.p_selected_area;
+ p_input->stream.p_selected_area->i_part = i_chapter;
+ vlc_mutex_unlock( &p_input->stream.stream_lock );
+ input_ChangeArea( p_input, p_area );
+ input_SetStatus( p_input, INPUT_STATUS_PLAY );
+ vlc_mutex_lock( &p_input->stream.stream_lock );
+ }
+ vlc_mutex_unlock( &p_input->stream.stream_lock );
+
+ vlc_object_release( p_input );
+ return VLC_SUCCESS;
+ }
+ else if( !strcmp( psz_cmd, "title" ) ||
+ !strcmp( psz_cmd, "title_n" ) ||
+ !strcmp( psz_cmd, "title_p" ) )
+ {
+ unsigned int i_title = 0;
+
+ if( !strcmp( psz_cmd, "title" ) )
+ {
+ if ( *newval.psz_string )
+ {
+ /* Set. */
+ i_title = atoi( newval.psz_string );
+ }
+ else
+ {
+ /* Get. */
+ vlc_mutex_lock( &p_input->stream.stream_lock );
+ printf( "Currently playing title %d/%d\n",
+ p_input->stream.p_selected_area->i_id,
+ p_input->stream.i_area_nb - 1 );
+ vlc_mutex_unlock( &p_input->stream.stream_lock );
+
+ vlc_object_release( p_input );
+ return VLC_SUCCESS;
+ }
+ }
+ else if( !strcmp( psz_cmd, "title_n" ) )
+ {
+ vlc_mutex_lock( &p_input->stream.stream_lock );
+ i_title = p_input->stream.p_selected_area->i_id + 1;
+ vlc_mutex_unlock( &p_input->stream.stream_lock );
+ }
+ else if( !strcmp( psz_cmd, "title_p" ) )
+ {
+ vlc_mutex_lock( &p_input->stream.stream_lock );
+ i_title = p_input->stream.p_selected_area->i_id - 1;
+ vlc_mutex_unlock( &p_input->stream.stream_lock );
+ }
+
+ vlc_mutex_lock( &p_input->stream.stream_lock );
+ if( ( i_title > 0 ) && ( i_title < p_input->stream.i_area_nb ) )
+ {
+ input_area_t *p_area = p_input->stream.pp_areas[i_title];
+ vlc_mutex_unlock( &p_input->stream.stream_lock );
+ input_ChangeArea( p_input, p_area );
+ input_SetStatus( p_input, INPUT_STATUS_PLAY );
+ vlc_mutex_lock( &p_input->stream.stream_lock );
+ }
+ vlc_mutex_unlock( &p_input->stream.stream_lock );
+
+ vlc_object_release( p_input );
+ return VLC_SUCCESS;
+ }
- var_Destroy( p_intf, "foo" );
+ /* Never reached. */
+ return VLC_EGENERIC;
}
+static int Playlist( vlc_object_t *p_this, char const *psz_cmd,
+ vlc_value_t oldval, vlc_value_t newval, void *p_data )
+{
+ playlist_t * p_playlist;
+
+ p_playlist = vlc_object_find( p_this, VLC_OBJECT_PLAYLIST,
+ FIND_ANYWHERE );
+ if( !p_playlist )
+ {
+ return VLC_ENOOBJ;
+ }
+
+ /* Parse commands that require a playlist */
+ if( !strcmp( psz_cmd, "prev" ) )
+ {
+ playlist_Prev( p_playlist );
+ }
+ else if( !strcmp( psz_cmd, "next" ) )
+ {
+ playlist_Next( p_playlist );
+ }
+ else if( !strcmp( psz_cmd, "play" ) )
+ {
+ playlist_Play( p_playlist );
+ }
+ else if( !strcmp( psz_cmd, "stop" ) )
+ {
+ playlist_Stop( p_playlist );
+ }
+ else if( !strcmp( psz_cmd, "add" ) )
+ {
+ printf( "trying to add %s to playlist\n", newval.psz_string );
+ playlist_Add( p_playlist, newval.psz_string,
+ PLAYLIST_GO|PLAYLIST_APPEND, PLAYLIST_END );
+ }
+ else if( !strcmp( psz_cmd, "playlist" ) )
+ {
+ int i;
+ for ( i = 0; i < p_playlist->i_size; i++ )
+ {
+ printf( "|%s%s %s|\n", i == p_playlist->i_index?"*":" ",
+ p_playlist->pp_items[i]->psz_name,
+ p_playlist->pp_items[i]->psz_uri );
+ }
+ if ( i == 0 )
+ {
+ printf( "| no entries\n" );
+ }
+ }
+ /*
+ * sanity check
+ */
+ else
+ {
+ printf( "unknown command!\n" );
+ }
+
+ vlc_object_release( p_playlist );
+ return VLC_SUCCESS;
+}
+
+static int Quit( vlc_object_t *p_this, char const *psz_cmd,
+ vlc_value_t oldval, vlc_value_t newval, void *p_data )
+{
+ p_this->p_vlc->b_die = VLC_TRUE;
+ return VLC_SUCCESS;
+}
+
+static int Intf( vlc_object_t *p_this, char const *psz_cmd,
+ vlc_value_t oldval, vlc_value_t newval, void *p_data )
+{
+ intf_thread_t *p_newintf;
+
+ p_newintf = intf_Create( p_this->p_vlc, newval.psz_string );
+
+ if( p_newintf )
+ {
+ p_newintf->b_block = VLC_FALSE;
+ if( intf_RunThread( p_newintf ) )
+ {
+ vlc_object_detach( p_newintf );
+ intf_Destroy( p_newintf );
+ }
+ }
+
+ return VLC_SUCCESS;
+}
+
+static int Volume( vlc_object_t *p_this, char const *psz_cmd,
+ vlc_value_t oldval, vlc_value_t newval, void *p_data )
+{
+ int i_error;
+
+ if ( *newval.psz_string )
+ {
+ /* Set. */
+ audio_volume_t i_volume = atoi( newval.psz_string );
+ if ( i_volume > AOUT_VOLUME_MAX )
+ {
+ printf( "Volume must be in the range %d-%d\n", AOUT_VOLUME_MIN,
+ AOUT_VOLUME_MAX );
+ i_error = VLC_EBADVAR;
+ }
+ else i_error = aout_VolumeSet( p_this, i_volume );
+ }
+ else
+ {
+ /* Get. */
+ audio_volume_t i_volume;
+ if ( aout_VolumeGet( p_this, &i_volume ) < 0 )
+ {
+ i_error = VLC_EGENERIC;
+ }
+ else
+ {
+ printf( "Volume is %d\n", i_volume );
+ i_error = VLC_SUCCESS;
+ }
+ }
+
+ return i_error;
+}
+
+static int VolumeMove( vlc_object_t *p_this, char const *psz_cmd,
+ vlc_value_t oldval, vlc_value_t newval, void *p_data )
+{
+ audio_volume_t i_volume;
+ int i_nb_steps = atoi(newval.psz_string);
+ int i_error = VLC_SUCCESS;
+
+ if ( i_nb_steps <= 0 || i_nb_steps > (AOUT_VOLUME_MAX/AOUT_VOLUME_STEP) )
+ {
+ i_nb_steps = 1;
+ }
+
+ if ( !strcmp(psz_cmd, "volup") )
+ {
+ if ( aout_VolumeUp( p_this, i_nb_steps, &i_volume ) < 0 )
+ i_error = VLC_EGENERIC;
+ }
+ else
+ {
+ if ( aout_VolumeDown( p_this, i_nb_steps, &i_volume ) < 0 )
+ i_error = VLC_EGENERIC;
+ }
+
+ if ( !i_error ) printf( "Volume is %d\n", i_volume );
+ 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 )
+{
+ aout_instance_t * p_aout;
+ const char * psz_variable;
+ const char * psz_name;
+ int i_error;
+
+ p_aout = vlc_object_find( p_this, VLC_OBJECT_AOUT, FIND_ANYWHERE );
+ if ( p_aout == NULL ) return VLC_ENOOBJ;
+
+ if ( !strcmp( psz_cmd, "adev" ) )
+ {
+ psz_variable = "audio-device";
+ psz_name = "audio devices";
+ }
+ else
+ {
+ psz_variable = "audio-channels";
+ psz_name = "audio channels";
+ }
+
+ if ( !*newval.psz_string )
+ {
+ /* Retrieve all registered ***. */
+ vlc_value_t val;
+ int i;
+ char * psz_value;
+
+ if ( var_Get( (vlc_object_t *)p_aout, psz_variable, &val ) < 0 )
+ {
+ vlc_object_release( (vlc_object_t *)p_aout );
+ return VLC_EGENERIC;
+ }
+ psz_value = val.psz_string;
+
+ if ( var_Change( (vlc_object_t *)p_aout, psz_variable,
+ VLC_VAR_GETLIST, &val ) < 0 )
+ {
+ free( psz_value );
+ vlc_object_release( (vlc_object_t *)p_aout );
+ return VLC_EGENERIC;
+ }
+
+ printf( "+----[ %s ]\n", psz_name );
+ for ( i = 0; i < val.p_list->i_count; i++ )
+ {
+ if ( !strcmp( psz_value, val.p_list->p_values[i].psz_string ) )
+ printf( "| %s *\n", val.p_list->p_values[i].psz_string );
+ else
+ printf( "| %s\n", val.p_list->p_values[i].psz_string );
+ }
+ var_Change( (vlc_object_t *)p_aout, psz_variable, VLC_VAR_FREELIST,
+ &val );
+ printf( "+----[ end of %s ]\n", psz_name );
+
+ free( psz_value );
+ i_error = VLC_SUCCESS;
+ }
+ else
+ {
+ vlc_value_t val;
+ val.psz_string = newval.psz_string;
+
+ i_error = var_Set( (vlc_object_t *)p_aout, psz_variable, val );
+ }
+ vlc_object_release( (vlc_object_t *)p_aout );
+
+ return i_error;
+}
projects / vlc / blobdiff