Commit 26f25517 authored by Simon Morlat's avatar Simon Morlat

Merge branch 'master' of git://git.linphone.org/mediastreamer2

parents 83990608 560d2143
......@@ -61,6 +61,7 @@ void ms_audio_conference_add_member(MSAudioConference *obj, MSAudioEndpoint *ep)
void ms_audio_conference_remove_member(MSAudioConference *obj, MSAudioEndpoint *ep);
void ms_audio_conference_mute_member(MSAudioConference *obj, MSAudioEndpoint *ep, bool_t muted);
void ms_audio_conference_destroy(MSAudioConference *obj);
int ms_audio_conference_size(MSAudioConference *obj);
MSAudioEndpoint * ms_audio_endpoint_get_from_stream(AudioStream *st, bool_t is_remote);
void ms_audio_endpoint_release_from_stream(MSAudioEndpoint *obj);
......
......@@ -180,5 +180,6 @@ void ms_audio_endpoint_destroy(MSAudioEndpoint *ep){
ms_free(ep);
}
int ms_audio_conference_size(MSAudioConference *obj){
return obj == NULL ? 0 : obj->nmembers;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment