From 7fee65501ae1a565554a9ef0d1de83c58ab58a49 Mon Sep 17 00:00:00 2001
From: Trevor Tabah <trevor.tabah@savoirfairelinux.com>
Date: Wed, 19 May 2021 16:28:48 -0400
Subject: [PATCH] lrc: link to monitor API
Gitlab: https://git.jami.net/savoirfairelinux/jami-client-qt/-/issues/406
Change-Id: Ib51b86de3da5a2cfc587191490d2ae5898614528
---
src/api/lrc.h | 5 +++++
src/callbackshandler.cpp | 11 +++++++----
src/lrc.cpp | 6 ++++++
src/qtwrapper/configurationmanager_wrap.h | 6 ++++--
4 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/src/api/lrc.h b/src/api/lrc.h
index ee73c4b4..6ee0355a 100644
--- a/src/api/lrc.h
+++ b/src/api/lrc.h
@@ -119,6 +119,11 @@ public:
*/
static std::atomic_bool holdConferences;
+ /**
+ * Make monitor continous or discrete
+ */
+ static void monitor(bool continous);
+
private:
std::unique_ptr<LrcPimpl> lrcPimpl_;
};
diff --git a/src/callbackshandler.cpp b/src/callbackshandler.cpp
index d0f370ca..a3306fac 100644
--- a/src/callbackshandler.cpp
+++ b/src/callbackshandler.cpp
@@ -239,6 +239,8 @@ CallbacksHandler::CallbacksHandler(const Lrc& parent)
this,
&CallbacksHandler::slotAudioMeterReceived,
Qt::QueuedConnection);
+
+
}
CallbacksHandler::~CallbacksHandler() {}
@@ -247,10 +249,11 @@ void
CallbacksHandler::subscribeToDebugReceived()
{
connect(&ConfigurationManager::instance(),
- &ConfigurationManagerInterface::debugMessageReceived,
- this,
- &CallbacksHandler::slotDebugMessageReceived,
- Qt::QueuedConnection);
+ &ConfigurationManagerInterface::messageSend,
+ this,
+ &CallbacksHandler::slotDebugMessageReceived,
+ Qt::QueuedConnection);
+
}
void
diff --git a/src/lrc.cpp b/src/lrc.cpp
index 976af657..74bf381d 100644
--- a/src/lrc.cpp
+++ b/src/lrc.cpp
@@ -214,6 +214,12 @@ isFinished(const QString& callState)
return false;
}
+void
+Lrc::monitor(bool continuous)
+{
+ ConfigurationManager::instance().monitor(continuous);
+}
+
LrcPimpl::LrcPimpl(Lrc& linked, MigrationCb& willMigrateCb, MigrationCb& didMigrateCb)
: linked(linked)
, behaviorController(std::make_unique<BehaviorController>())
diff --git a/src/qtwrapper/configurationmanager_wrap.h b/src/qtwrapper/configurationmanager_wrap.h
index 1f429419..ef1f3f13 100644
--- a/src/qtwrapper/configurationmanager_wrap.h
+++ b/src/qtwrapper/configurationmanager_wrap.h
@@ -221,7 +221,7 @@ public:
}),
exportable_callback<ConfigurationSignal::MessageSend>(
[this](const std::string& message) {
- Q_EMIT this->debugMessageReceived(QString(message.c_str()));
+ Q_EMIT this->messageSend(QString(message.c_str()));
}),
exportable_callback<ConfigurationSignal::ComposingStatusChanged>(
[this](const std::string& account_id, const std::string& from, int status) {
@@ -517,6 +517,8 @@ public Q_SLOTS: // METHODS
void registerAllAccounts() { DRing::registerAllAccounts(); }
+ void monitor(bool continuous) { DRing::monitor(continuous); }
+
void removeAccount(const QString& accountID) { DRing::removeAccount(accountID.toStdString()); }
bool changeAccountPassword(const QString& id,
@@ -889,7 +891,7 @@ Q_SIGNALS: // SIGNALS
void accountProfileReceived(const QString& accountId,
const QString& displayName,
const QString& userPhoto);
- void debugMessageReceived(const QString& message);
+ void messageSend(const QString& message);
void composingStatusChanged(const QString& accountId,
const QString& contactId,
bool isComposing);
--
GitLab