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

diff --git a/app/main.cpp b/app/main.cpp
index a5bab67..d72c492 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2016 The Qt Company Ltd.
+ * Copyright (C) 2017 Konsulko Group
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,65 +25,23 @@
 #include <QtQml/QQmlContext>
 #include <QtQml/qqml.h>
 #include <QtQuickControls2/QQuickStyle>
+#include <QQuickWindow>
 
-#ifdef HAVE_LIBHOMESCREEN
-#include <libhomescreen.hpp>
-#endif
+#include <mediaplayer.h>
 
-#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
+#include <unistd.h>
 
 int main(int argc, char *argv[])
 {
-#ifdef HAVE_LIBHOMESCREEN
-    LibHomeScreen libHomeScreen;
-
-    if (!libHomeScreen.renderAppToAreaAllowed(0, 1)) {
-        qWarning() << "renderAppToAreaAllowed is denied";
-        return -1;
-    }
-#endif
+    QString graphic_role = QString("music");
 
     QGuiApplication app(argc, argv);
 
     QQuickStyle::setStyle("AGL");
 
-    qmlRegisterType<PlaylistWithMetadata>("MediaPlayer", 1, 0, "PlaylistWithMetadata");
-
     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"));
@@ -103,19 +62,11 @@ int main(int argc, char *argv[])
         query.addQueryItem(QStringLiteral("token"), secret);
         bindingAddress.setQuery(query);
         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
+        context->setContextProperty("AlbumArt", "");
+        context->setContextProperty("mediaplayer", new Mediaplayer(bindingAddress, context));
 
+        engine.load(QUrl(QStringLiteral("qrc:/MediaPlayer.qml")));
+    }
     return app.exec();
 }