diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/VideoPlayer.qml | 17 | ||||
| -rw-r--r-- | app/api/MediaScanner.qml | 117 | ||||
| -rw-r--r-- | app/app.pri | 3 | ||||
| -rw-r--r-- | app/app.pro | 8 | ||||
| -rw-r--r-- | app/main.cpp | 45 | ||||
| -rw-r--r-- | app/videoplayer.qrc | 1 |
6 files changed, 10 insertions, 181 deletions
diff --git a/app/VideoPlayer.qml b/app/VideoPlayer.qml index 7eb252e..83066f3 100644 --- a/app/VideoPlayer.qml +++ b/app/VideoPlayer.qml @@ -18,25 +18,10 @@ import QtQuick.Layouts 1.1 import QtQuick.Controls 2.0 import QtMultimedia 5.6 import AGL.Demo.Controls 1.0 -import 'api' as API ApplicationWindow { id: root - API.MediaScanner { - id: scanner - url: bindingAddress - - property var titles: Object - onAdded: { - playlist.addItem(media.path) - titles[media.path] = media.title - } - onRemoved: { - playlist.removeItem(index) - } - } - MediaPlayer { id: player audioRole: MediaPlayer.MusicRole @@ -206,7 +191,7 @@ ApplicationWindow { Layout.fillWidth: true Label { Layout.fillWidth: true - text: scanner.titles[model.source] ? scanner.titles[model.source] : model.source.toString().split('/').reverse()[0] + text: model.source.toString().split('/').reverse()[0] } } Label { diff --git a/app/api/MediaScanner.qml b/app/api/MediaScanner.qml deleted file mode 100644 index 8842a18..0000000 --- a/app/api/MediaScanner.qml +++ /dev/null @@ -1,117 +0,0 @@ -/* - * Copyright (C) 2018 The Qt Company Ltd. - * Copyright (C) 2017 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. - */ - -import QtQuick 2.6 -import QtWebSockets 1.0 - -WebSocket { - id: root - active: true - url: bindingAddress - - property string statusString: "waiting..." - property string apiString: "mediascanner" - property var verbs: [] - property string payloadLength: "9999" - - readonly property var msgid: { - "call": 2, - "retok": 3, - "reterr": 4, - "event": 5 - } - - signal added(var media) - signal removed(var index) - - property var cache: [] - function add(files) { - for (var i = 0; i < files.length; i++) { - var media = files[i] - - if (cache.indexOf(media.path) < 0) { - root.added(media) - cache.push(media.path) - } - } - } - - function remove(prefix) { - for (var i = cache.length - 1; i > -1; i--) { - var media = cache[i] - if (media.substr(0, prefix.length) === prefix) { - root.removed(i) - cache.splice(i, 1) - } - } - } - - onTextMessageReceived: { - console.debug("Raw response: " + message) - var json = JSON.parse(message) - var request = json[2].request - var response = json[2].response -// console.debug("response: " + JSON.stringify(response)) - switch (json[0]) { - case msgid.call: - break - case msgid.retok: - root.statusString = request.status - var verb = verbs.shift() - if (verb === "media_result") { - root.add(response.Media) - } - break - case msgid.reterr: - root.statusString = "Bad return value, binding probably not installed" - var verb = verbs.shift() - break - case msgid.event: - var payload = JSON.parse(JSON.stringify(json[2])) - var event = payload.event - if (event === "mediascanner/media_added") { - console.debug("Media playlist is updated") - root.add(json[2].data.Media) - } else if (event === "mediascanner/media_removed") { - root.remove(json[2].data.Path) - } - break - } - } - - onStatusChanged: { - switch (status) { - case WebSocket.Open: - console.debug("onStatusChanged: Open") - sendSocketMessage("subscribe", { value: "media_added" }) - sendSocketMessage("subscribe", { value: "media_removed" }) - sendSocketMessage("media_result", { type: 'video' }) - break - case WebSocket.Error: - root.statusString = "WebSocket error: " + root.errorString - break - } - } - - function sendSocketMessage(verb, parameter) { - var requestJson = [ msgid.call, payloadLength, apiString + '/' - + verb, parameter ] - console.debug("sendSocketMessage: " + JSON.stringify(requestJson)) - verbs.push(verb) - sendTextMessage(JSON.stringify(requestJson)) - } -} diff --git a/app/app.pri b/app/app.pri deleted file mode 100644 index f22f540..0000000 --- a/app/app.pri +++ /dev/null @@ -1,3 +0,0 @@ -TEMPLATE = app - -DESTDIR = $${OUT_PWD}/../package/root/bin diff --git a/app/app.pro b/app/app.pro index 0083bfc..805dd5f 100644 --- a/app/app.pro +++ b/app/app.pro @@ -1,5 +1,6 @@ +TEMPLATE = app TARGET = videoplayer -QT = quick websockets multimedia +QT = quick multimedia SOURCES = main.cpp @@ -7,5 +8,8 @@ RESOURCES += \ videoplayer.qrc \ images/images.qrc -include(app.pri) +target.path = /usr/bin +target.files += $${OUT_PWD}/$${TARGET} +target.CONFIG = no_check_exist executable +INSTALLS += target diff --git a/app/main.cpp b/app/main.cpp index 11b1230..db39a17 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -13,57 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include <QtQml/QQmlApplicationEngine> -#include <QtGui/QGuiApplication> +#include <QQmlApplicationEngine> +#include <QGuiApplication> #include <QDebug> -#include <QUrlQuery> -#include <QCommandLineParser> -#include <QtQml/QQmlContext> - int main(int argc, char *argv[]) { - - setenv("QT_QPA_PLATFORM", "wayland", 1); - int port; - QString token; - - QCommandLineParser parser; QGuiApplication app(argc, argv); - parser.addPositionalArgument("port", - app.translate("main", "port for binding")); - parser.addPositionalArgument("secret", - app.translate("main", "secret for binding")); - - parser.addHelpOption(); - parser.addVersionOption(); - parser.process(app); - QStringList positionalArguments = parser.positionalArguments(); - - if (positionalArguments.length() == 2) { - port = positionalArguments.takeFirst().toInt(); - token = positionalArguments.takeFirst(); - qInfo() << "setting port:" << port << ", token:" << token; - } else { - qInfo() << "Need to specify port and token"; - exit(EXIT_FAILURE); - } - - QUrl bindingAddress; - bindingAddress.setScheme(QStringLiteral("ws")); - bindingAddress.setHost(QStringLiteral("localhost")); - bindingAddress.setPort(port); - bindingAddress.setPath(QStringLiteral("/api")); - - QUrlQuery query; - query.addQueryItem(QStringLiteral("token"), token); - bindingAddress.setQuery(query); + setenv("QT_QUICK_CONTROLS_STYLE", "AGL", 1); QQmlApplicationEngine engine; - engine.rootContext()->setContextProperty(QStringLiteral("bindingAddress"), bindingAddress); engine.load(QUrl(QStringLiteral("qrc:/VideoPlayer.qml"))); return app.exec(); - } diff --git a/app/videoplayer.qrc b/app/videoplayer.qrc index a1bbeb0..efe0092 100644 --- a/app/videoplayer.qrc +++ b/app/videoplayer.qrc @@ -1,6 +1,5 @@ <RCC> <qresource prefix="/"> <file>VideoPlayer.qml</file> - <file>api/MediaScanner.qml</file> </qresource> </RCC> |