diff options
author | Scott Murray <scott.murray@konsulko.com> | 2022-02-14 18:29:54 -0500 |
---|---|---|
committer | Scott Murray <scott.murray@konsulko.com> | 2022-02-14 18:29:54 -0500 |
commit | f932d6da561278df631d0f77ae496a46efe4750f (patch) | |
tree | 7afb38f4fb74244006ad7bb74394a97c095cfdc5 /app/main.cpp | |
parent | 3c8425ae606ea142f227fd7dc9c2bc01def384ad (diff) |
Update for app framework removal
Changes:
- Remove the autobuild scripts and config.xml used by the app
framework widget build.
- Update the qmake files to just build a "settings" binary and
install it into /usr/bin by default.
- Remove the code in main.cpp that handled reading the WebSocket
command-line arguments and passing them to binding related
code.
- Add initial .desktop file and icon copied from the launcher
source tree, and updated .pro files to install them.
Bug-AGL: SPEC-4182
Change-Id: I7e519aa963f6f22a37d083b2743ad5d42ead9684
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Diffstat (limited to 'app/main.cpp')
-rw-r--r-- | app/main.cpp | 33 |
1 files changed, 3 insertions, 30 deletions
diff --git a/app/main.cpp b/app/main.cpp index d72c492..771ce3a 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -15,11 +15,7 @@ * limitations under the License. */ -#include <QtCore/QCommandLineParser> #include <QtCore/QDebug> -#include <QtCore/QDir> -#include <QtCore/QStandardPaths> -#include <QtCore/QUrlQuery> #include <QtGui/QGuiApplication> #include <QtQml/QQmlApplicationEngine> #include <QtQml/QQmlContext> @@ -34,39 +30,16 @@ int main(int argc, char *argv[]) { QString graphic_role = QString("music"); - QGuiApplication app(argc, argv); QQuickStyle::setStyle("AGL"); QQmlApplicationEngine engine; QQmlContext *context = engine.rootContext(); + context->setContextProperty("AlbumArt", ""); + context->setContextProperty("mediaplayer", new Mediaplayer(context)); - QCommandLineParser parser; - 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) { - int port = positionalArguments.takeFirst().toInt(); - QString secret = positionalArguments.takeFirst(); - QUrl bindingAddress; - bindingAddress.setScheme(QStringLiteral("ws")); - bindingAddress.setHost(QStringLiteral("localhost")); - bindingAddress.setPort(port); - bindingAddress.setPath(QStringLiteral("/api")); - QUrlQuery query; - query.addQueryItem(QStringLiteral("token"), secret); - bindingAddress.setQuery(query); - context->setContextProperty(QStringLiteral("bindingAddress"), bindingAddress); - - context->setContextProperty("AlbumArt", ""); - context->setContextProperty("mediaplayer", new Mediaplayer(bindingAddress, context)); + engine.load(QUrl(QStringLiteral("qrc:/MediaPlayer.qml"))); - engine.load(QUrl(QStringLiteral("qrc:/MediaPlayer.qml"))); - } return app.exec(); } |