X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=app%2Fmain.cpp;h=64f674673999b619e1cc175a0b2d99536be91a1b;hb=c0e3cb70d4c9ddd70ce9a6a74152820293b227d9;hp=63e408a3996f75f8ad0ab1fdf0c0090c08485615;hpb=059eb5b736d154e01d2a35fd27ca157d7de51a7a;p=apps%2Fmediaplayer.git diff --git a/app/main.cpp b/app/main.cpp index 63e408a..64f6746 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,22 @@ #include #include #include - -#ifdef HAVE_LIBHOMESCREEN +#include #include -#endif +#include +#include +#include -#include "playlistwithmetadata.h" +#include int main(int argc, char *argv[]) { -#ifdef HAVE_LIBHOMESCREEN - LibHomeScreen libHomeScreen; - - if (!libHomeScreen.renderAppToAreaAllowed(0, 1)) { - qWarning() << "renderAppToAreaAllowed is denied"; - return -1; - } -#endif + QString myname = QString("MediaPlayer"); QGuiApplication app(argc, argv); QQuickStyle::setStyle("AGL"); - qmlRegisterType("MediaPlayer", 1, 0, "PlaylistWithMetadata"); - QQmlApplicationEngine engine; QQmlContext *context = engine.rootContext(); @@ -71,9 +64,50 @@ 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); + } + AGLScreenInfo screenInfo(qwm->get_scale_factor()); + // 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); + }); - engine.load(QUrl(QStringLiteral("qrc:/MediaPlayer.qml"))); + // 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("mediaplayer", new Mediaplayer(bindingAddress, context)); + context->setContextProperty("radio", new Radio(bindingAddress, context)); + context->setContextProperty(QStringLiteral("screenInfo"), &screenInfo); + + engine.load(QUrl(QStringLiteral("qrc:/MediaPlayer.qml"))); + QObject *root = engine.rootObjects().first(); + QQuickWindow *window = qobject_cast(root); + QObject::connect(window, SIGNAL(frameSwapped()), qwm, SLOT(slotActivateSurface() + )); + } return app.exec(); }