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=145d9d17c925afa0458c50c37945b5623fc7cb2f;hpb=40ca9d2e2046029cb90d202ab4aff7552ec256d3;p=apps%2Fmediaplayer.git

diff --git a/app/main.cpp b/app/main.cpp
index 145d9d1..d72c492 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -26,12 +26,14 @@
 #include <QtQml/qqml.h>
 #include <QtQuickControls2/QQuickStyle>
 #include <QQuickWindow>
-#include <libhomescreen.hpp>
-#include <qlibwindowmanager.h>
+
+#include <mediaplayer.h>
+
+#include <unistd.h>
 
 int main(int argc, char *argv[])
 {
-    QString myname = QString("MediaPlayer");
+    QString graphic_role = QString("music");
 
     QGuiApplication app(argc, argv);
 
@@ -60,45 +62,11 @@ int main(int argc, char *argv[])
         query.addQueryItem(QStringLiteral("token"), secret);
         bindingAddress.setQuery(query);
         context->setContextProperty(QStringLiteral("bindingAddress"), bindingAddress);
-        std::string token = secret.toStdString();
-        LibHomeScreen* hs = new LibHomeScreen();
-        QLibWindowmanager* qwm = new QLibWindowmanager();
-
-        // WindowManager
-        if(qwm->init(port,secret) != 0){
-            exit(EXIT_FAILURE);
-        }
-        // Request a surface as described in layers.json windowmanager’s file
-        if (qwm->requestSurface(myname) != 0) {
-            exit(EXIT_FAILURE);
-        }
-        // Create an event callback against an event type. Here a lambda is called when SyncDraw event occurs
-        qwm->set_event_handler(QLibWindowmanager::Event_SyncDraw, [qwm, myname](json_object *object) {
-            fprintf(stderr, "Surface got syncDraw!\n");
-            qwm->endDraw(myname);
-        });
 
-        // HomeScreen
-        hs->init(port, token.c_str());
-        // Set the event handler for Event_TapShortcut which will activate the surface for windowmanager
-        hs->set_event_handler(LibHomeScreen::Event_TapShortcut, [qwm, myname](json_object *object){
-            json_object *appnameJ = nullptr;
-            if(json_object_object_get_ex(object, "application_name", &appnameJ))
-            {
-                const char *appname = json_object_get_string(appnameJ);
-                if(myname == appname)
-                {
-                    qDebug("Surface %s got tapShortcut\n", appname);
-                    qwm->activateSurface(myname);
-                }
-            }
-        });
+        context->setContextProperty("AlbumArt", "");
+        context->setContextProperty("mediaplayer", new Mediaplayer(bindingAddress, context));
 
         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()
-        ));
     }
     return app.exec();
 }