X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=app%2Fmain.cpp;h=63e408a3996f75f8ad0ab1fdf0c0090c08485615;hb=refs%2Ftags%2Feel_4.99.1;hp=a5bab677f092a0055c397d30d8fb188a793354ca;hpb=f3ddc376291262a6b305cc2b0a52792abdc7c85c;p=apps%2Fmediaplayer.git

diff --git a/app/main.cpp b/app/main.cpp
index a5bab67..63e408a 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -29,29 +29,8 @@
 #include <libhomescreen.hpp>
 #endif
 
-#ifdef HAVE_DBUS
-#include "dbus.h"
-#endif
-
 #include "playlistwithmetadata.h"
 
-#ifndef HAVE_LIGHTMEDIASCANNER
-QVariantList readMusicFile(const QString &path)
-{
-    QVariantList ret;
-    QDir dir(path);
-    for (const auto &entry : dir.entryList(QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot, QDir::Name)) {
-        QFileInfo fileInfo(dir.absoluteFilePath(entry));
-        if (fileInfo.isDir()) {
-            ret.append(readMusicFile(fileInfo.absoluteFilePath()));
-        } else if (fileInfo.isFile()) {
-            ret.append(QUrl::fromLocalFile(fileInfo.absoluteFilePath()));
-        }
-    }
-    return ret;
-}
-#endif
-
 int main(int argc, char *argv[])
 {
 #ifdef HAVE_LIBHOMESCREEN
@@ -72,17 +51,6 @@ int main(int argc, char *argv[])
     QQmlApplicationEngine engine;
     QQmlContext *context = engine.rootContext();
 
-#ifndef HAVE_LIGHTMEDIASCANNER
-    QVariantList mediaFiles;
-    QString music;
-
-    for (const auto &music : QStandardPaths::standardLocations(QStandardPaths::MusicLocation)) {
-        mediaFiles.append(readMusicFile(music));
-    }
-
-    context->setContextProperty("mediaFiles", mediaFiles);
-#endif
-
     QCommandLineParser parser;
     parser.addPositionalArgument("port", app.translate("main", "port for binding"));
     parser.addPositionalArgument("secret", app.translate("main", "secret for binding"));
@@ -105,17 +73,7 @@ int main(int argc, char *argv[])
         context->setContextProperty(QStringLiteral("bindingAddress"), bindingAddress);
     }
 
-#if defined(HAVE_DBUS)
-    DbusService dbus_service;
-    context->setContextProperty("dbus", &dbus_service);
-#endif
-
     engine.load(QUrl(QStringLiteral("qrc:/MediaPlayer.qml")));
 
-#if defined(HAVE_DBUS)
-    if (!dbus_service.enableBluetooth())
-       qWarning() << "Cannot run enableBluetooth";
-#endif
-
     return app.exec();
 }