diff options
| author |   Scott Murray <scott.murray@konsulko.com> | 2019-12-20 15:45:26 -0500 |
|---|---|---|
| committer | Scott Murray <scott.murray@konsulko.com> | 2019-12-20 15:45:26 -0500 |
| commit | aa6b53c6a1f1a2e138a95f24795f767d6a15d31e (patch) | |
| tree | 05f0a876d05869935f3312aa3b851458d5d7facb /message.h | |
| parent | 100316af08e530eb0e56165344363d6ad2edf395 (diff) | |
Backport voice message support
Backported changes from master branch include:
72eb23f fix parsing for all events, overloading for specific needs
21bba7d fix parsing event payload in presence of '\n' chars, and include signal emit for voice status and cbl changes.
9f3896c voice: register for all vshl events on start up
0ff12f7 voice: remove vshl-capabilities dependencies
16c4429 voice: add status events to VshlCoreVoiceMessages.
da09164 voice: add initial support for voice agents configuration
Bug-AGL: SPEC-2981, SPEC-2880, SPEC-3060
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: Ia75ff0c8d180324459fe8a2d8fb844b7b288d057
Diffstat (limited to 'message.h')
| -rw-r--r-- | message.h | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -1,5 +1,5 @@ /* - * Copyright (C) 2017, 2018 Konsulko Group + * Copyright (C) 2017, 2018, 2019 Konsulko Group * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -42,6 +42,7 @@ enum MessageType { RadioEventMessage, MapEventMessage, NavigationEventMessage, + VoiceEventMessage, SignalComposerEventMessage, }; @@ -55,7 +56,7 @@ class Message : public QObject Message(); bool fromJson(QByteArray jsonData); - bool fromJDoc(QJsonDocument jdocData); + virtual bool fromJDoc(QJsonDocument jdocData); QByteArray toJson(QJsonDocument::JsonFormat format = QJsonDocument::Compact); bool createRequest(QString api, QString verb, QJsonValue parameter = "None"); inline QString eventApi() const @@ -88,17 +89,17 @@ class Message : public QObject return m_reply_data; } - inline bool isEvent() const + inline bool isEvent() const { return m_event; } - inline bool isReply() const + inline bool isReply() const { return m_reply; } - inline bool isValid() const + inline bool isValid() const { return m_init; } |