From b0c8780281c121d4ca1cf7310c81ea9f861b5318 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Thu, 18 Feb 2016 15:57:18 +0100 Subject: [PATCH] linphonecore.c: fix linphone_core_mic_enabled which returned opposite value in conference mode --- coreapi/conference.cc | 2 +- coreapi/linphonecore.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/coreapi/conference.cc b/coreapi/conference.cc index fee935b82..215f5d462 100644 --- a/coreapi/conference.cc +++ b/coreapi/conference.cc @@ -971,7 +971,7 @@ int linphone_conference_leave(LinphoneConference *obj) { } bool_t linphone_conference_is_in(const LinphoneConference *obj) { - return ((Conference *)obj)->isIn() ? TRUE : FALSE; + return ((Conference *)obj)->isIn(); } AudioStream *linphone_conference_get_audio_stream(const LinphoneConference *obj) { diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c index cfa5a4816..c6450d4a2 100644 --- a/coreapi/linphonecore.c +++ b/coreapi/linphonecore.c @@ -4921,7 +4921,7 @@ void linphone_core_enable_mic(LinphoneCore *lc, bool_t enable) { bool_t linphone_core_mic_enabled(LinphoneCore *lc) { LinphoneCall *call=linphone_core_get_current_call(lc); if (linphone_core_is_in_conference(lc)){ - return linphone_conference_microphone_is_muted(lc->conf_ctx); + return !linphone_conference_microphone_is_muted(lc->conf_ctx); }else if (call==NULL){ ms_warning("%s(): No current call!", __FUNCTION__); return TRUE;