/*****************************************************************************
* http.h: Headers for the HTTP interface
*****************************************************************************
- * Copyright (C) 2001-2005 the VideoLAN team
+ * Copyright (C) 2001-2007 the VideoLAN team
* $Id$
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
/*****************************************************************************
* Preamble
*****************************************************************************/
+#include <vlc/vlc.h>
#include <stdlib.h>
#include <strings.h>
#include <ctype.h>
-#include <vlc/vlc.h>
#include <vlc_interface.h>
#include <vlc_playlist.h>
#include "vlc_httpd.h"
#include "vlc_vlm.h"
-#include "vlc_tls.h"
+#include "vlc_network.h"
#include "vlc_acl.h"
#include "vlc_charset.h"
/** This function returns the real path of a file or directory */
char *E_(RealPath)( intf_thread_t *p_intf, const char *psz_src );
-/* Locale handling functions */
-
-/** This fuction converts a locale string to UTF-8 */
-char *E_(FromUTF8)( intf_thread_t *p_intf, char *psz_utf8 );
-/** This function converts an UTF-8 to locale */
-char *E_(ToUTF8)( intf_thread_t *p_intf, char *psz_local );
-
/** This command parses the "seek" command for the HTTP interface
* and performs the requested action */
void E_(HandleSeek)( intf_thread_t *p_intf, char *p_value );
char *E_(ExtractURIValue)( char *restrict psz_uri,
const char *restrict psz_name,
char *restrict psz_value, size_t i_value_max );
+char *E_(ExtractURIString)( char *restrict psz_uri,
+ const char *restrict psz_name );
/** \todo Describe this function */
int E_(TestURIParam)( char *psz_uri, const char *psz_name );
mvar_t *E_(mvar_IntegerSetNew)( const char *name, const char *arg );
/** This function creates a set variable with a list of VLC objects */
-mvar_t *E_(mvar_ObjectSetNew)( intf_thread_t *p_intf, char *name, char *arg );
+mvar_t *E_(mvar_ObjectSetNew)( intf_thread_t *p_intf, char *name, const char *arg );
/** This function creates a set variable with the contents of the playlist */
mvar_t *E_(mvar_PlaylistSetNew)( intf_thread_t *p_intf, char *name,
playlist_t *p_pl );
/** This function creates a set variable with the contents of the Stream
* and media info box */
-mvar_t *E_(mvar_InfoSetNew)( intf_thread_t *p_intf, char *name,
- input_thread_t *p_input );
+mvar_t *E_(mvar_InfoSetNew)( char *name, input_thread_t *p_input );
/** This function creates a set variable with the input parameters */
mvar_t *E_(mvar_InputVarSetNew)( intf_thread_t *p_intf, char *name,
input_thread_t *p_input,
char *param2; ///< Second parameter
} macro_t;
-/** This function creates a macro from a <vlc ....> tag */
-int E_(MacroParse)( macro_t *m, char *psz_src );
-/** This function cleans a macro */
-void E_(MacroClean)( macro_t *m );
-
-/** This function returns the macro type identifier from its id= string value
- * It uses the StrToMacroTypeTab mapping array for this */
-int E_(StrToMacroType)( char *name );
-/** This function actually executes the macro */
-void E_(MacroDo)( httpd_file_sys_t *p_args, macro_t *m,
- char *p_request, int i_request, char **pp_data,
- int *pi_data, char **pp_dst );
-/** This function looks for macros in a string */
-char *E_(MacroSearch)( char *src, char *end,
- int i_mvlc, vlc_bool_t b_after );
-
/** This function parses a file for macros */
void E_(Execute)( httpd_file_sys_t *p_args,
char *p_request, int i_request,
int i_handlers;
http_association_t **pp_handlers;
+ httpd_handler_t *p_art_handler;
playlist_t *p_playlist;
input_thread_t *p_input;
vlm_t *p_vlm;
- char *psz_html_type;
- char *psz_charset;
- vlc_iconv_t iconv_from_utf8, iconv_to_utf8;
char *psz_address;
unsigned short i_port;