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<MessageEngine> 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 <raquel.medina@konsulko.com>
Change-Id: Ie2304453dc37723dac13d256286eeb85f84ca2ab

2 files changed, 4 insertions, 5 deletions

diff --git a/hvac/hvac.cpp b/hvac/hvac.cpp
index 23aef30..edb7e35 100644
--- a/hvac/hvac.cpp
+++ b/hvac/hvac.cpp
@@ -23,24 +23,23 @@
 #include "eventmessage.h"
 #include "messagefactory.h"
 #include "messageengine.h"
+#include "messageenginefactory.h"
 #include "hvac.h"
 
 
 // TODO: don't duplicate defaults from HVAC service here
 HVAC::HVAC (QUrl &url, QObject * parent) :
     QObject(parent),
-    m_mloop(nullptr),
     m_fanspeed(0),
     m_temp_left_zone(21),
     m_temp_right_zone(21)
 {
-    m_mloop = new MessageEngine(url);
-    QObject::connect(m_mloop, &MessageEngine::messageReceived, this, &HVAC::onMessageReceived);
+    m_mloop = MessageEngineFactory::getInstance().getMessageEngine(url);
+    QObject::connect(m_mloop.get(), &MessageEngine::messageReceived, this, &HVAC::onMessageReceived);
 }
 
 HVAC::~HVAC()
 {
-    delete m_mloop;
 }
 
 void HVAC::control(QString verb, QString field, int value)
diff --git a/hvac/hvac.h b/hvac/hvac.h
index 81378e4..858fddf 100644
--- a/hvac/hvac.h
+++ b/hvac/hvac.h
@@ -45,7 +45,7 @@ class HVAC : public QObject
         void languageChanged(QString language);
 
     private:
-        MessageEngine *m_mloop;
+        std::shared_ptr<MessageEngine> m_mloop;
 
         int m_fanspeed;
         int m_temp_left_zone;