diff options
| author |   Kazumasa Mitsunari <knimitz@witz-inc.co.jp> | 2017-11-13 11:15:32 +0900 |
|---|---|---|
| committer | Kazumasa Mitsunari <knimitz@witz-inc.co.jp> | 2017-11-13 11:15:32 +0900 |
| commit | 17bf0eb61fb73d94f43a1fb79a3cb3867b9421a4 (patch) | |
| tree | 5eb637d88c7cb8edbdb91b28f9266500ebbf9bcb | |
| parent | eb92236c8e83f09f68e8ddb484697070dc040874 (diff) | |
Link to qlibhomescreen
Change-Id: Idd9aca14ed99eb5100e42cb30a2f7aa4b2e4eb89
Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
| -rw-r--r-- | app/app.pro | 2 | ||||
| -rw-r--r-- | app/main.cpp | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/app/app.pro b/app/app.pro index 367fc78..a432b80 100644 --- a/app/app.pro +++ b/app/app.pro @@ -5,7 +5,7 @@ HEADERS = PresetDataObject.h qlibsoundmanager.h SOURCES = main.cpp PresetDataObject.cpp qlibsoundmanager.cpp CONFIG += link_pkgconfig -PKGCONFIG += libsoundmanager qlibwindowmanager libhomescreen +PKGCONFIG += libsoundmanager qlibwindowmanager qlibhomescreen RESOURCES += \ radio.qrc \ diff --git a/app/main.cpp b/app/main.cpp index e7e4ab0..c7c3290 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -26,11 +26,11 @@ #include <QtQuickControls2/QQuickStyle> #include <QQuickWindow> #include "PresetDataObject.h" -#include <libhomescreen.hpp> +#include <qlibhomescreen.h> #include <qlibwindowmanager.h> #include "qlibsoundmanager.h" -static LibHomeScreen* hs; +static QLibHomeScreen* hs; static QLibWindowmanager* qwm; static QLibSoundmanager* smw; static QString myname = QString("Radio"); @@ -96,7 +96,7 @@ int main(int argc, char *argv[]) std::string token = secret.toStdString(); - hs = new LibHomeScreen(); + hs = new QLibHomeScreen(); qwm = new QLibWindowmanager(); smw = new QLibSoundmanager(); @@ -119,8 +119,8 @@ int main(int argc, char *argv[]) }); // HomeScreen - hs->init(port, token.c_str()); - hs->set_event_handler(LibHomeScreen::Event_TapShortcut, [qwm](json_object *object){ + hs->init(port, secret); + hs->set_event_handler(QLibHomeScreen::Event_TapShortcut, [qwm](json_object *object){ const char *appname = json_object_get_string( json_object_object_get(object, "application_name")); if(myname == appname) |