Commit ca1f4a44 authored by Wescoeur's avatar Wescoeur

feat(app): coding style and update subdmodules

parent 397aaf83
...@@ -45,7 +45,7 @@ ConferenceModel::ConferenceModel (QObject *parent) : QSortFilterProxyModel(paren ...@@ -45,7 +45,7 @@ ConferenceModel::ConferenceModel (QObject *parent) : QSortFilterProxyModel(paren
QObject::connect( QObject::connect(
CoreManager::getInstance()->getHandlers().get(), &CoreHandlers::callStateChanged, CoreManager::getInstance()->getHandlers().get(), &CoreHandlers::callStateChanged,
this, &ConferenceModel::handleCallStateChanged this, [this] { emit conferenceChanged(); }
); );
} }
...@@ -125,31 +125,23 @@ bool ConferenceModel::getRecording () const { ...@@ -125,31 +125,23 @@ bool ConferenceModel::getRecording () const {
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
float ConferenceModel::getMicroVu () const { float ConferenceModel::getMicroVu () const {
shared_ptr<linphone::Core> core = CoreManager::getInstance()->getCore(); return LinphoneUtils::computeVu(
return LinphoneUtils::computeVu(core->getConferenceLocalInputVolume()); CoreManager::getInstance()->getCore()->getConferenceLocalInputVolume()
);
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
void ConferenceModel::leave () { void ConferenceModel::leave () {
shared_ptr<linphone::Core> core = CoreManager::getInstance()->getCore(); CoreManager::getInstance()->getCore()->leaveConference();
core->leaveConference();
emit conferenceChanged(); emit conferenceChanged();
} }
void ConferenceModel::join () { void ConferenceModel::join () {
shared_ptr<linphone::Core> core = CoreManager::getInstance()->getCore(); CoreManager::getInstance()->getCore()->enterConference();
core->enterConference();
emit conferenceChanged(); emit conferenceChanged();
} }
bool ConferenceModel::isInConference () const { bool ConferenceModel::isInConference () const {
shared_ptr<linphone::Core> core = CoreManager::getInstance()->getCore(); return CoreManager::getInstance()->getCore()->isInConference();
return core->isInConference();
}
// -----------------------------------------------------------------------------
void ConferenceModel::handleCallStateChanged (const shared_ptr<linphone::Call> &call, linphone::CallState state) {
emit conferenceChanged();
} }
...@@ -51,7 +51,7 @@ protected: ...@@ -51,7 +51,7 @@ protected:
Q_INVOKABLE void startRecording (); Q_INVOKABLE void startRecording ();
Q_INVOKABLE void stopRecording (); Q_INVOKABLE void stopRecording ();
Q_INVOKABLE void join (); Q_INVOKABLE void join ();
Q_INVOKABLE void leave (); Q_INVOKABLE void leave ();
...@@ -60,11 +60,9 @@ signals: ...@@ -60,11 +60,9 @@ signals:
void microMutedChanged (bool status); void microMutedChanged (bool status);
void recordingChanged (bool status); void recordingChanged (bool status);
void conferenceChanged(); void conferenceChanged ();
private: private:
void handleCallStateChanged (const std::shared_ptr<linphone::Call> &call, linphone::CallState state);
int getCount () const { int getCount () const {
return rowCount(); return rowCount();
} }
......
bctoolbox @ 6fd63808
Subproject commit e401c0a91f81ff2a22b713151617ba4e7994c855 Subproject commit 6fd63808ae0be8caa52a94e065d325ba5844b3ed
belcard @ 38eba4c2
Subproject commit e143d5654e4736fcc57bfc423ab626fea818f27c Subproject commit 38eba4c264b5e45c8650c8ccf05f359541d8c4ae
belle-sip @ dfefba74
Subproject commit 5ea997060204d7eb680d94c8f258ca5bfdce1d65 Subproject commit dfefba74048a363e5bb78d0395d6087bf2646eb8
cmake-builder @ ca5c7506
Subproject commit 250a969ebbe708203dc0af9f2c6f1a0f3546c9f3 Subproject commit ca5c750626c928d2a50c113df2faf91fbdf4380a
linphone @ 2b93067a
Subproject commit f2a56412ff684a52a2848856cd7aaaa5e9971e9b Subproject commit 2b93067a78a0373f24ee868d5bd0523f6be15d14
msamr @ d86b907b
Subproject commit aaa046142033c4ec646e0e1b6f3641177490aa10 Subproject commit d86b907b31eb7ecd6a3fd4409d5c9633d4366164
msopenh264 @ 5544086f
Subproject commit 3a398b4000f29c67e010057f718c136ca245a9a8 Subproject commit 5544086f478c13150eda5df683d914ecbf13ea89
mssilk @ 3a61f5de
Subproject commit fef0c397c1d2dfc3b8b0951e3db0b9b5cb5d34b9 Subproject commit 3a61f5decf634f5fb311b2c5f2984525fccd81d9
msx264 @ 1898b96a
Subproject commit 6d9478bc52d91e83ee535dce47b31865e669ae39 Subproject commit 1898b96a946c61b866c09c63e60622cf32dd2d2e
ortp @ baf804e4
Subproject commit bd792338c47c3849cce3661d4e693df0177873c0 Subproject commit baf804e45f0fe9c8f156c76627083cc868fd12db
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