From d244864db6da5a9ef92d64ef552f725e67b0090d Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Mon, 4 Dec 2017 15:41:20 +0100 Subject: [PATCH] Fixed android build --- coreapi/conference.cc | 6 +++--- coreapi/linphonecore.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/coreapi/conference.cc b/coreapi/conference.cc index 522353ff6..ca2196dbd 100644 --- a/coreapi/conference.cc +++ b/coreapi/conference.cc @@ -208,7 +208,7 @@ private: MSAudioEndpoint *m_localEndpoint; MSAudioEndpoint *m_recordEndpoint; RtpProfile *m_localDummyProfile; - bool_t m_terminating; + //bool_t m_terminating; }; class RemoteConference: public Conference { @@ -373,8 +373,8 @@ LocalConference::LocalConference(LinphoneCore *core, LinphoneConference *conf, c m_conf(NULL), m_localEndpoint(NULL), m_recordEndpoint(NULL), - m_localDummyProfile(NULL), - m_terminating(FALSE) { + m_localDummyProfile(NULL)/*, + m_terminating(FALSE)*/ { MSAudioConferenceParams ms_conf_params; ms_conf_params.samplerate = lp_config_get_int(m_core->config, "sound","conference_rate",16000); diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c index f4cc4c85a..1308ff063 100644 --- a/coreapi/linphonecore.c +++ b/coreapi/linphonecore.c @@ -2735,11 +2735,11 @@ static void apply_jitter_value(LinphoneCore *lc, int value, MSFormatType stype){ RtpSession *s=ms->sessions.rtp_session; if (s){ if (value>0){ - ms_message("Jitter buffer size set to [%i] ms on call [%p]",value,call); + ms_message("Jitter buffer size set to [%i] ms on call [%p]", value, call.get()); rtp_session_set_jitter_compensation(s,value); rtp_session_enable_jitter_buffer(s,TRUE); }else if (value==0){ - ms_warning("Jitter buffer is disabled per application request on call [%p]",call); + ms_warning("Jitter buffer is disabled per application request on call [%p]", call.get()); rtp_session_enable_jitter_buffer(s,FALSE); } }