X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=app%2Fmain.cpp;h=dd84f59693d115c220b36b3bcd30c3bd45f12f19;hb=ba7c74937dfbe12ab2ef2419c934a3fc6b51c711;hp=12654ada8fe0a1d6e0bdfd61e839f27ba32d4075;hpb=9daba1c3bc1cb1ae68486a7aa34f734e54748403;p=apps%2Fmediaplayer.git

diff --git a/app/main.cpp b/app/main.cpp
index 12654ad..dd84f59 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -27,8 +27,17 @@
 #include <libhomescreen.hpp>
 #endif
 
+#ifdef HAVE_LIGHTMEDIASCANNER
+#include "lightmediascanner.h"
+#endif
+
+#ifdef HAVE_DBUS
+#include "dbus.h"
+#endif
+
 #include "playlistwithmetadata.h"
 
+#ifndef HAVE_LIGHTMEDIASCANNER
 QVariantList readMusicFile(const QString &path)
 {
     QVariantList ret;
@@ -43,6 +52,7 @@ QVariantList readMusicFile(const QString &path)
     }
     return ret;
 }
+#endif
 
 int main(int argc, char *argv[])
 {
@@ -62,15 +72,32 @@ int main(int argc, char *argv[])
     qmlRegisterType<PlaylistWithMetadata>("MediaPlayer", 1, 0, "PlaylistWithMetadata");
 
     QVariantList mediaFiles;
+
+#ifdef HAVE_LIGHTMEDIASCANNER
+    mediaFiles = LightMediaScanner::processLightMediaScanner();
+#else
+    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)
+    DbusService dbus_service;
+    context->setContextProperty("dbus", &dbus_service);
+#if defined(HAVE_LIGHTMEDIASCANNER)
+    if (!dbus_service.enableLMS())
+       qWarning() << "Cannot run enableLMS";
+#endif
+    if (!dbus_service.enableBluetooth())
+       qWarning() << "Cannot run enableBluetooth";
+#endif
     engine.load(QUrl(QStringLiteral("qrc:/MediaPlayer.qml")));
 
     return app.exec();
 }
-