* rc.c : remote control stdin/stdout plugin for vlc
*****************************************************************************
* Copyright (C) 2001 VideoLAN
- * $Id: rc.c,v 1.11 2002/11/20 15:34:39 gbazin Exp $
+ * $Id: rc.c,v 1.21 2003/01/17 19:22:21 sam 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
#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 Playlist ( vlc_object_t *, char *, char * );
-static int Quit ( vlc_object_t *, char *, char * );
-static int Intf ( vlc_object_t *, char *, char * );
-static int Volume ( vlc_object_t *, char *, char * );
-static int VolumeMove ( vlc_object_t *, char *, char * );
-static int AudioConfig ( vlc_object_t *, char *, char * );
+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
p_playlist = NULL;
/* Register commands that will be cleaned up upon object destruction */
- var_Create( p_intf, "quit", VLC_VAR_COMMAND );
- var_Set( p_intf, "quit", (vlc_value_t)(void*)Quit );
- var_Create( p_intf, "intf", VLC_VAR_COMMAND );
- var_Set( p_intf, "intf", (vlc_value_t)(void*)Intf );
-
- var_Create( p_intf, "play", VLC_VAR_COMMAND );
- var_Set( p_intf, "play", (vlc_value_t)(void*)Playlist );
- var_Create( p_intf, "stop", VLC_VAR_COMMAND );
- var_Set( p_intf, "stop", (vlc_value_t)(void*)Playlist );
- var_Create( p_intf, "pause", VLC_VAR_COMMAND );
- var_Set( p_intf, "pause", (vlc_value_t)(void*)Playlist );
- var_Create( p_intf, "prev", VLC_VAR_COMMAND );
- var_Set( p_intf, "prev", (vlc_value_t)(void*)Playlist );
- var_Create( p_intf, "next", VLC_VAR_COMMAND );
- var_Set( p_intf, "next", (vlc_value_t)(void*)Playlist );
-
- var_Create( p_intf, "title", VLC_VAR_COMMAND );
- var_Set( p_intf, "title", (vlc_value_t)(void*)Playlist );
- var_Create( p_intf, "title_n", VLC_VAR_COMMAND );
- var_Set( p_intf, "title_n", (vlc_value_t)(void*)Playlist );
- var_Create( p_intf, "title_p", VLC_VAR_COMMAND );
- var_Set( p_intf, "title_p", (vlc_value_t)(void*)Playlist );
- var_Create( p_intf, "chapter", VLC_VAR_COMMAND );
- var_Set( p_intf, "chapter", (vlc_value_t)(void*)Playlist );
- var_Create( p_intf, "chapter_n", VLC_VAR_COMMAND );
- var_Set( p_intf, "chapter_n", (vlc_value_t)(void*)Playlist );
- var_Create( p_intf, "chapter_p", VLC_VAR_COMMAND );
- var_Set( p_intf, "chapter_p", (vlc_value_t)(void*)Playlist );
-
- var_Create( p_intf, "volume", VLC_VAR_COMMAND );
- var_Set( p_intf, "volume", (vlc_value_t)(void*)Volume );
- var_Create( p_intf, "volup", VLC_VAR_COMMAND );
- var_Set( p_intf, "volup", (vlc_value_t)(void*)VolumeMove );
- var_Create( p_intf, "voldown", VLC_VAR_COMMAND );
- var_Set( p_intf, "voldown", (vlc_value_t)(void*)VolumeMove );
- var_Create( p_intf, "adev", VLC_VAR_COMMAND );
- var_Set( p_intf, "adev", (vlc_value_t)(void*)AudioConfig );
- var_Create( p_intf, "achan", VLC_VAR_COMMAND );
- var_Set( p_intf, "achan", (vlc_value_t)(void*)AudioConfig );
+ 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 );
while( !p_intf->b_die )
{
}
/* If the user typed a registered local command, try it */
- if( var_Type( p_intf, psz_cmd ) == VLC_VAR_COMMAND )
+ if( var_Type( p_intf, psz_cmd ) & VLC_VAR_ISCOMMAND )
{
vlc_value_t val;
int i_ret;
val.psz_string = psz_arg;
- i_ret = var_Get( p_intf, psz_cmd, &val );
+ i_ret = var_Set( p_intf, psz_cmd, val );
printf( "%s: returned %i (%s)\n",
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_COMMAND )
+ else if( var_Type( p_intf->p_libvlc, 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_Get( p_intf->p_libvlc, psz_cmd, &val );
+ 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 switch( psz_cmd[0] )
{
- case 'a':
- case 'A':
- if( psz_cmd[1] == ' ' && p_playlist )
- {
- playlist_Add( p_playlist, psz_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 && psz_cmd[ i_dummy ] >= '0'
- && psz_cmd[ i_dummy ] <= '9';
- i_dummy++ )
- {
- ;
- }
-
- psz_cmd[ i_dummy ] = 0;
- input_Seek( p_input, (off_t)atoi( psz_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("| 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");
}
}
-static int Playlist( vlc_object_t *p_this, char *psz_cmd, char *psz_arg )
+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;
- playlist_t * p_playlist;
p_input = vlc_object_find( p_this, VLC_OBJECT_INPUT, FIND_ANYWHERE );
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" ) )
{
- int i_chapter = 0;
+ unsigned int i_chapter = 0;
if( !strcmp( psz_cmd, "chapter" ) )
{
- if ( *psz_arg )
+ if ( *newval.psz_string )
{
/* Set. */
- i_chapter = atoi( psz_arg );
+ i_chapter = atoi( newval.psz_string );
}
else
{
/* Get. */
vlc_mutex_lock( &p_input->stream.stream_lock );
- printf( "Currently playing chapter %d\n",
- p_input->stream.p_selected_area->i_part );
+ 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 );
}
vlc_mutex_lock( &p_input->stream.stream_lock );
- if( ( i_chapter > 0 ) && ( i_chapter <=
+ if( ( i_chapter > 0 ) && ( i_chapter <
p_input->stream.p_selected_area->i_part_nb ) )
{
- p_input->stream.p_selected_area->i_part = i_chapter;
- vlc_mutex_unlock( &p_input->stream.stream_lock );
- input_ChangeArea( p_input,
- (input_area_t*)p_input->stream.p_selected_area );
- input_SetStatus( p_input, INPUT_STATUS_PLAY );
- vlc_mutex_lock( &p_input->stream.stream_lock );
+ 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 );
!strcmp( psz_cmd, "title_n" ) ||
!strcmp( psz_cmd, "title_p" ) )
{
- int i_title = 0;
+ unsigned int i_title = 0;
if( !strcmp( psz_cmd, "title" ) )
{
- if ( *psz_arg )
+ if ( *newval.psz_string )
{
/* Set. */
- i_title = atoi( psz_arg );
+ i_title = atoi( newval.psz_string );
}
else
{
/* Get. */
vlc_mutex_lock( &p_input->stream.stream_lock );
- printf( "Currently playing title %d\n",
- p_input->stream.p_selected_area->i_id );
+ 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 );
}
vlc_mutex_lock( &p_input->stream.stream_lock );
- if( ( i_title > 0 ) && ( i_title <=
- p_input->stream.p_selected_area->i_part_nb ) )
+ if( ( i_title > 0 ) && ( i_title < p_input->stream.i_area_nb ) )
{
- p_input->stream.p_selected_area->i_part = i_title;
- vlc_mutex_unlock( &p_input->stream.stream_lock );
- input_ChangeArea( p_input,
- (input_area_t*)p_input->stream.pp_areas[i_title] );
- input_SetStatus( p_input, INPUT_STATUS_PLAY );
- vlc_mutex_lock( &p_input->stream.stream_lock );
+ 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 );
return VLC_SUCCESS;
}
+ /* Never reached. */
+ return VLC_EGENERIC;
+}
- p_playlist = vlc_object_find( p_input, VLC_OBJECT_PLAYLIST,
- FIND_PARENT );
- vlc_object_release( p_input );
+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;
{
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 *psz_cmd, char *psz_arg )
+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 *psz_cmd, char *psz_arg )
+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;
char *psz_oldmodule = config_GetPsz( p_this->p_vlc, "intf" );
- config_PutPsz( p_this->p_vlc, "intf", psz_arg );
+ config_PutPsz( p_this->p_vlc, "intf", newval.psz_string );
p_newintf = intf_Create( p_this->p_vlc );
config_PutPsz( p_this->p_vlc, "intf", psz_oldmodule );
return VLC_SUCCESS;
}
-static int Signal( vlc_object_t *p_this, char *psz_cmd, char *psz_arg )
-{
- raise( atoi(psz_arg) );
- return VLC_SUCCESS;
-}
-
-static int Volume( vlc_object_t *p_this, char *psz_cmd, char *psz_arg )
+static int Volume( 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;
int i_error;
p_aout = vlc_object_find( p_this, VLC_OBJECT_AOUT, FIND_ANYWHERE );
if ( p_aout == NULL ) return VLC_ENOOBJ;
- if ( *psz_arg )
+ if ( *newval.psz_string )
{
/* Set. */
- audio_volume_t i_volume = atoi( psz_arg );
+ 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,
return i_error;
}
-static int VolumeMove( vlc_object_t * p_this, char * psz_cmd, char * psz_arg )
+static int VolumeMove( 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;
audio_volume_t i_volume;
- int i_nb_steps = atoi(psz_arg);
+ 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) )
return i_error;
}
-static int AudioConfig( vlc_object_t * p_this, char * psz_cmd, char * psz_arg )
+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;
psz_name = "audio channels";
}
- if ( !*psz_arg )
+ if ( !*newval.psz_string )
{
/* Retrieve all registered ***. */
vlc_value_t val;
- int i, i_vals;
- vlc_value_t * p_vals;
+ int i;
char * psz_value;
if ( var_Get( (vlc_object_t *)p_aout, psz_variable, &val ) < 0 )
}
printf( "+----[ %s ]\n", psz_name );
- i_vals = ((vlc_value_t *)val.p_address)[0].i_int;
- p_vals = &((vlc_value_t *)val.p_address)[1]; /* Starts at index 1 */
- for ( i = 0; i < i_vals; i++ )
+ for ( i = 0; i < val.p_list->i_count; i++ )
{
- if ( !strcmp( psz_value, p_vals[i].psz_string ) )
- printf( "| %s *\n", p_vals[i].psz_string );
+ 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", p_vals[i].psz_string );
+ printf( "| %s\n", val.p_list->p_values[i].psz_string );
}
var_Change( (vlc_object_t *)p_aout, psz_variable, VLC_VAR_FREELIST,
&val );
else
{
vlc_value_t val;
- val.psz_string = psz_arg;
+ val.psz_string = newval.psz_string;
i_error = var_Set( (vlc_object_t *)p_aout, psz_variable, val );
}
return i_error;
}
-
projects / vlc / blobdiff