X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=app%2Fmain.cpp;h=d72c492e7c41983f1041237c4f17d130d59acaf7;hb=7ad9148455f925e285822e8c17d94ce94f564732;hp=63e408a3996f75f8ad0ab1fdf0c0090c08485615;hpb=059eb5b736d154e01d2a35fd27ca157d7de51a7a;p=apps%2Fmediaplayer.git

diff --git a/app/main.cpp b/app/main.cpp
index 63e408a..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,30 +25,20 @@
 #include <QtQml/QQmlContext>
 #include <QtQml/qqml.h>
 #include <QtQuickControls2/QQuickStyle>
+#include <QQuickWindow>
 
-#ifdef HAVE_LIBHOMESCREEN
-#include <libhomescreen.hpp>
-#endif
+#include <mediaplayer.h>
 
-#include "playlistwithmetadata.h"
+#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();
 
@@ -71,9 +62,11 @@ int main(int argc, char *argv[])
         query.addQueryItem(QStringLiteral("token"), secret);
         bindingAddress.setQuery(query);
         context->setContextProperty(QStringLiteral("bindingAddress"), bindingAddress);
-    }
 
-    engine.load(QUrl(QStringLiteral("qrc:/MediaPlayer.qml")));
+        context->setContextProperty("AlbumArt", "");
+        context->setContextProperty("mediaplayer", new Mediaplayer(bindingAddress, context));
 
+        engine.load(QUrl(QStringLiteral("qrc:/MediaPlayer.qml")));
+    }
     return app.exec();
 }