From 6465961f28f40ff5a2da31876f1c23ea3c7f7cec Mon Sep 17 00:00:00 2001 From: Matt Ranostay Date: Thu, 10 May 2018 00:44:44 -0700 Subject: libqtappfw: mediaplayer: switch from QJsonObject to QVariantMap Use more generic QVariantMap in signals to avoid requiring a consumer from using QJsonObject includes. Bug-AGL: SPEC-1375 Change-Id: I4efba63a464c7c6da2f06abb4cf17b6782c57f43 Signed-off-by: Matt Ranostay --- mediaplayer.cpp | 4 ++-- mediaplayer.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mediaplayer.cpp b/mediaplayer.cpp index 58aad8a..5755f37 100644 --- a/mediaplayer.cpp +++ b/mediaplayer.cpp @@ -161,9 +161,9 @@ void Mediaplayer::onMessageReceived(MessageType type, Message *message) if (tmsg->isEvent()) { if (tmsg->isPlaylistEvent()) { - emit playlistChanged(tmsg->eventData()); + emit playlistChanged(tmsg->eventData().toVariantMap()); } else if (tmsg->isMetadataEvent()) { - emit metadataChanged(tmsg->eventData()); + emit metadataChanged(tmsg->eventData().toVariantMap()); } } } diff --git a/mediaplayer.h b/mediaplayer.h index 107cfa3..bf0b8bf 100644 --- a/mediaplayer.h +++ b/mediaplayer.h @@ -43,8 +43,8 @@ class Mediaplayer : public QObject Q_INVOKABLE void loop(int); signals: - void playlistChanged(QJsonObject playlist); - void metadataChanged(QJsonObject metadata); + void playlistChanged(QVariantMap playlist); + void metadataChanged(QVariantMap metadata); private: MessageEngine *m_mloop; -- cgit 1.2.3-korg