Changeset 979f5cc201141379f1153ad721b1a6ec4032e20f

Timestamp:

09/15/07 22:10:50 (1 year ago)

Author:

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

git-committer:

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

git-parent:

[d212179528ff468f9aed583eef8552203b32093f]

git-author:

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

Message:

Announce API simplification

Files:

• include/vlc_sout.h (modified) (1 diff)
• modules/stream_out/rtp.c (modified) (3 diffs)
• modules/stream_out/standard.c (modified) (1 diff)
• src/libvlc.sym (modified) (1 diff)
• src/stream_output/announce.c (modified) (4 diffs)

include/vlc_sout.h

@@ -209 +209 @@
-
-/****************************************************************************
- mess
+
- ****************************************************************************/
-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(void,                 sout_AnnounceSessionDestroy, (session_descriptor_t *) );
-VLC_EXPORT(announce_method_t*,   sout_SAPMethod, (void) );
-VLC_EXPORT(void,                 sout_MethodRelease, (announce_method_t *) );

modules/stream_out/rtp.c

@@ -1197 +1197 @@
-    sout_stream_sys_t *p_sys = p_stream->p_sys;
-    sout_instance_t   *p_sout = p_stream->p_sout;
-    announce_method_t *p_method = sout_SAPMethod();
-
-    /* Remove the previous session */
@@ -1203 +1202 @@
-    {
-        sout_AnnounceUnRegister( p_sout, p_sys->p_session);
-        sout_AnnounceSessionDestroy( p_sys->p_session );
-        p_sys->p_session = NULL;
-    }
@@ -1209 +1207 @@
-    if( ( p_sys->i_es > 0 || p_sys->p_mux ) && p_sys->psz_sdp && *p_sys->psz_sdp )
-    {
+        announce_method_t *p_method = sout_SAPMethod();
-        p_sys->p_session = sout_AnnounceRegisterSDP( p_sout, SOUT_CFG_PREFIX,
-                                                     p_sys->psz_sdp,
-                                                     p_sys->psz_destination,
-                                                     p_method );
-}
-
-
+    sout_MethodRelease( p_method );
+
+
-    return VLC_SUCCESS;
-}

modules/stream_out/standard.c

@@ -409 +409 @@
-
-    if( p_sys->p_session != NULL )
-    {
-        sout_AnnounceUnRegister( p_stream->p_sout, p_sys->p_session );
-        sout_AnnounceSessionDestroy( p_sys->p_session );
-    }
-
-    sout_MuxDelete( p_sys->p_mux );

src/libvlc.sym

@@ -266 +266 @@
-sout_AccessOutWrite
-sout_AnnounceRegisterSDP
-sout_AnnounceSessionDestroy
-sout_AnnounceUnRegister
-sout_MuxAddStream

src/stream_output/announce.c

@@ -48 +48 @@
-
-/**
- * Create and initialize a session descriptor
- *
- * \return a new session descriptor
- */
-static session_descriptor_t * sout_AnnounceSessionCreate (vlc_object_t *obj,
-                                                   const char *cfgpref)
-{
-    return calloc (1, sizeof (session_descriptor_t));
-}
-
-/**
- *  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
-uri
+dst
- * \param p_method an announce method descriptor
- * \return the new session descriptor structure
@@ -69 +58 @@
-session_descriptor_t *
-sout_AnnounceRegisterSDP( sout_instance_t *p_sout, const char *cfgpref,
-uri
+dst
-                          announce_method_t *p_method )
-{
@@ -89 +78 @@
-    }
-
-
+
+
-    p_session->psz_sdp = strdup( psz_sdp );
-
-    /* GRUIK. We should not convert back-and-forth from string to numbers */
-    struct addrinfo *res;
-uri
+dst
-    {
-        if (res->ai_addrlen <= sizeof (p_session->addr))
@@ -129 +119 @@
-    }
-    i_ret  = announce_UnRegister( p_announce, p_session );
+    if( i_ret == 0 )
+        free( p_session );
-
-    vlc_object_release( p_announce );
-
-    return i_ret;
-}
-
-/**
- * Destroy a session descriptor and free all
- *
- * \param p_session the session to destroy
- * \return Nothing
- */
-void sout_AnnounceSessionDestroy( session_descriptor_t *p_session )
-{
-    free( p_session );
-}
-