X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=app%2Fmain.cpp;fp=app%2Fmain.cpp;h=e8d4082f354b6db2c3a2c6b01c6933345b5eb148;hb=4eee2655560fbb2f7724095bb7fa488f3f39ba55;hp=74ebad35ff2b237318fcaeb5020960bd2b0887f9;hpb=86affe07b3ec456c8c43651a7d009508dd64491a;p=apps%2Fmediaplayer.git

diff --git a/app/main.cpp b/app/main.cpp
index 74ebad3..e8d4082 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -31,6 +31,10 @@
 #include "lightmediascanner.h"
 #endif
 
+#ifdef HAVE_DBUS
+#include "dbus.h"
+#endif
+
 #include "playlistwithmetadata.h"
 
 #ifndef HAVE_LIGHTMEDIASCANNER
@@ -68,18 +72,12 @@ int main(int argc, char *argv[])
     qmlRegisterType<PlaylistWithMetadata>("MediaPlayer", 1, 0, "PlaylistWithMetadata");
 
     QVariantList mediaFiles;
-    QString music;
 
 #ifdef HAVE_LIGHTMEDIASCANNER
-    LightMediaScanner scanner(QDir::homePath() + "/.config/lightmediascannerd/db.sqlite3");
-    while (scanner.next(music)) {
-        QFileInfo fileInfo(music);
-        // Possible for stale entries due to removable media
-        if (!fileInfo.exists())
-            continue;
-        mediaFiles.append(QUrl::fromLocalFile(music));
-    }
+    mediaFiles = LightMediaScanner::processLightMediaScanner();
 #else
+    QString music;
+
     for (const auto &music : QStandardPaths::standardLocations(QStandardPaths::MusicLocation)) {
         mediaFiles.append(readMusicFile(music));
     }
@@ -88,8 +86,14 @@ int main(int argc, char *argv[])
     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
     engine.load(QUrl(QStringLiteral("qrc:/MediaPlayer.qml")));
 
     return app.exec();
 }
-