#include "http.h"
#include "macros.h"
-#include "vlc_url.h"
+#include <vlc_url.h>
static int MacroParse( macro_t *m, char *psz_src )
{
msg_Dbg( p_intf, "requested playlist play" );
break;
}
+ //TODO: really locked here ?
playlist_Control( p_sys->p_playlist, PLAYLIST_VIEWPLAY,
true, NULL,
playlist_ItemGetById( p_sys->p_playlist,
- i_item, true ) );
+ i_item ) );
msg_Dbg( p_intf, "requested playlist item: %i", i_item );
break;
}
if( p_sys->p_input )
{
vout_thread_t *p_vout;
- p_vout = vlc_object_find( p_sys->p_input,
- VLC_OBJECT_VOUT, FIND_CHILD );
+ p_vout = input_GetVout( p_sys->p_input );
if( p_vout )
{
- p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE;
+ var_ToggleBool( p_vout, "fullscreen" );
vlc_object_release( p_vout );
msg_Dbg( p_intf, "requested fullscreen toggle" );
}
int i_value;
ExtractURIValue( p_request, "value", vol, 8 );
- aout_VolumeGet( p_intf, &i_volume );
+ aout_VolumeGet( p_sys->p_playlist, &i_volume );
decode_URI( vol );
if( vol[0] == '+' )
i_value = atoi( vol + 1 );
if( (i_volume + i_value) > AOUT_VOLUME_MAX )
{
- aout_VolumeSet( p_intf , AOUT_VOLUME_MAX );
+ aout_VolumeSet( p_sys->p_playlist, AOUT_VOLUME_MAX );
msg_Dbg( p_intf, "requested volume set: max" );
}
else
{
- aout_VolumeSet( p_intf , (i_volume + i_value) );
+ aout_VolumeSet( p_sys->p_playlist, (i_volume + i_value) );
msg_Dbg( p_intf, "requested volume set: +%i", (i_volume + i_value) );
}
}
i_value = atoi( vol + 1 );
if( (i_volume - i_value) < AOUT_VOLUME_MIN )
{
- aout_VolumeSet( p_intf , AOUT_VOLUME_MIN );
+ aout_VolumeSet( p_sys->p_playlist, AOUT_VOLUME_MIN );
msg_Dbg( p_intf, "requested volume set: min" );
}
else
{
- aout_VolumeSet( p_intf , (i_volume - i_value) );
+ aout_VolumeSet( p_sys->p_playlist, (i_volume - i_value) );
msg_Dbg( p_intf, "requested volume set: -%i", (i_volume - i_value) );
}
}
{
i_value = atoi( vol );
if( (i_value <= 400) && (i_value>=0) ){
- aout_VolumeSet( p_intf, (i_value * (AOUT_VOLUME_MAX - AOUT_VOLUME_MIN))/400+AOUT_VOLUME_MIN);
+ aout_VolumeSet( p_sys->p_playlist, (i_value * (AOUT_VOLUME_MAX - AOUT_VOLUME_MIN))/400+AOUT_VOLUME_MIN);
msg_Dbg( p_intf, "requested volume set: %i%%", atoi( vol ));
}
}
i_value = atoi( vol );
if( ( i_value <= AOUT_VOLUME_MAX ) && ( i_value >= AOUT_VOLUME_MIN ) )
{
- aout_VolumeSet( p_intf , atoi( vol ) );
+ aout_VolumeSet( p_sys->p_playlist, atoi( vol ) );
msg_Dbg( p_intf, "requested volume set: %i", atoi( vol ) );
}
}
p_input = MRLParse( p_intf, mrl, psz_name );
- char *psz_uri = input_item_GetURI( p_input );
- if( !p_input || !psz_uri || !*psz_uri )
- {
- msg_Dbg( p_intf, "invalid requested mrl: %s", mrl );
- }
+ char *psz_uri = p_input ? input_item_GetURI( p_input ) : NULL;
+ if( psz_uri && *psz_uri &&
+ playlist_AddInput( p_sys->p_playlist, p_input,
+ PLAYLIST_APPEND, PLAYLIST_END,
+ true, false) == VLC_SUCCESS )
+ msg_Dbg( p_intf, "requested mrl add: %s", mrl );
else
- {
- int i_ret = playlist_AddInput( p_sys->p_playlist,
- p_input,
- PLAYLIST_APPEND, PLAYLIST_END, true,
- false);
- vlc_gc_decref( p_input );
- if( i_ret == VLC_SUCCESS )
- msg_Dbg( p_intf, "requested mrl add: %s", mrl );
- else
- msg_Warn( p_intf, "adding mrl %s failed", mrl );
- }
+ msg_Warn( p_intf, "adding mrl failed: %s", mrl );
free( psz_uri );
-
+ if( p_input )
+ vlc_gc_decref( p_input );
break;
}
case MVLC_DEL:
{
- int i_item, *p_items = NULL, i_nb_items = 0;
+ int *p_items = NULL;
+ size_t i_nb_items = 0;
char item[512];
const char *p_parser = p_request;
{
if( !*item ) continue;
- i_item = atoi( item );
+ int i_item = atoi( item );
p_items = realloc( p_items, (i_nb_items + 1) *
- sizeof(int) );
+ sizeof(*p_items) );
p_items[i_nb_items] = i_item;
i_nb_items++;
}
- if( i_nb_items )
+ for( size_t i = 0; i < i_nb_items; i++ )
{
- int i;
- for( i = 0; i < i_nb_items; i++ )
- {
+ playlist_item_t *p_item;
+
+ msg_Dbg( p_intf, "requested playlist delete: %d",
+ p_items[i] );
+ p_item = playlist_ItemGetById( p_sys->p_playlist,
+ p_items[i] );
+ if( p_item )
playlist_DeleteFromInput( p_sys->p_playlist,
- p_items[i], false );
- msg_Dbg( p_intf, "requested playlist delete: %d",
- p_items[i] );
- p_items[i] = -1;
- }
+ p_item->p_input,
+ false );
}
free( p_items );
}
case MVLC_KEEP:
{
- int i_item, *p_items = NULL, i_nb_items = 0;
+ int *p_items = NULL;
+ size_t i_nb_items = 0, i;
char item[512];
const char *p_parser = p_request;
- int i,j;
/* Get the list of items to keep */
while( (p_parser =
{
if( !*item ) continue;
- i_item = atoi( item );
+ int i_item = atoi( item );
p_items = realloc( p_items, (i_nb_items + 1) *
- sizeof(int) );
+ sizeof(*p_items) );
p_items[i_nb_items] = i_item;
i_nb_items++;
}
- for( i = p_sys->p_playlist->items.i_size - 1 ; i >= 0; i-- )
+ size_t size = p_sys->p_playlist->items.i_size;
+ for( i = 0; i < size; i++ )
{
+ size_t j;
+
/* Check if the item is in the keep list */
for( j = 0 ; j < i_nb_items ; j++ )
{
if( p_items[j] ==
- ARRAY_VAL(p_sys->p_playlist->items,i)
- ->i_id)
+ ARRAY_VAL(p_sys->p_playlist->items,i)->i_id)
break;
}
if( j == i_nb_items )
{
+ msg_Dbg( p_intf, "requested playlist delete: %d",
+ p_sys->p_playlist->items.p_elems[i]->i_id );
playlist_DeleteFromInput( p_sys->p_playlist,
- p_sys->p_playlist->items.p_elems[i]->i_id,
+ p_sys->p_playlist->items.p_elems[i]->p_input,
false );
- msg_Dbg( p_intf, "requested playlist delete: %d",
- i );
}
}
case MVLC_SHUTDOWN:
{
msg_Dbg( p_intf, "requested shutdown" );
- vlc_object_kill( p_intf->p_libvlc );
+ libvlc_Quit( p_intf->p_libvlc );
break;
}
#ifdef ENABLE_VLM
}
else
{
- vlm_error = malloc( strlen(vlm_answer->psz_name) +
- strlen(vlm_answer->psz_value) +
- strlen( " : ") + 1 );
- sprintf( vlm_error , "%s : %s" , vlm_answer->psz_name,
- vlm_answer->psz_value );
+ if( asprintf( &vlm_error , "%s : %s" ,
+ vlm_answer->psz_name,
+ vlm_answer->psz_value ) == -1 )
+ vlm_error = NULL;
}
mvar_AppendNewVar( p_args->vars, "vlm_error", vlm_error );
projects / vlc / blobdiff