Gestures: privatize interface callback lock

[vlc] / modules / access_output / http.c

diff --git a/modules/access_output/http.c b/modules/access_output/http.c
index a55a1d497ebfbefc5a8d6c1769c19d5820b2dfe1..6e713e5018cb967618c06e6bd3312be91af4d14c 100644 (file)
--- a/modules/access_output/http.c
+++ b/modules/access_output/http.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * http.c
  *****************************************************************************
- * Copyright (C) 2001-2005 the VideoLAN team
+ * Copyright (C) 2001-2009 the VideoLAN team
  * $Id$
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -39,7 +39,7 @@
 #include <vlc_input.h>
 #include <vlc_playlist.h>
 
-#ifdef HAVE_AVAHI_CLIENT
+#if 0 //def HAVE_AVAHI_CLIENT
     #include "bonjour.h"
 
     #if defined( WIN32 )
@@ -91,33 +91,35 @@ static void Close( vlc_object_t * );
 #define BONJOUR_LONGTEXT N_( "Advertise the stream with the Bonjour protocol." )
 
 
-vlc_module_begin();
-    set_description( N_("HTTP stream output") );
-    set_capability( "sout access", 0 );
-    set_shortname( "HTTP" );
-    add_shortcut( "http" );
-    add_shortcut( "https" );
-    add_shortcut( "mmsh" );
-    set_category( CAT_SOUT );
-    set_subcategory( SUBCAT_SOUT_ACO );
+vlc_module_begin ()
+    set_description( N_("HTTP stream output") )
+    set_capability( "sout access", 0 )
+    set_shortname( "HTTP" )
+    add_shortcut( "http" )
+    add_shortcut( "https" )
+    add_shortcut( "mmsh" )
+    set_category( CAT_SOUT )
+    set_subcategory( SUBCAT_SOUT_ACO )
     add_string( SOUT_CFG_PREFIX "user", "", NULL,
-                USER_TEXT, USER_LONGTEXT, true );
+                USER_TEXT, USER_LONGTEXT, true )
     add_string( SOUT_CFG_PREFIX "pwd", "", NULL,
-                PASS_TEXT, PASS_LONGTEXT, true );
+                PASS_TEXT, PASS_LONGTEXT, true )
     add_string( SOUT_CFG_PREFIX "mime", "", NULL,
-                MIME_TEXT, MIME_LONGTEXT, true );
+                MIME_TEXT, MIME_LONGTEXT, true )
     add_string( SOUT_CFG_PREFIX "cert", "vlc.pem", NULL,
-                CERT_TEXT, CERT_LONGTEXT, true );
+                CERT_TEXT, CERT_LONGTEXT, true )
     add_string( SOUT_CFG_PREFIX "key", NULL, NULL,
-                KEY_TEXT, KEY_LONGTEXT, true );
+                KEY_TEXT, KEY_LONGTEXT, true )
     add_string( SOUT_CFG_PREFIX "ca", NULL, NULL,
-                CA_TEXT, CA_LONGTEXT, true );
+                CA_TEXT, CA_LONGTEXT, true )
     add_string( SOUT_CFG_PREFIX "crl", NULL, NULL,
-                CRL_TEXT, CRL_LONGTEXT, true );
+                CRL_TEXT, CRL_LONGTEXT, true )
+#if 0 //def HAVE_AVAHI_CLIENT
     add_bool( SOUT_CFG_PREFIX "bonjour", false, NULL,
               BONJOUR_TEXT, BONJOUR_LONGTEXT, true);
-    set_callbacks( Open, Close );
-vlc_module_end();
+#endif
+    set_callbacks( Open, Close )
+vlc_module_end ()
 
 
 /*****************************************************************************
@@ -145,7 +147,7 @@ struct sout_access_out_sys_t
     uint8_t             *p_header;
     bool          b_header_complete;
 
-#ifdef HAVE_AVAHI_CLIENT
+#if 0 //def HAVE_AVAHI_CLIENT
     void                *p_bonjour;
 #endif
 };
@@ -348,7 +350,7 @@ static void Close( vlc_object_t * p_this )
     sout_access_out_t       *p_access = (sout_access_out_t*)p_this;
     sout_access_out_sys_t   *p_sys = p_access->p_sys;
 
-#ifdef HAVE_AVAHI_CLIENT
+#if 0 //def HAVE_AVAHI_CLIENT
     if( p_sys->p_bonjour != NULL )
         bonjour_stop_service( p_sys->p_bonjour );
 #endif