* all: as announce calls non-standard functions (SLP), remove it from

src, and build it in the stream_out_standard module to avoid a link

diff --git a/Makefile.am b/Makefile.am
index 5542a158364a216ae728dc1698e78c6efe6c27ac..d40d2fd1d3b006599509fd1b308e6f0f615a9907 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -87,7 +87,6 @@ HEADERS_include = \
        include/os_specific.h \
        include/stream_control.h \
        include/stream_output.h \
-       include/announce.h \
        include/variables.h \
        include/video_output.h \
        include/vlc_common.h \
@@ -315,7 +314,6 @@ SOURCES_libvlc_common = \
        src/audio_output/output.c \
        src/audio_output/intf.c \
        src/stream_output/stream_output.c \
-       src/stream_output/announce.c \
        src/misc/mtime.c \
        src/misc/modules.c \
        src/misc/threads.c \

diff --git a/configure.ac b/configure.ac
index 7a2b41e7027f416bdd1ae52b8103272a26f70087..c9dcd834a336bc5610b5b76d659a291c9fd77052 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl Autoconf settings for vlc
-dnl $Id: configure.ac,v 1.58 2003/08/13 23:26:55 gbazin Exp $
+dnl $Id: configure.ac,v 1.59 2003/08/14 20:02:55 zorglub Exp $
 
 AC_INIT(vlc,0.6.3-cvs)
 
@@ -2836,7 +2836,7 @@ then
     then
       AX_ADD_PLUGINS([slp])
       AX_ADD_LDFLAGS([slp],[-lslp])
-      AX_ADD_LDFLAGS([vlc],[-lslp])
+      AX_ADD_LDFLAGS([stream_out_standard],[-lslp])
     fi
   else
     AC_MSG_CHECKING(for slp headers in ${with_slp})
@@ -2846,7 +2846,7 @@ then
       AC_MSG_RESULT(yes)
       AX_ADD_PLUGINS([slp])
       AX_ADD_LDFLAGS([slp],[-L${with_slp} -lslp])
-      AX_ADD_LDFLAGS([vlc],[-L${with_slp} -lslp])
+      AX_ADD_LDFLAGS([stream_out_standard],[-L${with_slp} -lslp])
       AX_ADD_CPPFLAGS([slp],[-I${with_slp}])
       AC_DEFINE(HAVE_SLP_H)
     else

diff --git a/include/vlc_common.h b/include/vlc_common.h
index c94640b4987de251a02ba77c41dd06045950ad8d..9e9ce14f9e19ec4b0df33474dd97d2cfc5eff029 100644 (file)
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -3,7 +3,7 @@
  * Collection of useful common types and macros definitions
  *****************************************************************************
  * Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: vlc_common.h,v 1.72 2003/08/14 11:47:32 gbazin Exp $
+ * $Id: vlc_common.h,v 1.73 2003/08/14 20:02:55 zorglub Exp $
  *
  * Authors: Samuel Hocevar <sam@via.ecp.fr>
  *          Vincent Seguin <seguin@via.ecp.fr>
@@ -263,8 +263,8 @@ typedef struct sout_mux_t sout_mux_t;
 typedef struct sout_stream_t    sout_stream_t;
 typedef struct sout_cfg_t       sout_cfg_t;
 typedef struct sout_format_t    sout_format_t;
-typedef struct sap_session_t    sap_session_t;
-typedef struct slp_session_t    slp_session_t;
+/*typedef struct sap_session_t    sap_session_t;
+typedef struct slp_session_t    slp_session_t;*/
 
 /* Decoders */
 typedef struct decoder_fifo_t decoder_fifo_t;

diff --git a/modules/stream_out/Modules.am b/modules/stream_out/Modules.am
index 4494407375b4183deca539420a86ad4645e35b01..eb58d74bf66d36c0251e9a4ae817733ae58eaa21 100644 (file)
--- a/modules/stream_out/Modules.am
+++ b/modules/stream_out/Modules.am
@@ -1,5 +1,6 @@
 SOURCES_stream_out_dummy = dummy.c
-SOURCES_stream_out_standard = standard.c
+SOURCES_stream_out_standard = standard.c \
+                             announce.c
 SOURCES_stream_out_transcode = transcode.c
 SOURCES_stream_out_duplicate = duplicate.c
 SOURCES_stream_out_es = es.c

diff --git a/src/stream_output/announce.c b/modules/stream_out/announce.c
similarity index 97%
rename from src/stream_output/announce.c
rename to modules/stream_out/announce.c
index 3708e98ede4026e30ba392455227595d48b2222f..0f44db097c5cc93e41136a7071b0488fd2e6ebfd 100644 (file)
--- a/src/stream_output/announce.c
+++ b/modules/stream_out/announce.c
@@ -66,7 +66,6 @@
  *               and the one which is after.
  *               NULL is returned if delim is not found
  ****************************************************************************/
-
 static char * split( char *psz_in, char *psz_out1, char *psz_out2, char delim)
 {
     unsigned int i_count = 0; /* pos in input string */
@@ -129,9 +128,11 @@ static char * split( char *psz_in, char *psz_out1, char *psz_out2, char delim)
 /*****************************************************************************
  * sout_SAPNew: Creates a SAP Session
  *****************************************************************************/
-sap_session_t * sout_SAPNew ( sout_instance_t *p_sout, char * psz_url_arg,
-                              char * psz_name_arg, int ip_version,
-                              char * psz_v6_scope )
+sap_session_t * sout_SAPNew ( sout_instance_t *p_sout,
+                                     char * psz_url_arg,
+                                     char * psz_name_arg,
+                                     int ip_version,
+                                     char * psz_v6_scope )
 {
     sap_session_t       *p_sap; /* The SAP structure */
     module_t            *p_network; /* Network module */
@@ -400,7 +401,7 @@ void sout_SAPSend( sout_instance_t *p_sout, sap_session_t * p_sap )
 /*****************************************************************************
  * sout_SLPBuildName: Builds a service name according to SLP standard
  *****************************************************************************/
-char * sout_SLPBuildName(char *psz_url,char *psz_name)
+static char * sout_SLPBuildName(char *psz_url,char *psz_name)
 {
     char *psz_service;
     unsigned int i_size;
@@ -424,7 +425,7 @@ char * sout_SLPBuildName(char *psz_url,char *psz_name)
  * sout_SLPReport: Reporting function. Unused at the moment but needed
  *****************************************************************************/
 #ifdef HAVE_SLP_H
-void sout_SLPReport(SLPHandle slp_handle,SLPError slp_error,void* cookie)
+static void sout_SLPReport(SLPHandle slp_handle,SLPError slp_error,void* cookie)
 {
 }  
 #endif

diff --git a/include/announce.h b/modules/stream_out/announce.h
similarity index 72%
rename from include/announce.h
rename to modules/stream_out/announce.h
index 0856d0c79f2f2ae57f1f6b36d9a6614bc4dbc400..896795fe402149f3cb314917b990db61d1d7928c 100644 (file)
--- a/include/announce.h
+++ b/modules/stream_out/announce.h
@@ -2,7 +2,7 @@
  * announce.h : Session announcement
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: announce.h,v 1.9 2003/08/13 19:38:27 gbazin Exp $
+ * $Id: announce.h,v 1.1 2003/08/14 20:02:55 zorglub Exp $
  *
  * Authors: Clément Stenac <zorglub@via.ecp.fr>
  *
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 /*****************************************************************************
- * sap_session_t: SAP Session descriptor
+ * Preamble
  *****************************************************************************/
 
 #if defined( UNDER_CE )
@@ -40,11 +40,17 @@
 #   endif
 #endif
 
+#ifdef HAVE_SLP_H
+#   include <slp.h>
+#endif
+
 #ifdef HAVE_SYS_TYPES_H
 #   include <sys/types.h>
 #endif
 
-
+/*****************************************************************************
+ * sap_session_t: SAP Session descriptor
+ *****************************************************************************/
 struct sap_session_t
 {
         char psz_url[256];
@@ -56,20 +62,33 @@ struct sap_session_t
         int i_ip_version;
 };
 
-
+typedef struct sap_session_t sap_session_t;
+/*****************************************************************************
+ * slp_session_t: SLP Session descriptor
+ *****************************************************************************/
 struct slp_session_t
 {
         char *psz_url;
         char *psz_name;
 };
 
+typedef struct slp_session_t slp_session_t;
 
 /*****************************************************************************
  * Prototypes
  *****************************************************************************/
+sap_session_t *  sout_SAPNew        (sout_instance_t *,
+                                     char *, char* , int, char *);
+void             sout_SAPDelete     (sout_instance_t *,sap_session_t*);
+void             sout_SAPSend       (sout_instance_t *,sap_session_t *);
+int              sout_SLPReg        (sout_instance_t *,char *,char *);
+int              sout_SLPDereg      (sout_instance_t *,char *,char *);
+
+
+/*
 VLC_EXPORT( sap_session_t *, sout_SAPNew, ( sout_instance_t *,char * , char * , int , char *) );
 VLC_EXPORT( void, sout_SAPSend, ( sout_instance_t *,sap_session_t *) );
 VLC_EXPORT( void, sout_SAPDelete, ( sout_instance_t *,sap_session_t * ) );
 
 VLC_EXPORT( int, sout_SLPReg, (sout_instance_t*,char*,char*) );
-VLC_EXPORT( int, sout_SLPDereg, (sout_instance_t*,char*,char*) );
+VLC_EXPORT( int, sout_SLPDereg, (sout_instance_t*,char*,char*) );*/

diff --git a/modules/stream_out/standard.c b/modules/stream_out/standard.c
index fd73fa9160517fc335a2b037dd841c7c63622e95..d4ef59215c13ec863f21f0a61c2439162d73518e 100644 (file)
--- a/modules/stream_out/standard.c
+++ b/modules/stream_out/standard.c
@@ -2,7 +2,7 @@
  * standard.c
  *****************************************************************************
  * Copyright (C) 2001, 2002 VideoLAN
- * $Id: standard.c,v 1.11 2003/08/13 21:15:42 gbazin Exp $
+ * $Id: standard.c,v 1.12 2003/08/14 20:02:55 zorglub Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -30,7 +30,7 @@
 
 #include <vlc/vlc.h>
 #include <vlc/sout.h>
-#include <announce.h>
+#include "announce.h"
 
 #define DEFAULT_IPV6_SCOPE "8"
 

diff --git a/src/misc/modules.c b/src/misc/modules.c
index c0fb70ccad854d4c5e6f23c175ec65cb1f6195b3..d8c3aae53782266df2c231708ac534d0195dc3af 100644 (file)
--- a/src/misc/modules.c
+++ b/src/misc/modules.c
@@ -2,7 +2,7 @@
  * modules.c : Builtin and plugin modules management functions
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: modules.c,v 1.127 2003/08/01 00:00:50 fenrir Exp $
+ * $Id: modules.c,v 1.128 2003/08/14 20:02:55 zorglub Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *          Ethan C. Baldridge <BaldridgeE@cadmus.com>
@@ -87,7 +87,7 @@
 #include "aout_internal.h"
 
 #include "stream_output.h"
-#include "announce.h"
+/*#include "announce.h"*/
 #include "osd.h"
 
 #include "iso_lang.h"