}
#undef sout_AnnounceRegisterSDP
+
+static vlc_mutex_t sap_mutex = VLC_STATIC_MUTEX;
+
/**
* Registers a new session with the announce handler, using a pregenerated SDP
*
assert (p_method == &sap_method);
(void) p_method;
- session_descriptor_t *p_session = malloc (sizeof (*p_session));
-
- if (!p_session)
+ session_descriptor_t *p_session = calloc( 1, sizeof (*p_session) );
+ if( !p_session )
return NULL;
- memset( p_session, 0, sizeof( *p_session ) );
p_session->psz_sdp = strdup( psz_sdp );
/* GRUIK. We should not convert back-and-forth from string to numbers */
if (res->ai_addrlen <= sizeof (p_session->addr))
memcpy (&p_session->addr, res->ai_addr,
p_session->addrlen = res->ai_addrlen);
- vlc_freeaddrinfo (res);
+ freeaddrinfo (res);
}
- vlc_value_t 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);
+ vlc_mutex_lock (&sap_mutex);
sap_handler_t *p_sap = libvlc_priv (obj->p_libvlc)->p_sap;
if (p_sap == NULL)
{
}
else
vlc_object_hold ((vlc_object_t *)p_sap);
- vlc_mutex_unlock (lockval.p_address);
+ vlc_mutex_unlock (&sap_mutex);
if (p_sap == NULL)
goto error;
msg_Dbg (obj, "removing SAP session");
SAP_Del (p_sap, p_session);
- vlc_value_t 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_mutex_lock (&sap_mutex);
vlc_object_release ((vlc_object_t *)p_sap);
- vlc_mutex_unlock (lockval.p_address);
+ vlc_mutex_unlock (&sap_mutex);
free (p_session->psz_sdp);
free (p_session);