/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h>
#include <vlc/vlc.h>
-#include <vlc/sout.h>
+#include <vlc_sout.h>
+#include <vlc_block.h>
-#ifdef HAVE_AVAHI_CLIENT
- #include <vlc/intf.h>
+#include <vlc_input.h>
+#include <vlc_playlist.h>
+
+#ifdef HAVE_AVAHI_CLIENT
#include "bonjour.h"
#if defined( WIN32 )
#include "vlc_httpd.h"
-#define FREE( p ) if( p ) { free( p); (p) = NULL; }
-
#define DEFAULT_PORT 8080
#define DEFAULT_SSL_PORT 8443
#define PASS_TEXT N_("Password")
#define PASS_LONGTEXT N_("Password that will be " \
"requested to access the stream." )
-
-/// \bug [String] missing closing parenthesis
#define MIME_TEXT N_("Mime")
#define MIME_LONGTEXT N_("MIME returned by the server (autodetected " \
- "if not specified." )
-
+ "if not specified)." )
#define CERT_TEXT N_( "Certificate file" )
#define CERT_LONGTEXT N_( "Path to the x509 PEM certificate file that will "\
"be used for HTTPS." )
vlc_module_begin();
set_description( _("HTTP stream output") );
set_capability( "sout access", 0 );
- set_shortname( N_("HTTP" ) );
+ set_shortname( "HTTP" );
add_shortcut( "http" );
add_shortcut( "https" );
add_shortcut( "mmsh" );
return VLC_ENOMEM ;
}
- sout_CfgParse( p_access, SOUT_CFG_PREFIX, ppsz_sout_options, p_access->p_cfg );
+ config_ChainParse( p_access, SOUT_CFG_PREFIX, ppsz_sout_options, p_access->p_cfg );
- /* p_access->psz_name = "hostname:port/filename" */
- psz_bind_addr = psz_parser = strdup( p_access->psz_name );
+ /* p_access->psz_path = "hostname:port/filename" */
+ psz_bind_addr = psz_parser = strdup( p_access->psz_path );
i_bind_port = 0;
- psz_file_name = "";
+ psz_file_name = NULL;
while( *psz_parser && *psz_parser != ':' && *psz_parser != '/' )
{
psz_file_name = psz_parser;
}
- if( !*psz_file_name )
+ if( psz_file_name == NULL )
{
psz_file_name = strdup( "/" );
}
#ifdef HAVE_AVAHI_CLIENT
if( config_GetInt(p_this, SOUT_CFG_PREFIX "bonjour") )
{
- playlist_t *p_playlist;
char *psz_txt, *psz_name;
+ playlist_t *p_playlist = pl_Yield( p_access );
- p_playlist = (playlist_t *)vlc_object_find( p_access,
- VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
- if( p_playlist == NULL )
- {
- msg_Err( p_access, "unable to find playlist" );
- httpd_StreamDelete( p_sys->p_httpd_stream );
- httpd_HostDelete( p_sys->p_httpd_host );
- free( (void *)p_sys );
- return VLC_EGENERIC;
- }
-
- psz_name = strrchr( p_playlist->status.p_item->p_input->psz_uri,
- DIRECTORY_SEPARATOR );
+ char *psz_uri = input_item_GetURI( p_playlist->status.p_item->p_input );
+ char *psz_newuri = psz_uri;
+ psz_name = strrchr( psz_newuri, DIRECTORY_SEPARATOR );
if( psz_name != NULL ) psz_name++;
- else psz_name = p_playlist->status.p_item->p_input->psz_uri;
+ else psz_name = psz_newuri;
- asprintf( &psz_txt, "path=%s", psz_file_name );
+ asprintf( &psz_txt, "path=%s", psz_name );
+
+ free( psz_uri );
p_sys->p_bonjour = bonjour_start_service( (vlc_object_t *)p_access,
strcmp( p_access->psz_access, "https" )
? "_vlc-http._tcp" : "_vlc-https._tcp",
- psz_name, i_bind_port, psz_txt );
+ psz_name, i_bind_port, psz_txt );
free( (void *)psz_txt );
if( p_sys->p_bonjour == NULL )
- {
- msg_Err( p_access, "Avahi stream announcing was requested, but no avahi service could be started" );
- }
+ msg_Err( p_access, "unable to start requested Bonjour announce" );
vlc_object_release( p_playlist );
}
else
{
sout_access_out_sys_t *p_sys = p_access->p_sys;
int i_err = 0;
+ int i_len = 0;
while( p_buffer )
{
p_sys->i_header_size );
}
+ i_len += p_buffer->i_buffer;
/* send data */
i_err = httpd_StreamSend( p_sys->p_httpd_stream, p_buffer->p_buffer,
p_buffer->i_buffer );
block_ChainRelease( p_buffer );
}
- return( i_err < 0 ? VLC_EGENERIC : VLC_SUCCESS );
+ return( i_err < 0 ? VLC_EGENERIC : i_len );
}
/*****************************************************************************