From be7f78b632635c51089dc60f5bf178cc5db60350 Mon Sep 17 00:00:00 2001 From: Raquel Medina Date: Mon, 4 May 2020 10:57:37 +0200 Subject: share MessageEngine instance Share MessageEngine instance among clients in the same process using a common socket (same url). - add MessageEngineFactory class; - extend std::unordered_map<> to use QString as key; - use std::shared_ptr to share ownership among MessageEngineFactory and the engine clients; - force MessagEngine parent object null to avoid life cycle dependency on a parent; - protect insertions & deletions in m_calls map; Also, not directly related but as part of testing these changes: cleanup on voice to remove superflous model sorting (there's just one voice model for alexa voice agent). Bug-AGL: SPEC-3112 Signed-off-by: Raquel Medina Change-Id: Ie2304453dc37723dac13d256286eeb85f84ca2ab --- bluetooth/bluetooth.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bluetooth/bluetooth.h') diff --git a/bluetooth/bluetooth.h b/bluetooth/bluetooth.h index 3953fe6..b79e8f9 100644 --- a/bluetooth/bluetooth.h +++ b/bluetooth/bluetooth.h @@ -66,7 +66,7 @@ class Bluetooth : public QObject void requestConfirmationEvent(QJsonObject data); private: - MessageEngine *m_mloop; + std::shared_ptr m_mloop; QQmlContext *m_context; BluetoothModel *m_bluetooth; void send_command(QString, QJsonObject); -- cgit 1.2.3-korg