Cutify

CMakeLists.txt

@@ -32,8 +32,9 @@ if (NOT DEFINED UBUNTU_MEDIA_HUB_VERSION_MAJOR)
   endif()
 endif()
 
+set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -fPIC -pthread")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -fno-strict-aliasing -Wextra -fPIC -pthread")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fno-strict-aliasing -Wextra -fPIC -pthread")
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 
@@ -48,11 +49,11 @@ include(GNUInstallDirs)
 find_package(PkgConfig)
 find_package(Boost COMPONENTS filesystem log system thread program_options REQUIRED)
 find_package(GLog)
+find_package(Qt5Core REQUIRED)
+find_package(Qt5DBus REQUIRED)
 pkg_check_modules(DBUS dbus-1 REQUIRED)
 pkg_check_modules(DBUS_CPP dbus-cpp REQUIRED)
-pkg_check_modules(PROCESS_CPP process-cpp REQUIRED)
 pkg_check_modules(PROPERTIES_CPP properties-cpp REQUIRED)
-pkg_check_modules(PROCESS_CPP process-cpp REQUIRED)
 pkg_check_modules(GIO gio-2.0 REQUIRED)
 pkg_check_modules(HYBRIS_MEDIA libmedia REQUIRED)
 pkg_check_modules(EGL egl REQUIRED)
@@ -78,15 +79,8 @@ if (DISABLE_ERROR_ON_LOCAL_TYPEDEFS_WARNINGS)
     SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=unused-local-typedefs")
 endif (DISABLE_ERROR_ON_LOCAL_TYPEDEFS_WARNINGS)
 
-include_directories(
-  ${Boost_INCLUDE_DIRS}
-  ${DBUS_INCLUDE_DIRS}
-  ${DBUS_CPP_INCLUDE_DIRS}
-  ${GLog_INCLUDE_DIR}
-  ${PROCESS_CPP_INCLUDE_DIRS}
-  ${PROPERTIES_CPP_INCLUDE_DIRS}
-
-  include/
+add_definitions(
+  -DQT_NO_KEYWORDS
 )
 
 add_subdirectory(include)

debian/control

@@ -3,13 +3,12 @@ Priority: optional
 Section: libs
 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 Build-Depends: cmake,
-               dbus-test-runner <!nocheck>,
                debhelper (>= 9),
                dh-apparmor,
                doxygen <!nodoc>,
-               google-mock <!nocheck>,
                graphviz <!nodoc>,
                gstreamer1.0-plugins-good,
+               libapparmor-dev,
                libboost-dev (>=1.53),
                libboost-filesystem-dev (>=1.53),
                libboost-log-dev (>=1.53),
@@ -19,17 +18,21 @@ Build-Depends: cmake,
                libdbus-cpp-dev (>= 4.3.0),
                libgoogle-glog-dev,
                libhybris-dev (>=0.1.0+git20131207+e452e83-0ubuntu30),
-               libprocess-cpp-dev,
                libproperties-cpp-dev,
                libgstreamer1.0-dev,
                libgstreamer-plugins-base1.0-dev,
                lsb-release,
                pkg-config,
                libpulse-dev,
+               libpulse-mainloop-glib0,
                qtbase5-dev,
                libtelepathy-qt5-dev,
                libegl1-mesa-dev,
                libgl1-mesa-dev,
+               python3-dbus <!nocheck>,
+               python3-dbusmock <!nocheck>,
+               python3-gi <!nocheck>,
+               python3-pytest <!nocheck>,
 Standards-Version: 3.9.6
 Homepage: https://launchpad.net/media-hub
 # If you aren't a member of ~phablet-team but need to upload packaging changes,

debian/rules

@@ -20,6 +20,10 @@ major=$(shell echo $(full_version) | cut -d'.' -f1)
 minor=$(shell echo $(full_version) | cut -d'.' -f2)
 patch=$(shell echo $(full_version) | cut -d'.' -f3)
 
+ifneq (,$(findstring coverage,$(DEB_BUILD_OPTIONS)))
+CONFIGURE_FLAGS += -DCMAKE_BUILD_TYPE=Coverage
+endif
+
 ifneq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 CONFIGURE_FLAGS += -DENABLE_TESTS=OFF
 endif

src/core/media/CMakeLists.txt

@@ -1,6 +1,7 @@
 pkg_check_modules(PC_GSTREAMER_1_0 REQUIRED gstreamer-1.0)
 pkg_check_modules(PC_GSTREAMER_PBUTILS_1_0 REQUIRED gstreamer-pbutils-1.0)
-pkg_check_modules(PC_PULSE_AUDIO REQUIRED libpulse)
+pkg_check_modules(PC_PULSE_AUDIO REQUIRED libpulse libpulse-mainloop-glib)
+pkg_check_modules(APPARMOR REQUIRED libapparmor)
 include_directories(${PC_GSTREAMER_1_0_INCLUDE_DIRS} ${HYBRIS_MEDIA_CFLAGS} ${PC_PULSE_AUDIO_INCLUDE_DIRS})
 
 # We compile with all symbols visible by default. For the shipping library, we strip
@@ -12,6 +13,9 @@ file(GLOB MPRIS_HEADERS mpris/*.h)
 
 message(STATUS ${MEDIA_HUB_HEADERS})
 
+SET (CMAKE_INCLUDE_CURRENT_DIR ON)
+SET (CMAKE_AUTOMOC ON)
+
 add_subdirectory(telephony)
 
 add_library(
@@ -29,7 +33,20 @@ target_link_libraries(
   ${DBUS_LIBRARIES}
   ${DBUS_CPP_LDFLAGS}
   ${PC_GSTREAMER_1_0_LIBRARIES}
+  Qt5::Core
+)
+
+target_include_directories(media-hub-common PUBLIC
+  ${Boost_INCLUDE_DIRS}
+  ${DBUS_INCLUDE_DIRS}
+  ${DBUS_CPP_INCLUDE_DIRS}
+  ${GLog_INCLUDE_DIR}
+  ${PROCESS_CPP_INCLUDE_DIRS}
+  ${PROPERTIES_CPP_INCLUDE_DIRS}
+
+  ${PROJECT_SOURCE_DIR}/include/
 )
+
 set_target_properties(
   media-hub-common
 
@@ -62,6 +79,11 @@ add_library(
   video/platform_default_sink.cpp
 )
 
+target_include_directories(media-hub-client PUBLIC
+  ${PROJECT_SOURCE_DIR}/include/
+  ${PROJECT_SOURCE_DIR}/src/
+)
+
 set_target_properties(
   media-hub-client
 
@@ -96,18 +118,15 @@ install(
 add_library(
   media-hub-service
 
-  ${MEDIA_HUB_HEADERS}
-  ${MPRIS_HEADERS}
+  logging.cpp
 
-  logger/logger.cpp
+  dbus_property_notifier.cpp
 
   client_death_observer.cpp
-  hashed_keyed_player_store.cpp
+  dbus_client_death_observer.cpp
   hybris_client_death_observer.cpp
-  stub_client_death_observer.cpp
-  cover_art_resolver.cpp
   engine.cpp
-  metadata.cpp
+  track_metadata.cpp
 
   apparmor/context.cpp
   apparmor/ubuntu.cpp
@@ -126,6 +145,8 @@ add_library(
   gstreamer/engine.cpp
   gstreamer/playbin.cpp
 
+  mpris/media_player2.cpp
+
   player_skeleton.cpp
   player_implementation.cpp
   service_skeleton.cpp
@@ -137,23 +158,23 @@ add_library(
 target_link_libraries(
   media-hub-service
 
-  media-hub-client
-  media-hub-common
   call-monitor
-  ${Boost_LDFLAGS}
-  ${Boost_LIBRARIES}
-  ${DBUS_LIBRARIES}
-  ${DBUS_CPP_LDFLAGS}
-  ${GLog_LIBRARY}
+  ${APPARMOR_LIBRARIES}
   ${PC_GSTREAMER_1_0_LIBRARIES}
   ${PC_GSTREAMER_PBUTILS_1_0_LIBRARIES}
-  ${PROCESS_CPP_LDFLAGS}
   ${GIO_LIBRARIES}
   ${HYBRIS_MEDIA_LIBRARIES}
   ${PC_PULSE_AUDIO_LIBRARIES}
+  Qt5::Core
+  Qt5::DBus
 )
 
-include_directories(${PROJECT_SOURCE_DIR}/src/ ${HYBRIS_MEDIA_CFLAGS} ${PC_GSTREAMER_1_0_INCLUDE_DIRS})
+target_include_directories(media-hub-service PRIVATE
+  ${PROJECT_SOURCE_DIR}/src/
+  ${APPARMOR_INCLUDE_DIRS}
+  ${HYBRIS_MEDIA_CFLAGS}
+  ${PC_GSTREAMER_1_0_INCLUDE_DIRS}
+)
 
 add_executable(
   media-hub-server
@@ -166,16 +187,19 @@ target_link_libraries(
   media-hub-server
 
   media-hub-service
-  media-hub-client
   call-monitor
 
-  ${DBUS_LIBRARIES}
-  ${DBUS_CPP_LDFLAGS}
-  ${GLog_LIBRARY}
   ${PC_GSTREAMER_1_0_LIBRARIES}
   ${HYBRIS_MEDIA_LIBRARIES}
 )
 
+target_include_directories(media-hub-server PRIVATE
+  ${PROJECT_SOURCE_DIR}/src/
+)
+
+enable_coverage_report(
+    TARGETS media-hub-server media-hub-service)
+
 install(
   TARGETS media-hub-server
   DESTINATION ${CMAKE_INSTALL_BINDIR}

src/core/media/apparmor/context.cpp

@@ -20,15 +20,15 @@
 
 namespace apparmor = core::ubuntu::media::apparmor;
 
-apparmor::Context::Context(const std::string& name) : name{name}
+apparmor::Context::Context(const QString &name) : name{name}
 {
-    if (name.empty()) throw std::runtime_error
+    if (name.isEmpty()) throw std::runtime_error
     {
         "apparmor::Context cannot be created for empty name."
     };
 }
 
-const std::string& apparmor::Context::str() const
+const QString &apparmor::Context::str() const
 {
     return name;
 }

src/core/media/apparmor/context.h

@@ -18,8 +18,7 @@
 #ifndef CORE_UBUNTU_MEDIA_APPARMOR_AUTHENTICATOR_H_
 #define CORE_UBUNTU_MEDIA_APPARMOR_AUTHENTICATOR_H_
 
-#include <memory>
-#include <string>
+#include <QString>
 
 namespace core
 {
@@ -36,13 +35,13 @@ class Context
 public:
     // Constructs a new Context instance for the given raw name.
     // Throws std::logic_error for empty names.
-    explicit Context(const std::string& name);
+    explicit Context(const QString &name);
     virtual ~Context() = default;
     // Returns the raw string describing the context.
-    const std::string& str() const;
+    const QString &str() const;
 
 private:
-    const std::string name;
+    const QString name;
 };
 }
 }