Changeset 974be97baa8cabe04c64f9fb0f363ec5e95573d3

Timestamp:

09/15/07 21:56:11 (1 year ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1189886171 +0000

git-parent:

[5a922f698001f938fc3347a96244e1f0a01e03f6]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1189886171 +0000

Message:

Unexport some unused APIs

Files:

• include/vlc_sout.h (modified) (1 diff)
• src/libvlc.sym (modified) (2 diffs)
• src/stream_output/announce.c (modified) (6 diffs)
• src/stream_output/stream_output.h (modified) (1 diff)

include/vlc_sout.h

@@ -211 +211 @@
- * 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) );

src/libvlc.sym

@@ -1 +1 @@
-sout_MethodRelease
-sout_SAPMethod
-sout_SessionSetMedia
-vlc_b64_encode_binary
-vlc_strnlen
@@ -266 +265 @@
-sout_AccessOutSeek
-sout_AccessOutWrite
-sout_AnnounceRegister
-sout_AnnounceRegisterSDP
-sout_AnnounceSessionCreate
-sout_AnnounceSessionDestroy
-sout_AnnounceUnRegister

src/stream_output/announce.c

@@ -31 +31 @@
-#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
@@ -41 +48 @@
-
-/**
- *  Register a new session with the announce handler
- *
- * \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
- */
-int sout_AnnounceRegister( sout_instance_t *p_sout,
-                       session_descriptor_t *p_session,
-                       announce_method_t *p_method )
-{
-    int i_ret;
-    announce_handler_t *p_announce = (announce_handler_t*)
-                              vlc_object_find( p_sout,
-                                              VLC_OBJECT_ANNOUNCE,
-                                              FIND_ANYWHERE );
-
-    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" );
-    }
-
-    i_ret = announce_Register( p_announce, p_session, p_method );
-    vlc_object_release( p_announce );
-
-    return i_ret;
-}
-
-/**
- *  Register a new session with the announce handler, using a pregenerated SDP
- *
- * \param p_sout a sout instance structure
- * \param psz_sdp the SDP to register
- * \param psz_uri session address (needed for SAP address auto detection)
- * \param p_method an announce method descriptor
- * \return the new session descriptor structure
- */
-session_descriptor_t *
-sout_AnnounceRegisterSDP( sout_instance_t *p_sout, const char *cfgpref,
-                          const char *psz_sdp, const char *psz_uri,
-                          announce_method_t *p_method )
-{
-    session_descriptor_t *p_session;
-    announce_handler_t *p_announce = (announce_handler_t*)
-                                     vlc_object_find( p_sout,
-                                              VLC_OBJECT_ANNOUNCE,
-                                              FIND_ANYWHERE );
-    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 NULL;
-        }
-        vlc_object_yield( p_announce );
-    }
-
-    p_session = sout_AnnounceSessionCreate(VLC_OBJECT (p_sout), cfgpref);
-    p_session->psz_sdp = strdup( psz_sdp );
-
-    /* GRUIK. We should not convert back-and-forth from string to numbers */
-    struct addrinfo *res;
-    if (vlc_getaddrinfo (VLC_OBJECT (p_sout), psz_uri, 0, NULL, &res) == 0)
-    {
-        if (res->ai_addrlen <= sizeof (p_session->addr))
-            memcpy (&p_session->addr, res->ai_addr,
-                    p_session->addrlen = res->ai_addrlen);
-        vlc_freeaddrinfo (res);
-    }
-
-    announce_Register( p_announce, p_session, p_method );
-
-    vlc_object_release( p_announce );
-    return p_session;
-}
-
-/**
- *  UnRegister an existing session
- *
- * \param p_sout a sout instance structure
- * \param p_session the session descriptor
- * \return VLC_SUCCESS or an error
- */
-int sout_AnnounceUnRegister( sout_instance_t *p_sout,
-                             session_descriptor_t *p_session )
-{
-    int i_ret;
-    announce_handler_t *p_announce = (announce_handler_t*)
-                              vlc_object_find( p_sout,
-                                              VLC_OBJECT_ANNOUNCE,
-                                              FIND_ANYWHERE );
-    if( !p_announce )
-    {
-        msg_Dbg( p_sout, "unable to remove announce: no announce handler" );
-        return VLC_ENOOBJ;
-    }
-    i_ret  = announce_UnRegister( p_announce, p_session );
-
-    vlc_object_release( p_announce );
-
-    return i_ret;
-}
-
-/**
- * Create and initialize a session descriptor
- *
- * \return a new session descriptor
- */
-
+tatic s
-                                                   const char *cfgpref)
-{
@@ -190 +83 @@
-}
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    /* GRUIK. We should not convert back-and-forth from string to numbers */
-    struct addrinfo *res;
-
-
-
-
-
-
-
+
+
+
+
+
-        vlc_freeaddrinfo (res);
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -268 +205 @@
- * \return the new announce handler or NULL on error
- */
-announce_handler_t *__
+static announce_handler_t *
-{
-    announce_handler_t *p_announce;
@@ -309 +246 @@
-
-/* Register an announce */
-
-
-
+static 
+       
+       
-{
-    if (p_method == NULL)
@@ -345 +282 @@
-
-/* Unregister an announce */
-
-
+static 
+              
-{
-    msg_Dbg( p_announce, "unregistering announce" );

src/stream_output/stream_output.h

@@ -102 +102 @@
-};
-
-#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 );