X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=app%2Fmain.cpp;h=5ad9577a0a9a4fca45e2e4978369ae13eeee658b;hb=refs%2Ftags%2Fdab%2F3.99.2;hp=e8d4082f354b6db2c3a2c6b01c6933345b5eb148;hpb=4eee2655560fbb2f7724095bb7fa488f3f39ba55;p=apps%2Fmediaplayer.git

diff --git a/app/main.cpp b/app/main.cpp
index e8d4082..5ad9577 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -14,9 +14,11 @@
  * 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>
@@ -27,14 +29,6 @@
 #include <libhomescreen.hpp>
 #endif
 
-#ifdef HAVE_LIGHTMEDIASCANNER
-#include "lightmediascanner.h"
-#endif
-
-#ifdef HAVE_DBUS
-#include "dbus.h"
-#endif
-
 #include "playlistwithmetadata.h"
 
 #ifndef HAVE_LIGHTMEDIASCANNER
@@ -71,28 +65,42 @@ int main(int argc, char *argv[])
 
     qmlRegisterType<PlaylistWithMetadata>("MediaPlayer", 1, 0, "PlaylistWithMetadata");
 
-    QVariantList mediaFiles;
+    QQmlApplicationEngine engine;
+    QQmlContext *context = engine.rootContext();
 
-#ifdef HAVE_LIGHTMEDIASCANNER
-    mediaFiles = LightMediaScanner::processLightMediaScanner();
-#else
+#ifndef HAVE_LIGHTMEDIASCANNER
+    QVariantList mediaFiles;
     QString music;
 
     for (const auto &music : QStandardPaths::standardLocations(QStandardPaths::MusicLocation)) {
         mediaFiles.append(readMusicFile(music));
     }
-#endif
 
-    QQmlApplicationEngine engine;
-    QQmlContext *context = engine.rootContext();
     context->setContextProperty("mediaFiles", mediaFiles);
-
-#if defined(HAVE_DBUS) && defined(HAVE_LIGHTMEDIASCANNER)
-    DbusService dbus_service;
-    context->setContextProperty("dbus", &dbus_service);
-    if (!dbus_service.enableLMS())
-       qWarning() << "Cannot run enableLMS";
 #endif
+
+    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);
+    }
+
     engine.load(QUrl(QStringLiteral("qrc:/MediaPlayer.qml")));
 
     return app.exec();