X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=app%2Fmain.cpp;fp=app%2Fmain.cpp;h=74ebad35ff2b237318fcaeb5020960bd2b0887f9;hb=b6fd2f54b570fd98ad8a716e886d7d35d132465c;hp=12654ada8fe0a1d6e0bdfd61e839f27ba32d4075;hpb=343b678105e68faf8c89a15f1a77a6c1d9b78600;p=apps%2Fmediaplayer.git

diff --git a/app/main.cpp b/app/main.cpp
index 12654ad..74ebad3 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -27,8 +27,13 @@
 #include <libhomescreen.hpp>
 #endif
 
+#ifdef HAVE_LIGHTMEDIASCANNER
+#include "lightmediascanner.h"
+#endif
+
 #include "playlistwithmetadata.h"
 
+#ifndef HAVE_LIGHTMEDIASCANNER
 QVariantList readMusicFile(const QString &path)
 {
     QVariantList ret;
@@ -43,6 +48,7 @@ QVariantList readMusicFile(const QString &path)
     }
     return ret;
 }
+#endif
 
 int main(int argc, char *argv[])
 {
@@ -62,9 +68,22 @@ 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));
+    }
+#else
     for (const auto &music : QStandardPaths::standardLocations(QStandardPaths::MusicLocation)) {
         mediaFiles.append(readMusicFile(music));
     }
+#endif
 
     QQmlApplicationEngine engine;
     QQmlContext *context = engine.rootContext();