X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=app%2Fmain.cpp;h=64f674673999b619e1cc175a0b2d99536be91a1b;hb=c0e3cb70d4c9ddd70ce9a6a74152820293b227d9;hp=a1cd02ec90ddb1376f520d40087d746167a49cbb;hpb=47dfb73f5b84fe5baa7db557b57c274eed298081;p=apps%2Fmediaplayer.git

diff --git a/app/main.cpp b/app/main.cpp
index a1cd02e..64f6746 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -28,8 +28,8 @@
 #include <QQuickWindow>
 #include <libhomescreen.hpp>
 #include <qlibwindowmanager.h>
-#include <bluetooth.h>
 #include <mediaplayer.h>
+#include <radio.h>
 
 #include <unistd.h>
 
@@ -87,16 +87,22 @@ int main(int argc, char *argv[])
         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){
-            qDebug("Surface %s got tapShortcut\n", myname.toStdString().c_str());
-            qwm->activateSurface(myname);
+            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("bluetooth_connection", new Bluetooth(bindingAddress));
+        context->setContextProperty("radio", new Radio(bindingAddress, context));
         context->setContextProperty(QStringLiteral("screenInfo"), &screenInfo);
 
-        usleep(300000);
-
         engine.load(QUrl(QStringLiteral("qrc:/MediaPlayer.qml")));
         QObject *root = engine.rootObjects().first();
         QQuickWindow *window = qobject_cast<QQuickWindow *>(root);