Adopt window manager feature to get rendering right

[apps/mediaplayer.git] / app / main.cpp

diff --git a/app/main.cpp b/app/main.cpp
index 63e408a..4b966d5 100644 (file)
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2016 The Qt Company Ltd.
+ * Copyright (C) 2016, 2017 Toyota Motor Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,29 +26,18 @@
 #include <QtQml/qqml.h>
 #include <QtQuickControls2/QQuickStyle>
 
-#ifdef HAVE_LIBHOMESCREEN
-#include <libhomescreen.hpp>
-#endif
+#include <QQuickWindow>
+#include "qlibwindowmanager.h"
 
-#include "playlistwithmetadata.h"
+static QLibWindowmanager* qwm;
+static std::string myname = std::string("MediaPlayer");
 
 int main(int argc, char *argv[])
 {
-#ifdef HAVE_LIBHOMESCREEN
-    LibHomeScreen libHomeScreen;
-
-    if (!libHomeScreen.renderAppToAreaAllowed(0, 1)) {
-        qWarning() << "renderAppToAreaAllowed is denied";
-        return -1;
-    }
-#endif
-
     QGuiApplication app(argc, argv);
 
     QQuickStyle::setStyle("AGL");
 
-    qmlRegisterType<PlaylistWithMetadata>("MediaPlayer", 1, 0, "PlaylistWithMetadata");
-
     QQmlApplicationEngine engine;
     QQmlContext *context = engine.rootContext();
 
@@ -71,9 +61,28 @@ int main(int argc, char *argv[])
         query.addQueryItem(QStringLiteral("token"), secret);
         bindingAddress.setQuery(query);
         context->setContextProperty(QStringLiteral("bindingAddress"), bindingAddress);
+         qwm = new QLibWindowmanager();
+        // WindowManager
+        if(qwm->init(port,secret) != 0){
+            exit(EXIT_FAILURE);
+        }
+        if (qwm->requestSurface(myname.c_str()) != 0) {
+            exit(EXIT_FAILURE);
+        }
+        qwm->set_event_handler(QLibWindowmanager::Event_SyncDraw, [qwm](json_object *object) {
+            fprintf(stderr, "Surface got syncDraw!\n");
+            qwm->endDraw(myname.c_str());
+            });
+        qwm->set_event_handler(QLibWindowmanager::Event_FlushDraw, [](json_object *object) {
+            fprintf(stderr, "Surface got flushDraw!\n");;
+            });
     }
 
     engine.load(QUrl(QStringLiteral("qrc:/MediaPlayer.qml")));
+        QObject *root = engine.rootObjects().first();
+        QQuickWindow *window = qobject_cast<QQuickWindow *>(root);
+        QObject::connect(window, SIGNAL(frameSwapped()),
+            qwm, SLOT(slotActivateSurface()));  // This should be disconnected, but when...
 
     return app.exec();
 }