X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=app%2Fmain.cpp;h=2058ff98c57baaf821401a901d8b00be4880dfd1;hb=refs%2Fchanges%2F46%2F27646%2F1;hp=d72c492e7c41983f1041237c4f17d130d59acaf7;hpb=7ad9148455f925e285822e8c17d94ce94f564732;p=apps%2Fmediaplayer.git

diff --git a/app/main.cpp b/app/main.cpp
index d72c492..2058ff9 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>
@@ -28,45 +24,25 @@
 #include <QQuickWindow>
 
 #include <mediaplayer.h>
+#include <vehiclesignals.h>
 
 #include <unistd.h>
 
 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));
+    VehicleSignalsConfig vsConfig("mediaplayer");
+    context->setContextProperty("VehicleSignals", new VehicleSignals(vsConfig));
 
-    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();
 }