X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=app%2Fmain.cpp;h=771ce3af093c65824c23e08642d8638aa013162c;hb=refs%2Ftags%2Fmarlin_13.0.0;hp=c3e0fb0429108c4b380e1a0054440b1b38d8e324;hpb=92e613114ff5212fa7e5c2a226e32b6e252c9a9c;p=apps%2Fmediaplayer.git diff --git a/app/main.cpp b/app/main.cpp index c3e0fb0..771ce3a 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2016 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. @@ -14,60 +15,29 @@ * limitations under the License. */ -#include #include -#include -#include -#include #include #include #include #include #include +#include -#ifdef HAVE_LIBHOMESCREEN -#include -#endif +#include + +#include int main(int argc, char *argv[]) { -#ifdef HAVE_LIBHOMESCREEN - LibHomeScreen libHomeScreen; - - if (!libHomeScreen.renderAppToAreaAllowed(0, 1)) { - qWarning() << "renderAppToAreaAllowed is denied"; - return -1; - } -#endif - + QString graphic_role = QString("music"); QGuiApplication app(argc, argv); QQuickStyle::setStyle("AGL"); QQmlApplicationEngine engine; QQmlContext *context = engine.rootContext(); - - 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(context)); engine.load(QUrl(QStringLiteral("qrc:/MediaPlayer.qml")));