static vlc_bool_t ReadCommand( intf_thread_t *, char *, int * );
+static playlist_item_t *parse_MRL( intf_thread_t *, char * );
+
static int Input ( vlc_object_t *, char const *,
vlc_value_t, vlc_value_t, void * );
static int Playlist ( vlc_object_t *, char const *,
#endif
vlc_module_begin();
+ set_category( CAT_INTERFACE );
+ set_subcategory( SUBCAT_INTERFACE_CONTROL );
set_description( _("Remote control interface") );
add_bool( "rc-show-pos", 0, NULL, POS_TEXT, POS_LONGTEXT, VLC_TRUE );
#ifdef HAVE_ISATTY
val.psz_string = psz_arg;
i_ret = var_Set( p_intf, psz_cmd, val );
- msg_rc( _("%s: returned %i (%s)\n"),
+ msg_rc( "%s: returned %i (%s)\n",
psz_cmd, i_ret, vlc_error( i_ret ) );
}
/* Or maybe it's a global command */
i_ret = var_Set( p_intf->p_libvlc, psz_cmd, val );
if( i_ret != 0 )
{
- msg_rc( _("%s: returned %i (%s)\n"),
+ msg_rc( "%s: returned %i (%s)\n",
psz_cmd, i_ret, vlc_error( i_ret ) );
}
}
}
msg_rc( "| \n" );
}
- msg_rc( _("+----[ end of stream info ]\n") );
+ msg_rc( "+----[ end of stream info ]\n" );
vlc_mutex_unlock( &p_input->input.p_item->lock );
}
else
{
- msg_rc( _("no input\n") );
+ msg_rc( "no input\n" );
}
}
else if( !strcmp( psz_cmd, "is_playing" ) )
var_Get( p_input, "chapter", &val );
var_Change( p_input, "chapter", VLC_VAR_GETCHOICES,
&val_list, NULL );
- msg_rc( _("Currently playing chapter %d/%d\n"),
+ msg_rc( "Currently playing chapter %d/%d\n",
val.i_int, val_list.p_list->i_count );
var_Change( p_this, "chapter", VLC_VAR_FREELIST,
&val_list, NULL );
var_Get( p_input, "title", &val );
var_Change( p_input, "title", VLC_VAR_GETCHOICES,
&val_list, NULL );
- msg_rc( _("Currently playing title %d/%d\n"),
+ msg_rc( "Currently playing title %d/%d\n",
val.i_int, val_list.p_list->i_count );
var_Change( p_this, "title", VLC_VAR_FREELIST,
&val_list, NULL );
{
playlist_Stop( p_playlist );
}
- else if( !strcmp( psz_cmd, "add" ) )
+ else if( !strcmp( psz_cmd, "add" ) &&
+ newval.psz_string && *newval.psz_string )
{
- msg_rc( _("trying to add %s to playlist\n"), newval.psz_string );
- playlist_Add( p_playlist, newval.psz_string, newval.psz_string,
- PLAYLIST_GO|PLAYLIST_APPEND, PLAYLIST_END );
+ playlist_item_t *p_item = parse_MRL( p_intf, newval.psz_string );
+
+ if( p_item )
+ {
+ msg_rc( "trying to add %s to playlist\n", newval.psz_string );
+ playlist_AddItem( p_playlist, p_item,
+ PLAYLIST_GO|PLAYLIST_APPEND, PLAYLIST_END );
+ }
}
else if( !strcmp( psz_cmd, "playlist" ) )
{
}
if ( i == 0 )
{
- msg_rc( _("| no entries\n") );
+ msg_rc( "| no entries\n" );
}
}
*/
else
{
- msg_rc( _("unknown command!\n") );
+ msg_rc( "unknown command!\n" );
}
vlc_object_release( p_playlist );
if( strlen( newval.psz_string ) > 0 )
{
val.psz_string = newval.psz_string;
- var_Set( p_inp, "marq-marquee", val );
+ var_Set( p_inp->p_libvlc, "marq-marquee", val );
}
else
{
val.psz_string = "";
- var_Set( p_inp, "marq-marquee", val);
+ var_Set( p_inp->p_libvlc, "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_inp, "marq-x", val );
+ var_Set( p_inp->p_libvlc, "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_inp, "marq-y", val );
+ var_Set( p_inp->p_libvlc, "marq-y", val );
}
}
else if( !strcmp( psz_cmd, "marq-timeout" ) )
*/
else
{
- msg_rc( _("unknown command!\n") );
+ msg_rc( "unknown command!\n" );
}
vlc_object_release( p_pl );
audio_volume_t i_volume = atoi( newval.psz_string );
if ( i_volume > AOUT_VOLUME_MAX )
{
- msg_rc( _("Volume must be in the range %d-%d\n"), AOUT_VOLUME_MIN,
+ msg_rc( "Volume must be in the range %d-%d\n", AOUT_VOLUME_MIN,
AOUT_VOLUME_MAX );
i_error = VLC_EBADVAR;
}
}
else
{
- msg_rc( _("Volume is %d\n"), i_volume );
+ msg_rc( "Volume is %d\n", i_volume );
i_error = VLC_SUCCESS;
}
}
i_error = VLC_EGENERIC;
}
- if ( !i_error ) msg_rc( _("Volume is %d\n"), i_volume );
+ if ( !i_error ) msg_rc( "Volume is %d\n", i_volume );
return i_error;
}
}
var_Change( (vlc_object_t *)p_aout, psz_variable, VLC_VAR_FREELIST,
&val, &text );
- msg_rc( _("+----[ end of %s ]\n"), val_name.psz_string );
+ msg_rc( "+----[ end of %s ]\n", val_name.psz_string );
if( val_name.psz_string ) free( val_name.psz_string );
i_error = VLC_SUCCESS;
return VLC_FALSE;
}
+
+/*****************************************************************************
+ * parse_MRL: build a playlist 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 )
+{
+#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;
+ char *psz_item = NULL, *psz_item_mrl = NULL, *psz_orig;
+ char **ppsz_options = NULL;
+ int i, i_options = 0;
+
+ if( !psz_mrl ) return 0;
+
+ psz_mrl = psz_orig = strdup( psz_mrl );
+ while( *psz_mrl )
+ {
+ SKIPSPACE( psz_mrl );
+ psz_item = psz_mrl;
+
+ for( ; *psz_mrl; psz_mrl++ )
+ {
+ if( (*psz_mrl == ' ' || *psz_mrl == '\t') && psz_mrl[1] == ':' )
+ {
+ /* We have a complete item */
+ break;
+ }
+ if( (*psz_mrl == ' ' || *psz_mrl == '\t') &&
+ (psz_mrl[1] == '"' || psz_mrl[1] == '\'') && psz_mrl[2] == ':')
+ {
+ /* We have a complete item */
+ break;
+ }
+ }
+
+ if( *psz_mrl ) { *psz_mrl = 0; psz_mrl++; }
+ SKIPTRAILINGSPACE( psz_item, psz_item + strlen( psz_item ) );
+
+ /* Remove '"' and '\'' if necessary */
+ if( *psz_item == '"' && psz_item[strlen(psz_item)-1] == '"' )
+ { psz_item++; psz_item[strlen(psz_item)-1] = 0; }
+ if( *psz_item == '\'' && psz_item[strlen(psz_item)-1] == '\'' )
+ { psz_item++; psz_item[strlen(psz_item)-1] = 0; }
+
+ if( !psz_item_mrl ) psz_item_mrl = psz_item;
+ else if( *psz_item )
+ {
+ i_options++;
+ ppsz_options = realloc( ppsz_options, i_options * sizeof(char *) );
+ ppsz_options[i_options - 1] = &psz_item[1];
+ }
+
+ if( *psz_mrl ) SKIPSPACE( psz_mrl );
+ }
+
+ /* Now create a playlist item */
+ if( psz_item_mrl )
+ {
+ p_item = playlist_ItemNew( p_intf, psz_item_mrl, psz_item_mrl );
+ for( i = 0; i < i_options; i++ )
+ {
+ playlist_ItemAddOption( p_item, ppsz_options[i] );
+ }
+ }
+
+ if( i_options ) free( ppsz_options );
+ free( psz_orig );
+
+ return p_item;
+}
projects / vlc / blobdiff