From 389b5994553fdae59d484068d542910efee79e9c Mon Sep 17 00:00:00 2001 From: Matt Porter Date: Mon, 25 Jun 2018 11:01:11 -0400 Subject: Reorg binding-specific modules into subdirectories Move binding-specific code into per-binding subdirectories. This separates the core message engine code and simplifies adding new binding-specific modules. Bug-AGL: SPEC-1525 Change-Id: I8fc545e3af375e2ed9e79a41363b7ade97e9b20a Signed-off-by: Matt Porter --- mediaplayer/CMakeLists.txt | 2 + mediaplayer/mediaplayer.cpp | 171 +++++++++++++++++++++++++++++++++++++ mediaplayer/mediaplayer.h | 65 ++++++++++++++ mediaplayer/mediaplayermessage.cpp | 31 +++++++ mediaplayer/mediaplayermessage.h | 31 +++++++ 5 files changed, 300 insertions(+) create mode 100644 mediaplayer/CMakeLists.txt create mode 100644 mediaplayer/mediaplayer.cpp create mode 100644 mediaplayer/mediaplayer.h create mode 100644 mediaplayer/mediaplayermessage.cpp create mode 100644 mediaplayer/mediaplayermessage.h (limited to 'mediaplayer') diff --git a/mediaplayer/CMakeLists.txt b/mediaplayer/CMakeLists.txt new file mode 100644 index 0000000..fd7e3f3 --- /dev/null +++ b/mediaplayer/CMakeLists.txt @@ -0,0 +1,2 @@ +add_headers(mediaplayer.h mediaplayermessage.h) +add_sources(mediaplayer.cpp mediaplayermessage.cpp) diff --git a/mediaplayer/mediaplayer.cpp b/mediaplayer/mediaplayer.cpp new file mode 100644 index 0000000..5755f37 --- /dev/null +++ b/mediaplayer/mediaplayer.cpp @@ -0,0 +1,171 @@ +/* + * Copyright (C) 2018 Konsulko Group + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "message.h" +#include "messageengine.h" +#include "mediaplayer.h" +#include "mediaplayermessage.h" + +Mediaplayer::Mediaplayer (QUrl &url, QObject * parent) : + QObject(parent), + m_mloop(nullptr) +{ + m_mloop = new MessageEngine(url); + QObject::connect(m_mloop, &MessageEngine::connected, this, &Mediaplayer::onConnected); + QObject::connect(m_mloop, &MessageEngine::disconnected, this, &Mediaplayer::onDisconnected); + QObject::connect(m_mloop, &MessageEngine::messageReceived, this, &Mediaplayer::onMessageReceived); +} + +Mediaplayer::~Mediaplayer() +{ + delete m_mloop; +} + + +// Control Verb methods + +void Mediaplayer::control(QString control, QJsonObject parameter) +{ + MediaplayerMessage *tmsg = new MediaplayerMessage(); + + parameter.insert("value", control); + + tmsg->createRequest("controls", parameter); + m_mloop->sendMessage(tmsg); + tmsg->deleteLater(); +} + + +void Mediaplayer::control(QString control) +{ + QJsonObject parameter; + + Mediaplayer::control(control, parameter); +} + +void Mediaplayer::play() +{ + control("play"); +} + +void Mediaplayer::pause() +{ + control("pause"); +} + +void Mediaplayer::previous() +{ + control("previous"); +} + +void Mediaplayer::next() +{ + control("next"); +} + +void Mediaplayer::seek(int milliseconds) +{ + QJsonObject parameter; + parameter.insert("position", QString::number(milliseconds)); + + control("seek", parameter); +} + +void Mediaplayer::fastforward(int milliseconds) +{ + QJsonObject parameter; + parameter.insert("position", QString::number(milliseconds)); + + control("fast-forward", parameter); +} + +void Mediaplayer::rewind(int milliseconds) +{ + QJsonObject parameter; + parameter.insert("position", QString::number(milliseconds)); + + control("rewind", parameter); +} + +void Mediaplayer::picktrack(int track) +{ + QJsonObject parameter; + parameter.insert("index", QString::number(track)); + + control("pick-track", parameter); +} + +void Mediaplayer::volume(int volume) +{ + QJsonObject parameter; + parameter.insert("volume", QString(volume)); + + control("volume", parameter); +} + +void Mediaplayer::loop(int state) +{ + QJsonObject parameter; + parameter.insert("state", state ? "true" : "false"); + + control("loop", parameter); +} + +void Mediaplayer::onConnected() +{ + QStringListIterator eventIterator(events); + MediaplayerMessage *tmsg; + + while (eventIterator.hasNext()) { + tmsg = new MediaplayerMessage(); + QJsonObject parameter; + parameter.insert("value", eventIterator.next()); + tmsg->createRequest("subscribe", parameter); + m_mloop->sendMessage(tmsg); + tmsg->deleteLater(); + } +} + +void Mediaplayer::onDisconnected() +{ + QStringListIterator eventIterator(events); + MediaplayerMessage *tmsg; + + while (eventIterator.hasNext()) { + tmsg = new MediaplayerMessage(); + QJsonObject parameter; + parameter.insert("value", eventIterator.next()); + tmsg->createRequest("unsubscribe", parameter); + m_mloop->sendMessage(tmsg); + tmsg->deleteLater(); + } +} + +void Mediaplayer::onMessageReceived(MessageType type, Message *message) +{ + if (type == MediaplayerEventMessage) { + MediaplayerMessage *tmsg = qobject_cast(message); + + if (tmsg->isEvent()) { + if (tmsg->isPlaylistEvent()) { + emit playlistChanged(tmsg->eventData().toVariantMap()); + } else if (tmsg->isMetadataEvent()) { + emit metadataChanged(tmsg->eventData().toVariantMap()); + } + } + } + message->deleteLater(); +} diff --git a/mediaplayer/mediaplayer.h b/mediaplayer/mediaplayer.h new file mode 100644 index 0000000..bf0b8bf --- /dev/null +++ b/mediaplayer/mediaplayer.h @@ -0,0 +1,65 @@ +/* + * Copyright (C) 2018 Konsulko Group + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef MEDIAPLAYER_H +#define MEDIAPLAYER_H + +#include +#include + +#include "messageengine.h" + +class Mediaplayer : public QObject +{ + Q_OBJECT + + public: + explicit Mediaplayer(QUrl &url, QObject * parent = Q_NULLPTR); + virtual ~Mediaplayer(); + + // controls + Q_INVOKABLE void play(); + Q_INVOKABLE void pause(); + Q_INVOKABLE void previous(); + Q_INVOKABLE void next(); + Q_INVOKABLE void seek(int); + Q_INVOKABLE void fastforward(int); + Q_INVOKABLE void rewind(int); + Q_INVOKABLE void picktrack(int); + Q_INVOKABLE void volume(int); + Q_INVOKABLE void loop(int); + + signals: + void playlistChanged(QVariantMap playlist); + void metadataChanged(QVariantMap metadata); + + private: + MessageEngine *m_mloop; + + void control(QString, QJsonObject); + void control(QString); + + void onConnected(); + void onDisconnected(); + void onMessageReceived(MessageType, Message*); + + const QStringList events { + "playlist", + "metadata", + }; +}; + +#endif // MEDIAPLAYER_H diff --git a/mediaplayer/mediaplayermessage.cpp b/mediaplayer/mediaplayermessage.cpp new file mode 100644 index 0000000..cda09d2 --- /dev/null +++ b/mediaplayer/mediaplayermessage.cpp @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2018 Konsulko Group + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include +#include +#include + +#include "mediaplayermessage.h" + +bool MediaplayerMessage::createRequest(QString verb, QJsonObject parameter) +{ + QStringList verbs {"playlist", "metadata", "controls", "subscribe", "unsubscribe"}; + if (!verbs.contains(verb)) + return false; + + return Message::createRequest("mediaplayer", verb, parameter); +} diff --git a/mediaplayer/mediaplayermessage.h b/mediaplayer/mediaplayermessage.h new file mode 100644 index 0000000..c164cde --- /dev/null +++ b/mediaplayer/mediaplayermessage.h @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2018 Konsulko Group + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef MEDIAPLAYER_MESSAGE_H +#define MEDIAPLAYER_MESSAGE_H + +#include "message.h" + +class MediaplayerMessage : public Message +{ + Q_OBJECT + public: + bool isPlaylistEvent() { return (this->eventName() == "playlist"); }; + bool isMetadataEvent() { return (this->eventName() == "metadata"); }; + bool createRequest(QString verb, QJsonObject parameter); +}; + +#endif // MEDIAPLAYER_MESSAGE_H -- cgit 1.2.3-korg