summaryrefslogtreecommitdiffstats
path: root/mediaplayer
diff options
context:
space:
mode:
Diffstat (limited to 'mediaplayer')
-rw-r--r--mediaplayer/CMakeLists.txt24
-rw-r--r--mediaplayer/MpdEventHandler.h1
-rw-r--r--mediaplayer/qtappfw-mediaplayer.pc.in12
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