diff --git a/linphone-desktop/src/components/call/CallModel.cpp b/linphone-desktop/src/components/call/CallModel.cpp index e6076ef56..ff0eb52d5 100644 --- a/linphone-desktop/src/components/call/CallModel.cpp +++ b/linphone-desktop/src/components/call/CallModel.cpp @@ -25,6 +25,7 @@ #include #include "../../app/App.hpp" +#include "../../utils/LinphoneUtils.hpp" #include "../../utils/Utils.hpp" #include "../core/CoreManager.hpp" @@ -376,27 +377,12 @@ float CallModel::getQuality () const { // ----------------------------------------------------------------------------- -#define VU_MIN (-20.f) -#define VU_MAX (4.f) - -inline float computeVu (float volume) { - if (volume < VU_MIN) - return 0.f; - if (volume > VU_MAX) - return 1.f; - - return (volume - VU_MIN) / (VU_MAX - VU_MIN); -} - -#undef VU_MIN -#undef VU_MAX - float CallModel::getMicroVu () const { - return computeVu(mCall->getRecordVolume()); + return LinphoneUtils::computeVu(mCall->getRecordVolume()); } float CallModel::getSpeakerVu () const { - return computeVu(mCall->getPlayVolume()); + return LinphoneUtils::computeVu(mCall->getPlayVolume()); } // ----------------------------------------------------------------------------- diff --git a/linphone-desktop/src/components/conference/ConferenceModel.cpp b/linphone-desktop/src/components/conference/ConferenceModel.cpp index aa7738857..107aea9bc 100644 --- a/linphone-desktop/src/components/conference/ConferenceModel.cpp +++ b/linphone-desktop/src/components/conference/ConferenceModel.cpp @@ -22,6 +22,7 @@ #include +#include "../../utils/LinphoneUtils.hpp" #include "../../utils/Utils.hpp" #include "../core/CoreManager.hpp" @@ -123,35 +124,20 @@ bool ConferenceModel::getRecording () const { // ----------------------------------------------------------------------------- -#define VU_MIN (-20.f) -#define VU_MAX (4.f) - -inline float computeVu (float volume) { - if (volume < VU_MIN) - return 0.f; - if (volume > VU_MAX) - return 1.f; - - return (volume - VU_MIN) / (VU_MAX - VU_MIN); -} - -#undef VU_MIN -#undef VU_MAX - float ConferenceModel::getMicroVu () const { shared_ptr core = CoreManager::getInstance()->getCore(); - return computeVu(core->getConferenceLocalInputVolume()); + return LinphoneUtils::computeVu(core->getConferenceLocalInputVolume()); } // ----------------------------------------------------------------------------- -void ConferenceModel::leave() { +void ConferenceModel::leave () { shared_ptr core = CoreManager::getInstance()->getCore(); core->leaveConference(); emit conferenceChanged(); } -void ConferenceModel::join() { +void ConferenceModel::join () { shared_ptr core = CoreManager::getInstance()->getCore(); core->enterConference(); emit conferenceChanged(); @@ -167,4 +153,4 @@ bool ConferenceModel::isInConference () const { void ConferenceModel::handleCallStateChanged (const shared_ptr &call, linphone::CallState state) { emit conferenceChanged(); -} \ No newline at end of file +} diff --git a/linphone-desktop/src/utils/LinphoneUtils.hpp b/linphone-desktop/src/utils/LinphoneUtils.hpp index 1de2e1c41..5d3480acc 100644 --- a/linphone-desktop/src/utils/LinphoneUtils.hpp +++ b/linphone-desktop/src/utils/LinphoneUtils.hpp @@ -28,8 +28,23 @@ // ============================================================================= +#define VU_MIN (-20.f) +#define VU_MAX (4.f) + namespace LinphoneUtils { + inline float computeVu (float volume) { + if (volume < VU_MIN) + return 0.f; + if (volume > VU_MAX) + return 1.f; + + return (volume - VU_MIN) / (VU_MAX - VU_MIN); + } + linphone::TransportType stringToTransportType (const QString &transport); } +#undef VU_MIN +#undef VU_MAX + #endif // ifndef LINPHONE_UTILS_H_