11 files changed, 51 insertions(+), 41 deletions(-)

M module-apps/application-alarm-clock/widgets/AlarmOptionsItem.cpp
M module-services/service-appmgr/model/ApplicationManager.cpp
M module-services/service-audio/AudioServiceAPI.cpp
M module-services/service-audio/CMakeLists.txt
M module-services/service-audio/ServiceAudio.cpp
R module-services/service-audio/{ => include}/service-audio/AudioMessage.hpp
R module-services/service-audio/{ => include}/service-audio/AudioServiceAPI.hpp
R module-services/service-audio/{ => include}/service-audio/ServiceAudio.hpp
M module-services/service-db/test/CMakeLists.txt
M products/BellHybrid/CMakeLists.txt
M products/PurePhone/CMakeLists.txt

@@ 6,7 6,7 @@
 #include <InputEvent.hpp>
 #include <Style.hpp>
 #include <Utils.hpp>
-#include <module-services/service-audio/service-audio/AudioServiceAPI.hpp>
+#include <service-audio/AudioServiceAPI.hpp>
 #include <purefs/filesystem_paths.hpp>
 
 namespace gui

@@ 27,7 27,7 @@
 #include <i18n/i18n.hpp>
 #include <log/log.hpp>
 #include <module-db/queries/notifications/QueryNotificationsGetAll.hpp>
-#include <module-services/service-audio/service-audio/AudioMessage.hpp>
+#include <service-audio/AudioMessage.hpp>
 #include <module-services/service-db/agents/settings/SystemSettings.hpp>
 #include <module-sys/Timers/TimerFactory.hpp>
 #include <module-utils/Utils.hpp>

@@ 1,13 1,13 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include "service-audio/AudioServiceAPI.hpp"
-#include "service-audio/ServiceAudio.hpp"
-#include "service-audio/AudioMessage.hpp"
+#include <AudioMessage.hpp>
+#include <AudioServiceAPI.hpp>
+#include <ServiceAudio.hpp>
 
 #include <Audio/decoder/Decoder.hpp>
-#include <Service/Common.hpp>
 #include <log.hpp>
+#include <Service/Common.hpp>
 
 #include <utility>
 

@@ 1,27 1,37 @@
-project(service-audio)
-message( "${PROJECT_NAME}  ${CMAKE_CURRENT_LIST_DIR}" )
+# Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+# For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
+add_library(service-audio STATIC)
 
-set(SOURCES
-    ServiceAudio.cpp
-    AudioServiceAPI.cpp
+target_include_directories(service-audio
+    PRIVATE
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/service-audio>
+    PUBLIC
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
 )
 
-add_library(${PROJECT_NAME} STATIC ${SOURCES})
-
-target_link_libraries(${PROJECT_NAME}
-    service-appmgr
-    service-bluetooth
-    service-db
-    module-bluetooth
-    module-audio
-    module-utils
-    module-services
+target_sources(service-audio
+    PRIVATE
+        AudioServiceAPI.cpp
+        ServiceAudio.cpp
+    PUBLIC
+        include/service-audio/AudioMessage.hpp
+        include/service-audio/AudioServiceAPI.hpp
+        include/service-audio/ServiceAudio.hpp
 )
 
-
-target_include_directories(${PROJECT_NAME}
+target_link_libraries(service-audio
+    PRIVATE
+        log
+        module-bluetooth
+        module-utils
+        service-bluetooth
+        service-evtmgr
     PUBLIC
-       ${CMAKE_CURRENT_LIST_DIR}
+        apps-common
+        messagetype
+        module-audio
+        module-sys
+        service-appmgr
+        service-db
 )
-

@@ 1,21 1,22 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include "service-audio/AudioMessage.hpp"
-#include "service-audio/ServiceAudio.hpp"
+#include <AudioMessage.hpp>
+#include <ServiceAudio.hpp>
 
 #include <Audio/Operation/IdleOperation.hpp>
 #include <Audio/Operation/PlaybackOperation.hpp>
 #include <Bluetooth/audio/BluetoothAudioDevice.hpp>
 #include <module-audio/Audio/VolumeScaler.hpp>
 #include <module-sys/SystemManager/messages/SentinelRegistrationMessage.hpp>
-#include <service-bluetooth/Constants.hpp>
-#include <service-bluetooth/ServiceBluetoothCommon.hpp>
 #include <service-bluetooth/BluetoothMessage.hpp>
+#include <service-bluetooth/Constants.hpp>
 #include <service-bluetooth/messages/AudioRouting.hpp>
 #include <service-bluetooth/messages/Ring.hpp>
+#include <service-bluetooth/ServiceBluetoothCommon.hpp>
 #include <service-db/Settings.hpp>
 #include <service-evtmgr/EventManagerServiceAPI.hpp>
+#include <Utils.hpp>
 
 #include <algorithm>
 #include <initializer_list>

@@ 3,13 3,12 @@
 
 #pragma once
 
+#include <apps-common/popups/data/PopupRequestParams.hpp>
 #include <Audio/AudioCommon.hpp>
 #include <Audio/decoder/Decoder.hpp>
 #include <MessageType.hpp>
-#include <service-appmgr/messages/ActionRequest.hpp>
 #include <service-appmgr/Actions.hpp>
-#include <apps-common/popups/data/PopupRequestParams.hpp>
-
+#include <service-appmgr/messages/ActionRequest.hpp>
 #include <Service/Message.hpp>
 
 #include <memory>

@@ 6,8 6,8 @@
 #include "AudioMessage.hpp"
 
 #include <Audio/AudioCommon.hpp>
-#include <Audio/Profiles/Profile.hpp>
 #include <Audio/decoder/Decoder.hpp>
+#include <Audio/Profiles/Profile.hpp>
 
 #include <memory>
 #include <optional>

@@ 7,14 7,11 @@
 
 #include <Audio/Audio.hpp>
 #include <Audio/AudioMux.hpp>
-
 #include <MessageType.hpp>
-#include <Service/Service.hpp>
-#include <Utils.hpp>
-
 #include <service-db/DBServiceAPI.hpp>
 #include <service-db/DBServiceName.hpp>
 #include <service-db/QueryMessage.hpp>
+#include <Service/Service.hpp>
 
 #include <functional>
 

@@ 10,13 10,14 @@ add_catch2_executable(
             test-service-db-quotes.cpp
             test-factory-settings.cpp
         LIBS
+            iosyscalls
+            module-audio
+            module-cellular
             module-sys
-            service-audio
+            module-utils
             module-vfs
-            module-audio
+            service-audio
             service-cellular
-            module-cellular
-            iosyscalls
         DEPS
             PurePhone-disk-img
 )

@@ 54,6 54,7 @@ target_link_libraries(BellHybrid
         module-apps
         module-bsp
         module-vfs
+        service-audio
         service-bluetooth
         service-desktop
         service-lwip

@@ 64,6 64,7 @@ target_link_libraries(PurePhone
         module-apps
         module-bsp
         module-vfs
+        service-audio
         service-bluetooth
         service-desktop
         service-lwip