* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
#include "http.h"
"machine, enter 127.0.0.1" )
#define SRC_TEXT N_( "Source directory" )
#define SRC_LONGTEXT N_( "Source directory" )
-#define CHARSET_TEXT N_( "Charset" )
-#define CHARSET_LONGTEXT N_( \
- "Charset declared in Content-Type header (default UTF-8)." )
#define HANDLERS_TEXT N_( "Handlers" )
#define HANDLERS_LONGTEXT N_( \
"List of handler extensions and executable paths (for instance: " \
"php=/usr/bin/php,pl=/usr/bin/perl)." )
+#define ART_TEXT N_( "Export album art as /art." )
+#define ART_LONGTEXT N_( \
+ "Allow exporting album art for current playlist items at the " \
+ "/art and /art?id=<id> URLs." )
#define CERT_TEXT N_( "Certificate file" )
#define CERT_LONGTEXT N_( "HTTP interface x509 PEM certificate file " \
"(enables SSL)." )
set_description( _("HTTP remote control interface") );
set_category( CAT_INTERFACE );
set_subcategory( SUBCAT_INTERFACE_MAIN );
- add_string ( "http-host", NULL, NULL, HOST_TEXT, HOST_LONGTEXT, VLC_TRUE );
- add_string ( "http-src", NULL, NULL, SRC_TEXT, SRC_LONGTEXT, VLC_TRUE );
- add_string ( "http-charset", "UTF-8", NULL, CHARSET_TEXT, CHARSET_LONGTEXT, VLC_TRUE );
+ add_string ( "http-host", NULL, NULL, HOST_TEXT, HOST_LONGTEXT, true );
+ add_string ( "http-src", NULL, NULL, SRC_TEXT, SRC_LONGTEXT, true );
+ add_obsolete_string ( "http-charset" );
#if defined( HAVE_FORK ) || defined( WIN32 )
- add_string ( "http-handlers", NULL, NULL, HANDLERS_TEXT, HANDLERS_LONGTEXT, VLC_TRUE );
+ add_string ( "http-handlers", NULL, NULL, HANDLERS_TEXT, HANDLERS_LONGTEXT, true );
#endif
+ add_bool ( "http-album-art", false, NULL, ART_TEXT, ART_LONGTEXT, true );
set_section( N_("HTTP SSL" ), 0 );
- add_string ( "http-intf-cert", NULL, NULL, CERT_TEXT, CERT_LONGTEXT, VLC_TRUE );
- add_string ( "http-intf-key", NULL, NULL, KEY_TEXT, KEY_LONGTEXT, VLC_TRUE );
- add_string ( "http-intf-ca", NULL, NULL, CA_TEXT, CA_LONGTEXT, VLC_TRUE );
- add_string ( "http-intf-crl", NULL, NULL, CRL_TEXT, CRL_LONGTEXT, VLC_TRUE );
+ add_string ( "http-intf-cert", NULL, NULL, CERT_TEXT, CERT_LONGTEXT, true );
+ add_string ( "http-intf-key", NULL, NULL, KEY_TEXT, KEY_LONGTEXT, true );
+ add_string ( "http-intf-ca", NULL, NULL, CA_TEXT, CA_LONGTEXT, true );
+ add_string ( "http-intf-crl", NULL, NULL, CRL_TEXT, CRL_LONGTEXT, true );
set_capability( "interface", 0 );
set_callbacks( Open, Close );
vlc_module_end();
/*****************************************************************************
* Local prototypes
*****************************************************************************/
-static void Run ( intf_thread_t *p_intf );
+int E_(ArtCallback)( httpd_handler_sys_t *p_args,
+ httpd_handler_t *p_handler, char *_p_url,
+ uint8_t *_p_request, int i_type,
+ uint8_t *_p_in, int i_in,
+ char *psz_remote_addr, char *psz_remote_host,
+ uint8_t **pp_data, int *pi_data );
/*****************************************************************************
* Local functions
const char *psz_cert = NULL, *psz_key = NULL, *psz_ca = NULL,
*psz_crl = NULL;
int i_port = 0;
- char *psz_src;
+ char *psz_src = NULL;
- var_Create(p_intf->p_libvlc_global, "http-host", VLC_VAR_STRING );
- psz_address=var_GetString(p_intf->p_libvlc_global, "http-host");
- if( !psz_address || !*psz_address )
- {
- psz_address = config_GetPsz( p_intf, "http-host" );
- }
+ psz_address = var_CreateGetNonEmptyString( p_intf, "http-host" );
if( psz_address != NULL )
{
char *psz_parser = strchr( psz_address, ':' );
{
return( VLC_ENOMEM );
}
- p_sys->p_playlist = NULL;
+
+ p_sys->p_playlist = pl_Yield( p_this );
p_sys->p_input = NULL;
p_sys->p_vlm = NULL;
p_sys->psz_address = psz_address;
p_sys->i_port = i_port;
-
- /* determine Content-Type value for HTML pages */
- psz_src = config_GetPsz( p_intf, "http-charset" );
- if( psz_src == NULL || !*psz_src )
- {
- if( psz_src != NULL ) free( psz_src );
- psz_src = strdup("UTF-8");
- }
-
- p_sys->psz_html_type = malloc( 20 + strlen( psz_src ) );
- if( p_sys->psz_html_type == NULL )
- {
- free( p_sys->psz_address );
- free( p_sys );
- free( psz_src );
- return VLC_ENOMEM ;
- }
- sprintf( p_sys->psz_html_type, "text/html; charset=%s", psz_src );
- msg_Dbg( p_intf, "using charset=%s", psz_src );
-
- if( strcmp( psz_src, "UTF-8" ) )
- {
- char psz_encoding[strlen( psz_src ) + sizeof( "//translit")];
- sprintf( psz_encoding, "%s//translit", psz_src);
-
- p_sys->iconv_from_utf8 = vlc_iconv_open( psz_encoding, "UTF-8" );
- if( p_sys->iconv_from_utf8 == (vlc_iconv_t)-1 )
- msg_Warn( p_intf, "unable to perform charset conversion to %s",
- psz_encoding );
- else
- {
- p_sys->iconv_to_utf8 = vlc_iconv_open( "UTF-8", psz_src );
- if( p_sys->iconv_to_utf8 == (vlc_iconv_t)-1 )
- msg_Warn( p_intf,
- "unable to perform charset conversion from %s",
- psz_src );
- }
- }
- else
- {
- p_sys->iconv_from_utf8 = p_sys->iconv_to_utf8 = (vlc_iconv_t)-1;
- }
-
- p_sys->psz_charset = psz_src;
- psz_src = NULL;
+ p_sys->p_art_handler = NULL;
/* determine file handler associations */
p_sys->i_handlers = 0;
TAB_APPEND( p_sys->i_handlers, p_sys->pp_handlers, p_handler );
}
}
- if( psz_src != NULL )
- free( psz_src );
+ free( psz_src );
#endif
/* determine SSL configuration */
{
msg_Dbg( p_intf, "enabling TLS for HTTP interface (cert file: %s)",
psz_cert );
- psz_key = config_GetPsz( p_intf, "http-intf-key" );
- psz_ca = config_GetPsz( p_intf, "http-intf-ca" );
- psz_crl = config_GetPsz( p_intf, "http-intf-crl" );
+ psz_key = var_GetNonEmptyString( p_intf, "http-intf-key" );
+ psz_ca = var_GetNonEmptyString( p_intf, "http-intf-ca" );
+ psz_crl = var_GetNonEmptyString( p_intf, "http-intf-crl" );
if( i_port <= 0 )
i_port = 8443;
if( p_sys->p_httpd_host == NULL )
{
msg_Err( p_intf, "cannot listen on %s:%d", psz_address, i_port );
- free( p_sys->psz_html_type );
+ pl_Release( p_this );
free( p_sys->psz_address );
free( p_sys );
return VLC_EGENERIC;
/* Ugly hack to run several HTTP servers on different ports */
snprintf( psz_tmp, sizeof (psz_tmp), "%s:%d", psz_address, i_port + 1 );
- var_SetString( p_intf->p_libvlc_global, "http-host", psz_tmp );
+ var_Create(p_intf->p_libvlc, "http-host", VLC_VAR_STRING );
+ var_SetString( p_intf->p_libvlc, "http-host", psz_tmp );
}
p_sys->i_files = 0;
#if defined(__APPLE__) || defined(SYS_BEOS) || defined(WIN32)
if ( ( psz_src = config_GetPsz( p_intf, "http-src" )) == NULL )
{
- char * psz_vlcpath = p_intf->p_libvlc_global->psz_vlcpath;
- psz_src = malloc( strlen(psz_vlcpath) + strlen("/share/http" ) + 1 );
+ const char * psz_vlcpath = config_GetDataDir();
+ psz_src = malloc( strlen(psz_vlcpath) + strlen("/http" ) + 1 );
if( !psz_src ) return VLC_ENOMEM;
-#if defined(WIN32)
sprintf( psz_src, "%s/http", psz_vlcpath );
-#else
- sprintf( psz_src, "%s/share/http", psz_vlcpath );
-#endif
}
#else
psz_src = config_GetPsz( p_intf, "http-src" );
if( ( psz_src == NULL ) || ( *psz_src == '\0' ) )
{
- static char const* ppsz_paths[] = {
+ const char *data_path = config_GetDataDir ();
+ char buf[strlen (data_path) + sizeof ("/http")];
+ snprintf (buf, sizeof (buf), "%s/http", data_path);
+
+ const char const* ppsz_paths[] = {
"share/http",
"../share/http",
- DATA_PATH"/http",
+ buf,
NULL
};
unsigned i;
- if( psz_src != NULL )
- {
- free( psz_src );
- psz_src = NULL;
- }
+ free( psz_src );
+ psz_src = NULL;
for( i = 0; ppsz_paths[i] != NULL; i++ )
if( !DirectoryCheck( ppsz_paths[i] ) )
}
E_(ParseDirectory)( p_intf, psz_src, psz_src );
-
-
if( p_sys->i_files <= 0 )
{
msg_Err( p_intf, "cannot find any file in directory %s", psz_src );
goto failed;
}
- p_intf->pf_run = Run;
+
free( psz_src );
+ if( config_GetInt( p_intf, "http-album-art" ) )
+ {
+ /* FIXME: we're leaking h */
+ httpd_handler_sys_t *h = malloc( sizeof( httpd_handler_sys_t ) );
+ if( !h )
+ {
+ msg_Err( p_intf, "not enough memory to allocate album art handler" );
+ goto failed;
+ }
+ h->file.p_intf = p_intf;
+ h->file.file = NULL;
+ h->file.name = NULL;
+ /* TODO: use ACL and login/password stuff here too */
+ h->p_handler = httpd_HandlerNew( p_sys->p_httpd_host,
+ "/art", NULL, NULL, NULL,
+ E_(ArtCallback), h );
+ p_sys->p_art_handler = h->p_handler;
+ }
+
return VLC_SUCCESS;
failed:
- if( psz_src ) free( psz_src );
- if( p_sys->pp_files )
- {
- free( p_sys->pp_files );
- }
+ free( psz_src );
+ free( p_sys->pp_files );
httpd_HostDelete( p_sys->p_httpd_host );
free( p_sys->psz_address );
- free( p_sys->psz_html_type );
- if( p_sys->iconv_from_utf8 != (vlc_iconv_t)-1 )
- vlc_iconv_close( p_sys->iconv_from_utf8 );
- if( p_sys->iconv_to_utf8 != (vlc_iconv_t)-1 )
- vlc_iconv_close( p_sys->iconv_to_utf8 );
free( p_sys );
+ pl_Release( p_this );
return VLC_EGENERIC;
}
free( p_sys->pp_files[i]->name );
free( p_sys->pp_files[i] );
}
- if( p_sys->pp_files )
- {
- free( p_sys->pp_files );
- }
+ free( p_sys->pp_files );
for( i = 0; i < p_sys->i_handlers; i++ )
{
http_association_t *p_handler = p_sys->pp_handlers[i];
}
if( p_sys->i_handlers )
free( p_sys->pp_handlers );
+ if( p_sys->p_art_handler )
+ httpd_HandlerDelete( p_sys->p_art_handler );
httpd_HostDelete( p_sys->p_httpd_host );
free( p_sys->psz_address );
- free( p_sys->psz_html_type );
-
- if( p_sys->iconv_from_utf8 != (vlc_iconv_t)-1 )
- vlc_iconv_close( p_sys->iconv_from_utf8 );
- if( p_sys->iconv_to_utf8 != (vlc_iconv_t)-1 )
- vlc_iconv_close( p_sys->iconv_to_utf8 );
free( p_sys );
-}
-
-/*****************************************************************************
- * Run: http interface thread
- *****************************************************************************/
-static void Run( intf_thread_t *p_intf )
-{
- intf_sys_t *p_sys = p_intf->p_sys;
-
- while( !intf_ShouldDie( p_intf ) )
- {
- /* get the playlist */
- if( p_sys->p_playlist == NULL )
- {
- p_sys->p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
- }
-
- /* Manage the input part */
- if( p_sys->p_input == NULL )
- {
- if( p_sys->p_playlist )
- {
- p_sys->p_input = p_sys->p_playlist->p_input;
- }
- }
- else if( p_sys->p_input->b_dead || p_sys->p_input->b_die )
- {
- p_sys->p_input = NULL;
- }
-
-
- /* Wait a bit */
- msleep( INTF_IDLE_SLEEP );
- }
-
- if( p_sys->p_input )
- {
- vlc_object_release( p_sys->p_input );
- p_sys->p_input = NULL;
- }
-
- if( p_sys->p_playlist )
- {
- vlc_object_release( p_sys->p_playlist );
- p_sys->p_playlist = NULL;
- }
+ pl_Release( p_this );
}
/****************************************************************************
int i_buffer, char *p_request,
char **pp_data, int *pi_data )
{
+ intf_sys_t *p_sys = p_args->p_intf->p_sys;
int i_request = p_request != NULL ? strlen( p_request ) : 0;
char *dst;
vlc_value_t val;
char length[12]; /* in seconds */
audio_volume_t i_volume;
char volume[5];
- char state[8];
+ const char *state;
char stats[20];
-#define p_sys p_args->p_intf->p_sys
+ assert( p_sys->p_input == NULL );
+ /* FIXME: proper locking anyone? */
+ p_sys->p_input = p_sys->p_playlist->p_input;
if( p_sys->p_input )
{
+ vlc_object_yield( p_sys->p_input );
var_Get( p_sys->p_input, "position", &val);
sprintf( position, "%d" , (int)((val.f_float) * 100.0));
var_Get( p_sys->p_input, "time", &val);
- sprintf( time, I64Fi, val.i_time / 1000000LL );
+ sprintf( time, "%"PRIi64, (int64_t)val.i_time / I64C(1000000) );
var_Get( p_sys->p_input, "length", &val);
- sprintf( length, I64Fi, val.i_time / 1000000LL );
+ sprintf( length, "%"PRIi64, (int64_t)val.i_time / I64C(1000000) );
var_Get( p_sys->p_input, "state", &val );
if( val.i_int == PLAYING_S )
{
- sprintf( state, "playing" );
+ state = "playing";
}
else if( val.i_int == OPENING_S )
{
- sprintf( state, "opening/connecting" );
+ state = "opening/connecting";
}
else if( val.i_int == BUFFERING_S )
{
- sprintf( state, "buffering" );
+ state = "buffering";
}
else if( val.i_int == PAUSE_S )
{
- sprintf( state, "paused" );
+ state = "paused";
}
else
{
- sprintf( state, "stop" );
+ state = "stop";
}
}
else
sprintf( position, "%d", 0 );
sprintf( time, "%d", 0 );
sprintf( length, "%d", 0 );
- sprintf( state, "stop" );
+ state = "stop";
}
-#undef p_sys
aout_VolumeGet( p_args->p_intf, &i_volume );
sprintf( volume, "%d", (int)i_volume );
E_(mvar_AppendNewVar)( p_args->vars, "vlc_compile_domain",
VLC_CompileDomain() );
E_(mvar_AppendNewVar)( p_args->vars, "vlc_compiler", VLC_Compiler() );
-#ifndef HAVE_SHARED_LIBVLC
E_(mvar_AppendNewVar)( p_args->vars, "vlc_changeset", VLC_Changeset() );
-#endif
E_(mvar_AppendNewVar)( p_args->vars, "stream_position", position );
E_(mvar_AppendNewVar)( p_args->vars, "stream_time", time );
E_(mvar_AppendNewVar)( p_args->vars, "stream_length", length );
E_(mvar_AppendNewVar)( p_args->vars, "volume", volume );
E_(mvar_AppendNewVar)( p_args->vars, "stream_state", state );
- E_(mvar_AppendNewVar)( p_args->vars, "charset", ((intf_sys_t *)p_args->p_intf->p_sys)->psz_charset );
+ E_(mvar_AppendNewVar)( p_args->vars, "charset", "UTF-8" );
/* Stats */
-#define p_sys p_args->p_intf->p_sys
if( p_sys->p_input )
{
- input_item_t *p_item = input_GetItem( p_sys->p_input );
+ /* FIXME: Workarround a stupid assert in input_GetItem */
+ input_item_t *p_item = p_sys->p_input && p_sys->p_input->p
+ ? input_GetItem( p_sys->p_input )
+ : NULL;
+
if( p_item )
{
vlc_mutex_lock( &p_item->p_stats->lock );
vlc_mutex_unlock( &p_item->p_stats->lock );
}
}
-#undef p_sys
E_(SSInit)( &p_args->stack );
*dst = '\0';
*pi_data = dst - *pp_data;
+ if( p_sys->p_input != NULL )
+ {
+ vlc_object_release( p_sys->p_input );
+ p_sys->p_input = NULL;
+ }
E_(SSClean)( &p_args->stack );
E_(mvar_Delete)( p_args->vars );
}
uint8_t *_p_request,
uint8_t **_pp_data, int *pi_data )
{
+ VLC_UNUSED(p_file);
char *p_request = (char *)_p_request;
char **pp_data = (char **)_pp_data;
FILE *f;
char *psz_remote_addr, char *psz_remote_host,
uint8_t **_pp_data, int *pi_data )
{
+ VLC_UNUSED(p_handler); VLC_UNUSED(_p_in);
char *p_url = (char *)_p_url;
char *p_request = (char *)_p_request;
char **pp_data = (char **)_pp_data;
char **ppsz_env = NULL;
char *psz_tmp;
char sep;
- int i_buffer;
+ size_t i_buffer;
char *p_buffer;
char *psz_cwd, *psz_file = NULL;
int i_ret;
NULL );
TAB_REMOVE( p_args->p_association->i_argc, p_args->p_association->ppsz_argv,
psz_file );
- if( psz_cwd != NULL )
- free( psz_cwd );
+ free( psz_cwd );
while( i_env )
TAB_REMOVE( i_env, ppsz_env, ppsz_env[0] );
return VLC_SUCCESS;
}
+
+int E_(ArtCallback)( httpd_handler_sys_t *p_args,
+ httpd_handler_t *p_handler, char *_p_url,
+ uint8_t *p_request, int i_type,
+ uint8_t *p_in, int i_in,
+ char *psz_remote_addr, char *psz_remote_host,
+ uint8_t **pp_data, int *pi_data )
+{
+ VLC_UNUSED(p_handler); VLC_UNUSED(_p_url); VLC_UNUSED(i_type);
+ VLC_UNUSED(p_in); VLC_UNUSED(i_in); VLC_UNUSED(psz_remote_addr);
+ VLC_UNUSED(psz_remote_host);
+
+ char *psz_art = NULL;
+ intf_thread_t *p_intf = p_args->file.p_intf;
+ intf_sys_t *p_sys = p_intf->p_sys;
+ char psz_id[16];
+ input_item_t *p_item = NULL;
+ int i_id;
+
+ psz_id[0] = '\0';
+ if( p_request )
+ E_(ExtractURIValue)( (char *)p_request, "id", psz_id, 15 );
+ i_id = atoi( psz_id );
+ if( i_id )
+ {
+ playlist_item_t *p_pl_item = playlist_ItemGetById( p_sys->p_playlist,
+ i_id, false );
+ if( p_pl_item )
+ p_item = p_pl_item->p_input;
+ }
+ else
+ {
+ /* FIXME: Workarround a stupid assert in input_GetItem */
+ if( p_sys->p_input && p_sys->p_input->p )
+ p_item = input_GetItem( p_sys->p_input );
+ }
+
+ if( p_item )
+ {
+ psz_art = input_item_GetArtURL( p_item );
+ }
+
+ if( psz_art && !strncmp( psz_art, "file://", strlen( "file://" ) ) )
+ {
+ FILE *f;
+ char *psz_ext;
+ char *psz_header;
+ char *p_data = NULL;
+ int i_header_size, i_data;
+
+ if( ( f = utf8_fopen( psz_art + strlen( "file://" ), "r" ) ) == NULL )
+ {
+ msg_Dbg( p_intf, "Couldn't open album art file %s",
+ psz_art + strlen( "file://" ) );
+ Callback404( &p_args->file, (char**)pp_data, pi_data );
+ free( psz_art );
+ return VLC_SUCCESS;
+ }
+
+ E_(FileLoad)( f, &p_data, &i_data );
+
+ fclose( f );
+
+ psz_ext = strrchr( psz_art, '.' );
+ if( psz_ext ) psz_ext++;
+
+#define HEADER "Content-Type: image/%s\n" \
+ "Content-Length: %d\n" \
+ "\n"
+ i_header_size = asprintf( &psz_header, HEADER, psz_ext, i_data );
+#undef HEADER
+
+ *pi_data = i_header_size + i_data;
+ *pp_data = (uint8_t*)malloc( *pi_data );
+ memcpy( *pp_data, psz_header, i_header_size );
+ memcpy( *pp_data+i_header_size, p_data, i_data );
+ free( psz_header );
+ free( p_data );
+ }
+ else
+ {
+ msg_Dbg( p_intf, "No album art found" );
+ Callback404( &p_args->file, (char**)pp_data, pi_data );
+ }
+
+ free( psz_art );
+
+ return VLC_SUCCESS;
+}
projects / vlc / blobdiff