Commit 3814df3b authored by Christophe Mutricy's avatar Christophe Mutricy

http.c: add an option to disable bonjour (closes #509).

	Please review and improve the option text and longtext strings. 
parent 3d24634c
...@@ -82,6 +82,9 @@ static void Close( vlc_object_t * ); ...@@ -82,6 +82,9 @@ static void Close( vlc_object_t * );
#define CRL_LONGTEXT N_( "Path to the x509 PEM Certificates Revocation List " \ #define CRL_LONGTEXT N_( "Path to the x509 PEM Certificates Revocation List " \
"file that will be HTTP/SSL stream output. Leave " \ "file that will be HTTP/SSL stream output. Leave " \
"empty if you don't have one." ) "empty if you don't have one." )
#define BONJOUR_TEXT N_( "Advertise with Bonjour")
#define BONJOUR_LONGTEXT N_( "Advertise the stream with the Bonjour protocol" )
vlc_module_begin(); vlc_module_begin();
set_description( _("HTTP stream output") ); set_description( _("HTTP stream output") );
...@@ -106,6 +109,8 @@ vlc_module_begin(); ...@@ -106,6 +109,8 @@ vlc_module_begin();
CA_TEXT, CA_LONGTEXT, VLC_TRUE ); CA_TEXT, CA_LONGTEXT, VLC_TRUE );
add_string( SOUT_CFG_PREFIX "crl", NULL, NULL, add_string( SOUT_CFG_PREFIX "crl", NULL, NULL,
CRL_TEXT, CRL_LONGTEXT, VLC_TRUE ); CRL_TEXT, CRL_LONGTEXT, VLC_TRUE );
add_bool( SOUT_CFG_PREFIX "bonjour", VLC_FALSE, NULL,
BONJOUR_TEXT, BONJOUR_LONGTEXT,VLC_TRUE);
set_callbacks( Open, Close ); set_callbacks( Open, Close );
vlc_module_end(); vlc_module_end();
...@@ -317,6 +322,8 @@ static int Open( vlc_object_t *p_this ) ...@@ -317,6 +322,8 @@ static int Open( vlc_object_t *p_this )
if( psz_name != NULL ) psz_name++; if( psz_name != NULL ) psz_name++;
else psz_name = p_playlist->status.p_item->input.psz_uri; else psz_name = p_playlist->status.p_item->input.psz_uri;
if( config_GetInt(p_this, SOUT_CFG_PREFIX "bonjour") )
{
p_sys->p_bonjour = bonjour_start_service( (vlc_object_t *)p_access, p_sys->p_bonjour = bonjour_start_service( (vlc_object_t *)p_access,
"_vlc-http._tcp", "_vlc-http._tcp",
psz_name, i_bind_port, psz_txt ); psz_name, i_bind_port, psz_txt );
...@@ -328,7 +335,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -328,7 +335,7 @@ static int Open( vlc_object_t *p_this )
free( (void *)p_sys ); free( (void *)p_sys );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
}
vlc_object_release( p_playlist ); vlc_object_release( p_playlist );
#endif #endif
...@@ -356,6 +363,7 @@ static void Close( vlc_object_t * p_this ) ...@@ -356,6 +363,7 @@ static void Close( vlc_object_t * p_this )
sout_access_out_sys_t *p_sys = p_access->p_sys; sout_access_out_sys_t *p_sys = p_access->p_sys;
#ifdef HAVE_AVAHI_CLIENT #ifdef HAVE_AVAHI_CLIENT
if( config_GetInt(p_this, SOUT_CFG_PREFIX "bonjour") )
bonjour_stop_service( p_sys->p_bonjour ); bonjour_stop_service( p_sys->p_bonjour );
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment