Unexport some unused APIs

diff --git a/include/vlc_sout.h b/include/vlc_sout.h
index a752be62fc86320249467f1cb7cc6594ea297d4d..0decbe7581015cd0054936f13c298a840e913860 100644 (file)
--- a/include/vlc_sout.h
+++ b/include/vlc_sout.h
@@ -210,12 +210,9 @@ static inline int sout_StreamIdSend( sout_stream_t *s, sout_stream_id_t *id, blo
 /****************************************************************************
  * Announce handler mess
  ****************************************************************************/
-VLC_EXPORT( int,                sout_AnnounceRegister, (sout_instance_t *,session_descriptor_t*, announce_method_t* ) );
 VLC_EXPORT(session_descriptor_t*,sout_AnnounceRegisterSDP, (sout_instance_t *, const char *, const char *, const char *, announce_method_t* ) );
 VLC_EXPORT( int,                sout_AnnounceUnRegister, (sout_instance_t *,session_descriptor_t* ) );
 
-VLC_EXPORT(session_descriptor_t*,sout_AnnounceSessionCreate, (vlc_object_t *obj, const char *cfgpref) );
-VLC_EXPORT(int,                  sout_SessionSetMedia, (vlc_object_t *obj, session_descriptor_t *, const char *, const char *, int, const char *, int) );
 VLC_EXPORT(void,                 sout_AnnounceSessionDestroy, (session_descriptor_t *) );
 VLC_EXPORT(announce_method_t*,   sout_SAPMethod, (void) );
 VLC_EXPORT(void,                 sout_MethodRelease, (announce_method_t *) );

diff --git a/src/libvlc.sym b/src/libvlc.sym
index 857865712d46ab988b80247caedffce58703225f..3f688b71952a4a9b0d3b2527ec0da3b73291d441 100644 (file)
--- a/src/libvlc.sym
+++ b/src/libvlc.sym
@@ -1,6 +1,5 @@
 sout_MethodRelease
 sout_SAPMethod
-sout_SessionSetMedia
 vlc_b64_encode_binary
 vlc_strnlen
 stream_Block
@@ -265,9 +264,7 @@ sout_AccessOutNew
 sout_AccessOutRead
 sout_AccessOutSeek
 sout_AccessOutWrite
-sout_AnnounceRegister
 sout_AnnounceRegisterSDP
-sout_AnnounceSessionCreate
 sout_AnnounceSessionDestroy
 sout_AnnounceUnRegister
 sout_MuxAddStream

diff --git a/src/stream_output/announce.c b/src/stream_output/announce.c
index 3bae8026b211407f400cf560412d92e554c87ec9..0e60c4c037a0324a68ecf18548084ead1a2bc35e 100644 (file)
--- a/src/stream_output/announce.c
+++ b/src/stream_output/announce.c
@@ -30,6 +30,13 @@
 
 #include <assert.h>
 
+/* Private functions for the announce handler */
+static announce_handler_t*  announce_HandlerCreate( vlc_object_t *);
+static int announce_Register( announce_handler_t *p_announce,
+                              session_descriptor_t *p_session,
+                              announce_method_t *p_method );
+static int announce_UnRegister( announce_handler_t *p_announce,
+                                session_descriptor_t *p_session );
 
 struct announce_method_t
 {
@@ -40,40 +47,39 @@ struct announce_method_t
  ****************************************************************************/
 
 /**
- *  Register a new session with the announce handler
+ * Create and initialize a session descriptor
  *
- * \param p_sout a sout instance structure
- * \param p_session a session descriptor
- * \param p_method an announce method descriptor
- * \return VLC_SUCCESS or an error
+ * \return a new session descriptor
  */
-int sout_AnnounceRegister( sout_instance_t *p_sout,
-                       session_descriptor_t *p_session,
-                       announce_method_t *p_method )
+static session_descriptor_t * sout_AnnounceSessionCreate (vlc_object_t *obj,
+                                                   const char *cfgpref)
 {
-    int i_ret;
-    announce_handler_t *p_announce = (announce_handler_t*)
-                              vlc_object_find( p_sout,
-                                              VLC_OBJECT_ANNOUNCE,
-                                              FIND_ANYWHERE );
+    size_t cfglen = strlen (cfgpref);
+    if (cfglen > 100)
+        return NULL;
 
-    if( !p_announce )
-    {
-        msg_Dbg( p_sout, "No announce handler found, creating one" );
-        p_announce = announce_HandlerCreate( p_sout );
-        if( !p_announce )
-        {
-            msg_Err( p_sout, "Creation failed" );
-            return VLC_ENOMEM;
-        }
-        vlc_object_yield( p_announce );
-        msg_Dbg( p_sout, "creation done" );
-    }
+    char varname[cfglen + sizeof ("description")], *subvar = varname + cfglen;
+    strcpy (varname, cfgpref);
 
-    i_ret = announce_Register( p_announce, p_session, p_method );
-    vlc_object_release( p_announce );
+    session_descriptor_t *p_session = calloc (1, sizeof (*p_session));
+    if (p_session == NULL)
+        return NULL;
 
-    return i_ret;
+    strcpy (subvar, "name");
+    p_session->psz_name = var_GetNonEmptyString (obj, varname);
+    strcpy (subvar, "group");
+    p_session->psz_group = var_GetNonEmptyString (obj, varname);
+
+    strcpy (subvar, "description");
+    p_session->description = var_GetNonEmptyString (obj, varname);
+    strcpy (subvar, "url");
+    p_session->url = var_GetNonEmptyString (obj, varname);
+    strcpy (subvar, "email");
+    p_session->email = var_GetNonEmptyString (obj, varname);
+    strcpy (subvar, "phone");
+    p_session->phone = var_GetNonEmptyString (obj, varname);
+
+    return p_session;
 }
 
 /**
@@ -98,7 +104,7 @@ sout_AnnounceRegisterSDP( sout_instance_t *p_sout, const char *cfgpref,
     if( !p_announce )
     {
         msg_Dbg( p_sout, "no announce handler found, creating one" );
-        p_announce = announce_HandlerCreate( p_sout );
+        p_announce = announce_HandlerCreate( VLC_OBJECT( p_sout ) );
         if( !p_announce )
         {
             msg_Err( p_sout, "Creation failed" );
@@ -153,75 +159,6 @@ int sout_AnnounceUnRegister( sout_instance_t *p_sout,
     return i_ret;
 }
 
-/**
- * Create and initialize a session descriptor
- *
- * \return a new session descriptor
- */
-session_descriptor_t * sout_AnnounceSessionCreate (vlc_object_t *obj,
-                                                   const char *cfgpref)
-{
-    size_t cfglen = strlen (cfgpref);
-    if (cfglen > 100)
-        return NULL;
-
-    char varname[cfglen + sizeof ("description")], *subvar = varname + cfglen;
-    strcpy (varname, cfgpref);
-
-    session_descriptor_t *p_session = calloc (1, sizeof (*p_session));
-    if (p_session == NULL)
-        return NULL;
-
-    strcpy (subvar, "name");
-    p_session->psz_name = var_GetNonEmptyString (obj, varname);
-    strcpy (subvar, "group");
-    p_session->psz_group = var_GetNonEmptyString (obj, varname);
-
-    strcpy (subvar, "description");
-    p_session->description = var_GetNonEmptyString (obj, varname);
-    strcpy (subvar, "url");
-    p_session->url = var_GetNonEmptyString (obj, varname);
-    strcpy (subvar, "email");
-    p_session->email = var_GetNonEmptyString (obj, varname);
-    strcpy (subvar, "phone");
-    p_session->phone = var_GetNonEmptyString (obj, varname);
-
-    return p_session;
-}
-
-int sout_SessionSetMedia (vlc_object_t *obj, session_descriptor_t *p_session,
-                          const char *fmt, const char *src, int sport,
-                          const char *dst, int dport)
-{
-    if ((p_session->sdpformat = strdup (fmt)) == NULL)
-        return VLC_ENOMEM;
-
-    /* GRUIK. We should not convert back-and-forth from string to numbers */
-    struct addrinfo *res;
-    if (vlc_getaddrinfo (obj, dst, dport, NULL, &res) == 0)
-    {
-        if (res->ai_addrlen > sizeof (p_session->addr))
-            goto oflow;
-
-        memcpy (&p_session->addr, res->ai_addr,
-                p_session->addrlen = res->ai_addrlen);
-        vlc_freeaddrinfo (res);
-    }
-    if (vlc_getaddrinfo (obj, src, sport, NULL, &res) == 0)
-    {
-        if (res->ai_addrlen > sizeof (p_session->orig))
-            goto oflow;
-        memcpy (&p_session->orig, res->ai_addr,
-               p_session->origlen = res->ai_addrlen);
-        vlc_freeaddrinfo (res);
-    }
-    return 0;
-
-oflow:
-    vlc_freeaddrinfo (res);
-    return VLC_ENOMEM;
-}
-
 /**
  * Destroy a session descriptor and free all
  *
@@ -267,7 +204,7 @@ void sout_MethodRelease (announce_method_t *m)
  * \param p_this a vlc_object structure
  * \return the new announce handler or NULL on error
  */
-announce_handler_t *__announce_HandlerCreate( vlc_object_t *p_this )
+static announce_handler_t *announce_HandlerCreate( vlc_object_t *p_this )
 {
     announce_handler_t *p_announce;
 
@@ -308,9 +245,9 @@ int announce_HandlerDestroy( announce_handler_t *p_announce )
 }
 
 /* Register an announce */
-int announce_Register( announce_handler_t *p_announce,
-                       session_descriptor_t *p_session,
-                       announce_method_t *p_method )
+static int announce_Register( announce_handler_t *p_announce,
+                              session_descriptor_t *p_session,
+                              announce_method_t *p_method )
 {
     if (p_method == NULL)
         return VLC_EGENERIC;
@@ -344,8 +281,8 @@ int announce_Register( announce_handler_t *p_announce,
 
 
 /* Unregister an announce */
-int announce_UnRegister( announce_handler_t *p_announce,
-                  session_descriptor_t *p_session )
+static int announce_UnRegister( announce_handler_t *p_announce,
+                                session_descriptor_t *p_session )
 {
     msg_Dbg( p_announce, "unregistering announce" );
     if( p_announce->p_sap )

diff --git a/src/stream_output/stream_output.h b/src/stream_output/stream_output.h
index 99ac3555c2b6e50c2f082e29181c8bc9eb1c7aba..a3f7719645d8900a2b1241a298358965fe404118 100644 (file)
--- a/src/stream_output/stream_output.h
+++ b/src/stream_output/stream_output.h
@@ -101,16 +101,7 @@ struct announce_handler_t
     sap_handler_t *p_sap;
 };
 
-#define announce_HandlerCreate(a) __announce_HandlerCreate(VLC_OBJECT(a))
-announce_handler_t*  __announce_HandlerCreate( vlc_object_t *);
-
-/* Private functions for the announce handler */
 int announce_HandlerDestroy( announce_handler_t * );
-int announce_Register( announce_handler_t *p_announce,
-                       session_descriptor_t *p_session,
-                       announce_method_t *p_method );
-int announce_UnRegister( announce_handler_t *p_announce,
-                         session_descriptor_t *p_session );
 
 sap_handler_t *announce_SAPHandlerCreate( announce_handler_t *p_announce );
 void announce_SAPHandlerDestroy( sap_handler_t *p_sap );