[vlc-devel] commit: SAP does needs an object, not specifically a stream instance ( Rémi Denis-Courmont )
git version control
git at videolan.org
Wed Oct 22 20:17:29 CEST 2008
vlc | branch: master | Rémi Denis-Courmont <rdenis at simphalempin.com> | Wed Oct 22 21:15:48 2008 +0300| [7c97b0295e1c279b4ba43c76b40503b8024f3559] | committer: Rémi Denis-Courmont
SAP does needs an object, not specifically a stream instance
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7c97b0295e1c279b4ba43c76b40503b8024f3559
---
include/vlc_sout.h | 8 ++++++--
src/missing.c | 7 +++++--
src/stream_output/announce.c | 32 +++++++++++++++++---------------
3 files changed, 28 insertions(+), 19 deletions(-)
diff --git a/include/vlc_sout.h b/include/vlc_sout.h
index a1a245e..d441a06 100644
--- a/include/vlc_sout.h
+++ b/include/vlc_sout.h
@@ -241,8 +241,12 @@ static inline int sout_StreamIdSend( sout_stream_t *s, sout_stream_id_t *id, blo
/****************************************************************************
* Announce handler
****************************************************************************/
-VLC_EXPORT(session_descriptor_t*,sout_AnnounceRegisterSDP, ( sout_instance_t *, const char *, const char *, announce_method_t* ) );
-VLC_EXPORT( int, sout_AnnounceUnRegister, (sout_instance_t *,session_descriptor_t* ) );
+VLC_EXPORT(session_descriptor_t*,sout_AnnounceRegisterSDP, ( vlc_object_t *, const char *, const char *, announce_method_t* ) );
+VLC_EXPORT( int, sout_AnnounceUnRegister, (vlc_object_t *,session_descriptor_t* ) );
+#define sout_AnnounceRegisterSDP(o, sdp, addr, m) \
+ sout_AnnounceRegisterSDP(VLC_OBJECT (o), sdp, addr, m)
+#define sout_AnnounceUnRegister(o, a) \
+ sout_AnnounceUnRegister(VLC_OBJECT (o), a)
VLC_EXPORT(announce_method_t*, sout_SAPMethod, (void) );
VLC_EXPORT(void, sout_MethodRelease, (announce_method_t *) );
diff --git a/src/missing.c b/src/missing.c
index 569e76d..d6a38fc 100644
--- a/src/missing.c
+++ b/src/missing.c
@@ -219,16 +219,19 @@ ssize_t sout_AccessOutWrite (sout_access_out_t *out, block_t *block)
assert (0);
}
-session_descriptor_t *sout_AnnounceRegisterSDP (sout_instance_t *instance,
+#undef sout_AnnounceRegisterSDP
+session_descriptor_t *sout_AnnounceRegisterSDP (vlc_object_t *obj,
const char *sdp,
const char *dst,
announce_method_t *method)
{
+ msg_Err (obj, "SDP export not compiled-in!");
assert (method == NULL);
return NULL;
}
-sout_AnnounceUnRegister (sout_instance_t *instance, session_descriptor_t *d)
+#undef sout_AnnounceUnRegister
+sout_AnnounceUnRegister (vlc_object_t *obj, session_descriptor_t *d)
{
assert (0);
}
diff --git a/src/stream_output/announce.c b/src/stream_output/announce.c
index 0ec666a..925ce1a 100644
--- a/src/stream_output/announce.c
+++ b/src/stream_output/announce.c
@@ -48,17 +48,18 @@ static void sap_destroy (vlc_object_t *p_this)
libvlc_priv (p_this->p_libvlc)->p_sap = NULL;
}
+#undef sout_AnnounceRegisterSDP
/**
* Registers a new session with the announce handler, using a pregenerated SDP
*
- * \param p_sout a sout instance structure
+ * \param obj a VLC object
* \param psz_sdp the SDP to register
* \param psz_dst 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 *psz_sdp,
+sout_AnnounceRegisterSDP( vlc_object_t *obj, const char *psz_sdp,
const char *psz_dst, announce_method_t *p_method )
{
assert (p_method == &sap_method);
@@ -74,7 +75,7 @@ sout_AnnounceRegisterSDP( sout_instance_t *p_sout, const char *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_dst, 0, NULL, &res) == 0)
+ if (vlc_getaddrinfo (obj, psz_dst, 0, NULL, &res) == 0)
{
if (res->ai_addrlen <= sizeof (p_session->addr))
memcpy (&p_session->addr, res->ai_addr,
@@ -83,16 +84,16 @@ sout_AnnounceRegisterSDP( sout_instance_t *p_sout, const char *psz_sdp,
}
vlc_value_t lockval;
- if (var_Create (p_sout->p_libvlc, "sap_mutex", VLC_VAR_MUTEX)
- || var_Get (p_sout->p_libvlc, "sap_mutex", &lockval))
+ if (var_Create (obj->p_libvlc, "sap_mutex", VLC_VAR_MUTEX)
+ || var_Get (obj->p_libvlc, "sap_mutex", &lockval))
goto error;
vlc_mutex_lock (lockval.p_address);
- sap_handler_t *p_sap = libvlc_priv (p_sout->p_libvlc)->p_sap;
+ sap_handler_t *p_sap = libvlc_priv (obj->p_libvlc)->p_sap;
if (p_sap == NULL)
{
- p_sap = SAP_Create (VLC_OBJECT (p_sout->p_libvlc));
- libvlc_priv (p_sout->p_libvlc)->p_sap = p_sap;
+ p_sap = SAP_Create (VLC_OBJECT (obj->p_libvlc));
+ libvlc_priv (obj->p_libvlc)->p_sap = p_sap;
vlc_object_set_destructor ((vlc_object_t *)p_sap, sap_destroy);
}
else
@@ -102,7 +103,7 @@ sout_AnnounceRegisterSDP( sout_instance_t *p_sout, const char *psz_sdp,
if (p_sap == NULL)
goto error;
- msg_Dbg (p_sout, "adding SAP session");
+ msg_Dbg (obj, "adding SAP session");
SAP_Add (p_sap, p_session );
return p_session;
@@ -112,24 +113,25 @@ error:
return NULL;
}
+#undef sout_AnnounceUnRegister
/**
* Unregisters an existing session
*
- * \param p_sout a sout instance structure
+ * \param obj a VLC object
* \param p_session the session descriptor
* \return VLC_SUCCESS or an error
*/
-int sout_AnnounceUnRegister( sout_instance_t *p_sout,
+int sout_AnnounceUnRegister( vlc_object_t *obj,
session_descriptor_t *p_session )
{
- sap_handler_t *p_sap = libvlc_priv (p_sout->p_libvlc)->p_sap;
+ sap_handler_t *p_sap = libvlc_priv (obj->p_libvlc)->p_sap;
- msg_Dbg (p_sout, "removing SAP session");
+ msg_Dbg (obj, "removing SAP session");
SAP_Del (p_sap, p_session);
vlc_value_t lockval;
- var_Create (p_sout->p_libvlc, "sap_mutex", VLC_VAR_MUTEX);
- var_Get (p_sout->p_libvlc, "sap_mutex", &lockval);
+ var_Create (obj->p_libvlc, "sap_mutex", VLC_VAR_MUTEX);
+ var_Get (obj->p_libvlc, "sap_mutex", &lockval);
vlc_mutex_lock (lockval.p_address);
vlc_object_release ((vlc_object_t *)p_sap);
vlc_mutex_unlock (lockval.p_address);
More information about the vlc-devel
mailing list