* macro.c : Custom <vlc> macro handling
*****************************************************************************
* Copyright (C) 2001-2005 the VideoLAN team
- * $Id: http.c 12225 2005-08-18 10:01:30Z massiot $
+ * $Id$
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
* Laurent Aimar <fenrir@via.ecp.fr>
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
#include "http.h"
#include "macros.h"
+#include "vlc_url.h"
-int MacroParse( macro_t *m, char *psz_src )
+static int MacroParse( macro_t *m, char *psz_src )
{
char *dup = strdup( (char *)psz_src );
char *src = dup;
#undef EXTRACT
}
-void MacroClean( macro_t *m )
+static void MacroClean( macro_t *m )
{
free( m->id );
free( m->param1 );
free( m->param2 );
}
-int StrToMacroType( char *name )
+static int StrToMacroType( const char *name )
{
int i;
return MVLC_UNKNOWN;
}
-void MacroDo( httpd_file_sys_t *p_args,
+static void MacroDo( httpd_file_sys_t *p_args,
macro_t *m,
char *p_request, int i_request,
char **pp_data, int *pi_data,
}
#define PRINT( str ) \
ALLOC( strlen( str ) + 1 ); \
- *pp_dst += sprintf( *pp_dst, str );
+ *pp_dst += sprintf( *pp_dst, "%s", str );
#define PRINTS( str, s ) \
ALLOC( strlen( str ) + strlen( s ) + 1 ); \
{
break;
}
- E_(ExtractURIValue)( p_request, "control", control, 512 );
+ ExtractURIValue( p_request, "control", control, 512 );
if( *m->param1 && !strstr( m->param1, control ) )
{
msg_Warn( p_intf, "unauthorized control=%s", control );
int i_item;
char item[512];
- E_(ExtractURIValue)( p_request, "item", item, 512 );
+ ExtractURIValue( p_request, "item", item, 512 );
i_item = atoi( item );
/* id = 0 : simply ask playlist to play */
if( i_item == 0 )
msg_Dbg( p_intf, "requested playlist play" );
break;
}
- playlist_Control( p_sys->p_playlist, PLAYLIST_ITEMPLAY,
+ playlist_Control( p_sys->p_playlist, PLAYLIST_VIEWPLAY,
+ true, NULL,
playlist_ItemGetById( p_sys->p_playlist,
- i_item ) );
+ i_item, true ) );
msg_Dbg( p_intf, "requested playlist item: %i", i_item );
break;
}
case MVLC_STOP:
- playlist_Control( p_sys->p_playlist, PLAYLIST_STOP );
+ playlist_Control( p_sys->p_playlist, PLAYLIST_STOP,
+ true )
msg_Dbg( p_intf, "requested playlist stop" );
break;
case MVLC_PAUSE:
- playlist_Control( p_sys->p_playlist, PLAYLIST_PAUSE );
+ playlist_Control( p_sys->p_playlist, PLAYLIST_PAUSE,
+ true )
msg_Dbg( p_intf, "requested playlist pause" );
break;
case MVLC_NEXT:
- playlist_Control( p_sys->p_playlist, PLAYLIST_SKIP, 1 );
+ playlist_Control( p_sys->p_playlist, PLAYLIST_SKIP,
+ true, 1 );
msg_Dbg( p_intf, "requested playlist next" );
break;
case MVLC_PREVIOUS:
- playlist_Control( p_sys->p_playlist, PLAYLIST_SKIP, -1 );
+ playlist_Control( p_sys->p_playlist, PLAYLIST_SKIP,
+ true, -1 );
msg_Dbg( p_intf, "requested playlist previous" );
break;
case MVLC_FULLSCREEN:
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;
case MVLC_SEEK:
{
char value[30];
- E_(ExtractURIValue)( p_request, "seek_value", value, 30 );
- E_(DecodeEncodedURI)( value );
- E_(HandleSeek)( p_intf, value );
+ ExtractURIValue( p_request, "seek_value", value, 30 );
+ decode_URI( value );
+ HandleSeek( p_intf, value );
break;
}
case MVLC_VOLUME:
audio_volume_t i_volume;
int i_value;
- E_(ExtractURIValue)( p_request, "value", vol, 8 );
+ ExtractURIValue( p_request, "value", vol, 8 );
aout_VolumeGet( p_intf, &i_volume );
- E_(DecodeEncodedURI)( vol );
+ decode_URI( vol );
if( vol[0] == '+' )
{
/* playlist management */
case MVLC_ADD:
{
- char mrl[1024], psz_name[1024];
- playlist_item_t *p_item;
-
- E_(ExtractURIValue)( p_request, "mrl", mrl, 1024 );
- E_(DecodeEncodedURI)( mrl );
- E_(ExtractURIValue)( p_request, "name", psz_name, 1024 );
- E_(DecodeEncodedURI)( psz_name );
+ char mrl[1024], psz_name[1024], tmp[1024];
+ char *p, *str;
+ input_item_t *p_input;
+
+ ExtractURIValue( p_request, "mrl", tmp, 1024 );
+ decode_URI( tmp );
+ ExtractURIValue( p_request, "name", psz_name, 1024 );
+ decode_URI( psz_name );
if( !*psz_name )
{
- memcpy( psz_name, mrl, 1024 );
- }
- p_item = E_(MRLParse)( p_intf, mrl, psz_name );
-
- if( !p_item || !p_item->input.psz_uri ||
- !*p_item->input.psz_uri )
- {
- msg_Dbg( p_intf, "invalid requested mrl: %s", mrl );
+ memcpy( psz_name, tmp, 1024 );
}
- else
+ /* addslashes for backward compatibility with the old
+ * http intf */
+ p = mrl; str = tmp;
+ while( *str != '\0' )
{
- playlist_AddItem( p_sys->p_playlist, p_item,
- PLAYLIST_APPEND, PLAYLIST_END );
- msg_Dbg( p_intf, "requested mrl add: %s", mrl );
+ if( *str == '"' || *str == '\'' || *str == '\\' )
+ {
+ *p++ = '\\';
+ }
+ *p++ = *str;
+ str++;
}
+ *p = '\0';
+
+ p_input = MRLParse( p_intf, mrl, psz_name );
+ 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
+ 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;
- char item[512], *p_parser = p_request;
+ char item[512];
+ const char *p_parser = p_request;
/* Get the list of items to delete */
while( (p_parser =
- E_(ExtractURIValue)( p_parser, "item", item, 512 )) )
+ ExtractURIValue( p_parser, "item", item, 512 )) )
{
if( !*item ) continue;
int i;
for( i = 0; i < i_nb_items; i++ )
{
- playlist_LockDelete( p_sys->p_playlist, p_items[i] );
+ 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;
}
}
- if( p_items ) free( p_items );
+ free( p_items );
break;
}
case MVLC_KEEP:
{
int i_item, *p_items = NULL, i_nb_items = 0;
- char item[512], *p_parser = p_request;
+ char item[512];
+ const char *p_parser = p_request;
int i,j;
/* Get the list of items to keep */
while( (p_parser =
- E_(ExtractURIValue)( p_parser, "item", item, 512 )) )
+ ExtractURIValue( p_parser, "item", item, 512 )) )
{
if( !*item ) continue;
i_nb_items++;
}
- for( i = p_sys->p_playlist->i_size - 1 ; i >= 0; i-- )
+ for( i = p_sys->p_playlist->items.i_size - 1 ; i >= 0; i-- )
{
/* Check if the item is in the keep list */
for( j = 0 ; j < i_nb_items ; j++ )
{
if( p_items[j] ==
- p_sys->p_playlist->pp_items[i]->input.i_id ) break;
+ ARRAY_VAL(p_sys->p_playlist->items,i)
+ ->i_id)
+ break;
}
if( j == i_nb_items )
{
- playlist_LockDelete( p_sys->p_playlist, p_sys->p_playlist->pp_items[i]->input.i_id );
+ playlist_DeleteFromInput( p_sys->p_playlist,
+ p_sys->p_playlist->items.p_elems[i]->i_id,
+ false );
msg_Dbg( p_intf, "requested playlist delete: %d",
i );
}
}
- if( p_items ) free( p_items );
+ free( p_items );
break;
}
case MVLC_EMPTY:
{
- playlist_LockClear( p_sys->p_playlist );
+ playlist_Clear( p_sys->p_playlist, false );
msg_Dbg( p_intf, "requested playlist empty" );
break;
}
int i_order;
int i_item;
- E_(ExtractURIValue)( p_request, "type", type, 12 );
- E_(ExtractURIValue)( p_request, "order", order, 2 );
- E_(ExtractURIValue)( p_request, "item", item, 512 );
+ ExtractURIValue( p_request, "type", type, 12 );
+ ExtractURIValue( p_request, "order", order, 2 );
+ ExtractURIValue( p_request, "item", item, 512 );
i_item = atoi( item );
if( order[0] == '0' ) i_order = ORDER_NORMAL;
if( !strcmp( type , "title" ) )
{
- playlist_RecursiveNodeSort( p_sys->p_playlist, /*playlist_ItemGetById( p_sys->p_playlist, i_item ),*/
- p_sys->p_playlist->pp_views[0]->p_root,
+ playlist_RecursiveNodeSort( p_sys->p_playlist,
+ /* Ugly hack,but not worse than before ... */
+ p_sys->p_playlist->p_root_onelevel,
SORT_TITLE_NODES_FIRST,
( i_order == 0 ) ? ORDER_NORMAL : ORDER_REVERSE );
msg_Dbg( p_intf, "requested playlist sort by title (%d)" , i_order );
else if( !strcmp( type , "author" ) )
{
playlist_RecursiveNodeSort( p_sys->p_playlist, /*playlist_ItemGetById( p_sys->p_playlist, i_item ),*/
- p_sys->p_playlist->pp_views[0]->p_root,
- SORT_AUTHOR,
+ p_sys->p_playlist->p_root_onelevel,
+ SORT_ARTIST,
( i_order == 0 ) ? ORDER_NORMAL : ORDER_REVERSE );
msg_Dbg( p_intf, "requested playlist sort by author (%d)" , i_order );
}
else if( !strcmp( type , "shuffle" ) )
{
playlist_RecursiveNodeSort( p_sys->p_playlist, /*playlist_ItemGetById( p_sys->p_playlist, i_item ),*/
- p_sys->p_playlist->pp_views[0]->p_root,
+ p_sys->p_playlist->p_root_onelevel,
SORT_RANDOM,
( i_order == 0 ) ? ORDER_NORMAL : ORDER_REVERSE );
msg_Dbg( p_intf, "requested playlist shuffle");
char psz_newpos[6];
int i_pos;
int i_newpos;
- E_(ExtractURIValue)( p_request, "psz_pos", psz_pos, 6 );
- E_(ExtractURIValue)( p_request, "psz_newpos", psz_newpos, 6 );
+ ExtractURIValue( p_request, "psz_pos", psz_pos, 6 );
+ ExtractURIValue( p_request, "psz_newpos", psz_newpos, 6 );
i_pos = atoi( psz_pos );
i_newpos = atoi( psz_newpos );
+ /* FIXME FIXME TODO TODO XXX XXX
+ ( duplicate from rpn.c )
if ( i_pos < i_newpos )
{
playlist_Move( p_sys->p_playlist, i_pos, i_newpos + 1 );
playlist_Move( p_sys->p_playlist, i_pos, i_newpos );
}
msg_Dbg( p_intf, "requested move playlist item %d to %d", i_pos, i_newpos);
+ FIXME FIXME TODO TODO XXX XXX */
break;
}
case MVLC_CLOSE:
{
char id[512];
- E_(ExtractURIValue)( p_request, "id", id, 512 );
+ ExtractURIValue( p_request, "id", id, 512 );
msg_Dbg( p_intf, "requested close id=%s", id );
#if 0
if( p_sys->p_httpd->pf_control( p_sys->p_httpd, HTTPD_SET_CLOSE, id, NULL ) )
case MVLC_SHUTDOWN:
{
msg_Dbg( p_intf, "requested shutdown" );
- p_intf->p_vlc->b_die = VLC_TRUE;
+ libvlc_Quit( p_intf->p_libvlc );
break;
}
+#ifdef ENABLE_VLM
/* vlm */
case MVLC_VLM_NEW:
case MVLC_VLM_SETUP:
{
- static const char *vlm_properties[11] =
+ static const char vlm_properties[][9] =
{
/* no args */
"enabled", "disabled", "loop", "unloop",
/* args required */
- "input", "output", "option", "date", "period", "repeat", "append",
+ "input", "output", "option", "date", "period",
+ "repeat", "append", "",
};
vlm_message_t *vlm_answer;
char name[512];
if( p_intf->p_sys->p_vlm == NULL )
p_intf->p_sys->p_vlm = vlm_New( p_intf );
- if( p_intf->p_sys->p_vlm == NULL ) break;
+ if( p_intf->p_sys->p_vlm == NULL )
+ {
+ free( psz );
+ break;
+ }
- E_(ExtractURIValue)( p_request, "name", name, 512 );
+ ExtractURIValue( p_request, "name", name, 512 );
if( StrToMacroType( control ) == MVLC_VLM_NEW )
{
char type[20];
- E_(ExtractURIValue)( p_request, "type", type, 20 );
+ ExtractURIValue( p_request, "type", type, 20 );
p += sprintf( psz, "new %s %s", name, type );
}
else
p += sprintf( psz, "setup %s", name );
}
/* Parse the request */
- for( i = 0; i < 11; i++ )
+ for( i = 0; vlm_properties[i][0]; i++ )
{
char val[512];
- E_(ExtractURIValue)( p_request,
+ ExtractURIValue( p_request,
vlm_properties[i], val, 512 );
- E_(DecodeEncodedURI)( val );
+ decode_URI( val );
if( strlen( val ) > 0 && i >= 4 )
{
p += sprintf( p, " %s %s", vlm_properties[i], val );
}
- else if( E_(TestURIParam)( p_request, vlm_properties[i] ) && i < 4 )
+ else if( TestURIParam( p_request, vlm_properties[i] ) && i < 4 )
{
p += sprintf( p, " %s", vlm_properties[i] );
}
}
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 );
if( p_intf->p_sys->p_vlm == NULL ) break;
- E_(ExtractURIValue)( p_request, "name", name, 512 );
+ ExtractURIValue( p_request, "name", name, 512 );
sprintf( psz, "del %s", name );
vlm_ExecuteCommand( p_intf->p_sys->p_vlm, psz, &vlm_answer );
if( p_intf->p_sys->p_vlm == NULL ) break;
- E_(ExtractURIValue)( p_request, "name", name, 512 );
+ ExtractURIValue( p_request, "name", name, 512 );
if( StrToMacroType( control ) == MVLC_VLM_PLAY )
sprintf( psz, "control %s play", name );
else if( StrToMacroType( control ) == MVLC_VLM_PAUSE )
else if( StrToMacroType( control ) == MVLC_VLM_SEEK )
{
char percent[20];
- E_(ExtractURIValue)( p_request, "percent", percent, 512 );
+ ExtractURIValue( p_request, "percent", percent, 512 );
sprintf( psz, "control %s seek %s", name, percent );
}
if( p_intf->p_sys->p_vlm == NULL ) break;
- E_(ExtractURIValue)( p_request, "file", file, 512 );
- E_(DecodeEncodedURI)( file );
+ ExtractURIValue( p_request, "file", file, 512 );
+ decode_URI( file );
if( StrToMacroType( control ) == MVLC_VLM_LOAD )
sprintf( psz, "load %s", file );
vlm_MessageDelete( vlm_answer );
break;
}
-
+#endif /* ENABLE_VLM */
default:
if( *control )
{
{
break;
}
- E_(ExtractURIValue)( p_request, m->param1, value, 512 );
- E_(DecodeEncodedURI)( value );
+ ExtractURIValue( p_request, m->param1, value, 512 );
+ decode_URI( value );
switch( StrToMacroType( m->param2 ) )
{
int i;
float f;
char *psz;
+ lldiv_t div;
if( *m->param1 == '\0' )
{
break;
case MVLC_FLOAT:
f = config_GetFloat( p_intf, m->param1 );
- sprintf( value, "%f", f );
+ div = lldiv( f * 1000000 , 1000000 );
+ sprintf( value, "%lld.%06u", div.quot,
+ (unsigned int)div.rem );
break;
case MVLC_STRING:
psz = config_GetPsz( p_intf, m->param1 );
if( psz != NULL )
{
- strncpy( value, psz,sizeof( value ) );
+ strlcpy( value, psz,sizeof( value ) );
free( psz );
- value[sizeof( value ) - 1] = '\0';
}
else
*value = '\0';
default:
snprintf( value, sizeof( value ),
"invalid type(%s) in set", m->param2 );
- value[sizeof( value ) - 1] = '\0';
break;
}
PRINTS( "%s", value );
}
case MVLC_VALUE:
{
- char *s, *v;
+ char *s;
+ const char *v;
if( m->param1 )
{
#undef ALLOC
}
-char *MacroSearch( char *src, char *end, int i_mvlc, vlc_bool_t b_after )
+static
+char *MacroSearch( char *src, char *end, int i_mvlc, bool b_after )
{
int i_id;
int i_level = 0;
return NULL;
}
-void E_(Execute)( httpd_file_sys_t *p_args,
+void Execute( httpd_file_sys_t *p_args,
char *p_request, int i_request,
char **pp_data, int *pi_data,
char **pp_dst,
char *p_buffer;
char psz_file[MAX_DIR_SIZE];
char *p;
+ char sep;
- if( m.param1[0] != '/' )
+#if defined( WIN32 )
+ sep = '\\';
+#else
+ sep = '/';
+#endif
+
+ if( m.param1[0] != sep )
{
strcpy( psz_file, p_args->file );
- p = strrchr( psz_file, '/' );
+ p = strrchr( psz_file, sep );
if( p != NULL )
strcpy( p + 1, m.param1 );
else
strcpy( psz_file, m.param1 );
}
+ /* We hereby assume that psz_file is in the
+ * local character encoding */
if( ( f = fopen( psz_file, "r" ) ) == NULL )
{
msg_Warn( p_args->p_intf,
- "unable to include file %s (%s)",
- psz_file, strerror(errno) );
+ "unable to include file %s (%m)",
+ psz_file );
break;
}
/* first we load in a temporary buffer */
- E_(FileLoad)( f, &p_buffer, &i_buffer );
+ FileLoad( f, &p_buffer, &i_buffer );
/* we parse executing all <vlc /> macros */
- E_(Execute)( p_args, p_request, i_request, pp_data, pi_data,
+ Execute( p_args, p_request, i_request, pp_data, pi_data,
&dst, &p_buffer[0], &p_buffer[i_buffer] );
free( p_buffer );
fclose(f);
}
case MVLC_IF:
{
- vlc_bool_t i_test;
+ bool i_test;
char *endif;
EvaluateRPN( p_intf, p_args->vars, &p_args->stack, m.param1 );
{
i_test = 0;
}
- endif = MacroSearch( src, end, MVLC_END, VLC_TRUE );
+ endif = MacroSearch( src, end, MVLC_END, true );
if( i_test == 0 )
{
- char *start = MacroSearch( src, endif, MVLC_ELSE, VLC_TRUE );
+ char *start = MacroSearch( src, endif, MVLC_ELSE, true );
if( start )
{
- char *stop = MacroSearch( start, endif, MVLC_END, VLC_FALSE );
+ char *stop = MacroSearch( start, endif, MVLC_END, false );
if( stop )
{
- E_(Execute)( p_args, p_request, i_request,
+ Execute( p_args, p_request, i_request,
pp_data, pi_data, &dst, start, stop );
}
}
else if( i_test == 1 )
{
char *stop;
- if( ( stop = MacroSearch( src, endif, MVLC_ELSE, VLC_FALSE ) ) == NULL )
+ if( ( stop = MacroSearch( src, endif, MVLC_ELSE, false ) ) == NULL )
{
- stop = MacroSearch( src, endif, MVLC_END, VLC_FALSE );
+ stop = MacroSearch( src, endif, MVLC_END, false );
}
if( stop )
{
- E_(Execute)( p_args, p_request, i_request,
+ Execute( p_args, p_request, i_request,
pp_data, pi_data, &dst, src, stop );
}
}
}
case MVLC_FOREACH:
{
- char *endfor = MacroSearch( src, end, MVLC_END, VLC_TRUE );
+ char *endfor = MacroSearch( src, end, MVLC_END, true );
char *start = src;
- char *stop = MacroSearch( src, end, MVLC_END, VLC_FALSE );
+ char *stop = MacroSearch( src, end, MVLC_END, false );
if( stop )
{
index = mvar_FileSetNew( p_intf, m.param1, arg );
free( arg );
}
+ else if( !strcmp( m.param2, "object" ) )
+ {
+ char *arg = SSPop( &p_args->stack );
+ index = mvar_ObjectSetNew( p_intf, m.param1, arg );
+ free( arg );
+ }
else if( !strcmp( m.param2, "playlist" ) )
{
index = mvar_PlaylistSetNew( p_intf, m.param1,
}
else if( !strcmp( m.param2, "information" ) )
{
- index = mvar_InfoSetNew( p_intf, m.param1,
+ index = mvar_InfoSetNew( m.param1,
p_intf->p_sys->p_input );
}
else if( !strcmp( m.param2, "program" )
p_intf->p_sys->p_input,
m.param2 );
}
+#ifdef ENABLE_VLM
else if( !strcmp( m.param2, "vlm" ) )
{
if( p_intf->p_sys->p_vlm == NULL )
p_intf->p_sys->p_vlm = vlm_New( p_intf );
index = mvar_VlmSetNew( m.param1, p_intf->p_sys->p_vlm );
}
+#endif
#if 0
else if( !strcmp( m.param2, "hosts" ) )
{
mvar_PushVar( p_args->vars, f );
- E_(Execute)( p_args, p_request, i_request,
+ Execute( p_args, p_request, i_request,
pp_data, pi_data, &dst, start, stop );
mvar_RemoveVar( p_args->vars, f );
projects / vlc / blobdiff