3 files changed, 28 insertions, 23 deletions

diff --git a/voice-capabilities/CMakeLists.txt b/voice-capabilities/CMakeLists.txt
index e1a6089..e3c0de7 100644
--- a/voice-capabilities/CMakeLists.txt
+++ b/voice-capabilities/CMakeLists.txt
@@ -1,2 +1,2 @@
-add_headers(guimetadata.h guimetadatamessage.h)
-add_sources(guimetadata.cpp guimetadatamessage.cpp)
+add_headers(guimetadata.h)
+add_sources(guimetadata.cpp)
diff --git a/voice-capabilities/guimetadata.cpp b/voice-capabilities/guimetadata.cpp
index 949cb58..4c597c1 100644
--- a/voice-capabilities/guimetadata.cpp
+++ b/voice-capabilities/guimetadata.cpp
@@ -17,8 +17,9 @@
 #include <QDebug>
 #include <QJsonArray>
 
-#include "message.h"
-#include "guimetadatamessage.h"
+#include "callmessage.h"
+#include "eventmessage.h"
+#include "messagefactory.h"
 #include "messageengine.h"
 #include "guimetadata.h"
 
@@ -308,19 +309,20 @@ bool GuiMetadata::updateWeatherMetadata(QJsonObject &data)
 
 void GuiMetadata::onConnected()
 {
-	QStringListIterator eventIterator(events);
-	GuiMetadataCapabilityMessage *tmsg;
+	std::unique_ptr<Message> msg = MessageFactory::getInstance().createOutboundMessage(MessageId::Call);
+	if (!msg)
+		return;
 
-	tmsg = new GuiMetadataCapabilityMessage();
+	CallMessage *tmsg = static_cast<CallMessage*>(msg.get());
+	QStringListIterator eventIterator(events);
 	QJsonObject parameter;
 	QJsonArray actions;
 	while (eventIterator.hasNext()) {
 		actions.append(QJsonValue(eventIterator.next()));
 	}
 	parameter.insert("actions", actions);
-	tmsg->createRequest("guimetadata/subscribe", parameter);
-	m_mloop->sendMessage(tmsg);
-	delete tmsg;
+	tmsg->createRequest("vshl-capabilities", "guimetadata/subscribe", parameter);
+	m_mloop->sendMessage(std::move(msg));
 }
 
 void GuiMetadata::onDisconnected()
@@ -328,18 +330,21 @@ void GuiMetadata::onDisconnected()
 	// vshl-capabilities currently has no unsubscribe verb...
 }
 
-void GuiMetadata::onMessageReceived(MessageType type, Message *message)
+void GuiMetadata::onMessageReceived(std::shared_ptr<Message> msg)
 {
-	if (type == MessageType::GuiMetadataCapabilityEventMessage) {
-		GuiMetadataCapabilityMessage *tmsg = qobject_cast<GuiMetadataCapabilityMessage*>(message);
-		if (tmsg->isEvent()) {
-			if (tmsg->isGuiMetadataRenderTemplateEvent()) {
-				if(updateMetadata(tmsg->eventData()))
-					emit renderTemplate();
-			} else if (tmsg->isGuiMetadataClearTemplateEvent()) {
-				emit clearTemplate();
-			}
+	if (!msg)
+		return;
+
+	if (msg->isEvent()) {
+		std::shared_ptr<EventMessage> emsg = std::static_pointer_cast<EventMessage>(msg);
+		if (emsg->eventApi() != "vshl-capabilities");
+			return;
+		QString ename = emsg->eventName();
+		QJsonObject data = emsg->eventData();
+		if ((ename == "render-template") && updateMetadata(data)) {
+			emit renderTemplate();
+		} else if (ename == "clear_template") {
+			emit clearTemplate();
 		}
 	}
-	message->deleteLater();
 }
diff --git a/voice-capabilities/guimetadata.h b/voice-capabilities/guimetadata.h
index ae90cba..f082d52 100644
--- a/voice-capabilities/guimetadata.h
+++ b/voice-capabilities/guimetadata.h
@@ -17,13 +17,13 @@
 #ifndef GUIMETADATA_H
 #define GUIMETADATA_H
 
+#include <memory>
 #include <QObject>
 #include <QtQml/QQmlContext>
 
 class MessageEngine;
 class Message;
 
-enum class MessageType;
 
 class GuiMetadata : public QObject
 {
@@ -128,7 +128,7 @@ private:
 
 	void onConnected();
 	void onDisconnected();
-	void onMessageReceived(MessageType, Message*);
+	void onMessageReceived(std::shared_ptr<Message>);
 
 	const QStringList events {
 		"render_template",