diff options
| author |   Scott Murray <scott.murray@konsulko.com> | 2022-09-10 12:31:13 -0400 |
|---|---|---|
| committer | Scott Murray <scott.murray@konsulko.com> | 2022-09-10 12:42:02 -0400 |
| commit | 560d902f4d2bf4ba3bb2edba6436080ee7d5a5ac (patch) | |
| tree | 026c81383374b0b7ffbb867ab392ec7789f8ff45 /mediaplayer | |
| parent | a2d991a54f77017ced1558d289bcb83d73fe2a35 (diff) | |
Add applaunchd gRPC API wrapper
Changes:
- Add applaunchd gRPC API wrapper in applauncher directory, clients
can include AppLauncherClient.h to use it.
- To facilitate generating protobuf and gRPC code with protoc,
switch from CMake to meson for building. While the code
generation can be done in CMake, it is a lot more straightforward
with meson, and if use of this library continues meson will be
easier to maintain.
Known issues:
- The behavior of the client implementation here with respect to the
server side (i.e. applaunchd) going away is currently robust, but
could stand improvement with some further investigation. As the
code stands, starting applications works when applaunchd becomes
available again, but the streaming status RPC that is tied to
window activation in the homescreen does not reconnect, and there
seem to be some things that need to be resolved with respect to
Qt object connection expiry to do so. If the Qt demos continue to
be used in a significant fashion, this may be worth picking up.
Bug-AGL: SPEC-4559
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: I5cb480d4ce4d1cb944ebfd4114fb305f09f28ea3
Diffstat (limited to 'mediaplayer')
| -rw-r--r-- | mediaplayer/CMakeLists.txt | 24 | ||||
| -rw-r--r-- | mediaplayer/MpdEventHandler.h | 1 | ||||
| -rw-r--r-- | mediaplayer/qtappfw-mediaplayer.pc.in | 12 |
3 files changed, 1 insertions, 36 deletions
diff --git a/mediaplayer/CMakeLists.txt b/mediaplayer/CMakeLists.txt deleted file mode 100644 index 35dda69..0000000 --- a/mediaplayer/CMakeLists.txt +++ /dev/null @@ -1,24 +0,0 @@ - -CONFIGURE_FILE("qtappfw-mediaplayer.pc.in" "qtappfw-mediaplayer.pc" @ONLY) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qtappfw-mediaplayer.pc - DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig) - -add_library(qtappfw-mediaplayer SHARED - mediaplayer.cpp - MediaplayerBackend.cpp - MediaplayerMpdBackend.cpp - MediaplayerBluezBackend.cpp - MpdEventHandler.cpp) - -target_include_directories(qtappfw-mediaplayer PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}") -target_include_directories(qtappfw-mediaplayer PUBLIC "${CMAKE_INSTALL_INCLUDEDIR}") - -target_link_libraries(qtappfw-mediaplayer qtappfw-bt Qt5::Qml PkgConfig::libmpdclient) -set_target_properties(qtappfw-mediaplayer PROPERTIES - VERSION ${PROJECT_VERSION} - SOVERSION 1 - PUBLIC_HEADER mediaplayer.h) - -install(TARGETS qtappfw-mediaplayer - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/qtappfw-mediaplayer) diff --git a/mediaplayer/MpdEventHandler.h b/mediaplayer/MpdEventHandler.h index d51c373..3ce888e 100644 --- a/mediaplayer/MpdEventHandler.h +++ b/mediaplayer/MpdEventHandler.h @@ -18,6 +18,7 @@ #define MPD_EVENT_HANDLER_H #include <QObject> +#include <QVariant> #include <mpd/client.h> // Use a 60s timeout on our MPD connection diff --git a/mediaplayer/qtappfw-mediaplayer.pc.in b/mediaplayer/qtappfw-mediaplayer.pc.in deleted file mode 100644 index 933e9dc..0000000 --- a/mediaplayer/qtappfw-mediaplayer.pc.in +++ /dev/null @@ -1,12 +0,0 @@ -prefix=@DEST_DIR@ -exec_prefix=${prefix} -libdir=${prefix}/lib -includedir=${prefix}/include - -Name: qtappfw-mediaplayer -Description: Library wrapping AGL AppFW mediaplayer data in Qt objects -Version: 1.0.0 - -Requires: Qt5Qml -Libs: -L${libdir} -lqtappfw-mediaplayer -Cflags: -I${includedir}/qtappfw-mediaplayer |