diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c index 1308ff063..0cc6b5c37 100644 --- a/coreapi/linphonecore.c +++ b/coreapi/linphonecore.c @@ -6234,7 +6234,7 @@ void linphone_core_destroy(LinphoneCore *lc){ } int linphone_core_get_calls_nb(const LinphoneCore *lc) { - return (int)L_GET_CPP_PTR_FROM_C_OBJECT(lc)->getCallsNb(); + return (int)L_GET_CPP_PTR_FROM_C_OBJECT(lc)->getCallCount(); } void linphone_core_soundcard_hint_check(LinphoneCore* lc) { diff --git a/src/conference/session/media-session.cpp b/src/conference/session/media-session.cpp index 2257b88b6..59a7accc3 100644 --- a/src/conference/session/media-session.cpp +++ b/src/conference/session/media-session.cpp @@ -3210,7 +3210,7 @@ void MediaSessionPrivate::updateStreams (SalMediaDescription *newMd, LinphoneCal if (getParams()->earlyMediaSendingEnabled() && (state == LinphoneCallOutgoingEarlyMedia)) prepareEarlyMediaForking(); startStreams(targetState); - if ((state == LinphoneCallPausing) && pausedByApp && (q->getCore()->getCallsNb() == 1)) + if ((state == LinphoneCallPausing) && pausedByApp && (q->getCore()->getCallCount() == 1)) linphone_core_play_named_tone(q->getCore()->getCCore(), LinphoneToneCallOnHold); updateFrozenPayloads(newMd); diff --git a/src/core/core-call.cpp b/src/core/core-call.cpp index 918faf9ca..3dd816c73 100644 --- a/src/core/core-call.cpp +++ b/src/core/core-call.cpp @@ -60,7 +60,7 @@ void CorePrivate::iterateCalls (time_t currentRealTime, bool oneSecondElapsed) c bool CorePrivate::canWeAddCall () const { L_Q(); - if (q->getCallsNb() < static_cast(q->getCCore()->max_calls)) + if (q->getCallCount() < static_cast(q->getCCore()->max_calls)) return true; lInfo() << "Maximum amount of simultaneous calls reached!"; return false; @@ -137,7 +137,7 @@ const list> &Core::getCalls () const { return d->calls; } -unsigned int Core::getCallsNb () const { +unsigned int Core::getCallCount () const { L_D(); return static_cast(d->calls.size()); } diff --git a/src/core/core.h b/src/core/core.h index b74330ac6..d3f3f395c 100644 --- a/src/core/core.h +++ b/src/core/core.h @@ -73,7 +73,7 @@ public: bool areSoundResourcesLocked () const; std::shared_ptr getCallByRemoteAddress (const Address &addr) const; const std::list> &getCalls () const; - unsigned int getCallsNb () const; + unsigned int getCallCount () const; std::shared_ptr getCurrentCall () const; LinphoneStatus pauseAllCalls (); void soundcardHintCheck ();