From 4bdfb00de7c148ef00ecfed9748e449f57cc18a9 Mon Sep 17 00:00:00 2001
From: Radoslaw Wicik <radoslaw@wicik.pl>
Date: Fri, 6 Nov 2020 17:00:25 +0100
Subject: [PATCH] [EGD-4214] Convert service audio to library

---
 module-apps/Application.cpp                   | 48 +++++++++++++++++++
 module-apps/Application.hpp                   | 45 ++---------------
 module-apps/CMakeLists.txt                    |  1 +
 .../application-call/ApplicationCall.cpp      |  4 +-
 module-apps/application-call/CMakeLists.txt   |  7 ++-
 .../application-call/windows/CallWindow.cpp   |  4 +-
 .../application-meditation/CMakeLists.txt     |  7 ++-
 .../widgets/MeditationTimer.cpp               |  3 +-
 .../windows/MeditationTimerWindow.hpp         |  4 +-
 .../ApplicationMusicPlayer.cpp                |  5 +-
 .../ApplicationMusicPlayer.hpp                |  3 +-
 .../application-music-player/CMakeLists.txt   |  7 ++-
 .../models/SongsModel.cpp                     |  4 +-
 .../models/SongsModel.hpp                     |  3 +-
 .../windows/MusicPlayerAllSongsWindow.cpp     |  4 +-
 .../windows/MusicPlayerEmptyWindow.cpp        |  4 +-
 .../windows/QuotesMainWindow.hpp              |  4 +-
 module-apps/windows/AppWindow.cpp             |  4 +-
 module-apps/windows/AppWindow.hpp             |  3 +-
 .../interface/profiles/A2DP/A2DP.cpp          |  4 +-
 .../Bluetooth/interface/profiles/HSP/HSP.cpp  |  4 +-
 .../Bluetooth/interface/profiles/HSP/SCO.cpp  |  4 +-
 module-bluetooth/CMakeLists.txt               |  3 +-
 .../service-antenna/CMakeLists.txt            |  7 +--
 module-services/service-appmgr/CMakeLists.txt |  5 +-
 .../{api => }/AudioServiceAPI.cpp             | 18 +++----
 module-services/service-audio/CMakeLists.txt  | 35 +++++++-------
 .../service-audio/ServiceAudio.cpp            | 12 ++---
 .../AudioMessage.hpp                          | 11 +++--
 .../AudioServiceAPI.hpp                       | 19 ++++----
 .../{ => service-audio}/ServiceAudio.hpp      | 21 ++++----
 .../service-cellular/CMakeLists.txt           |  1 +
 .../service-cellular/ServiceCellular.cpp      |  2 +-
 module-services/service-evtmgr/CMakeLists.txt |  6 ++-
 .../service-evtmgr/EventManager.cpp           |  6 +--
 .../service-evtmgr/WorkerEvent.cpp            |  2 +-
 36 files changed, 184 insertions(+), 140 deletions(-)
 rename module-services/service-audio/{api => }/AudioServiceAPI.cpp (87%)
 rename module-services/service-audio/{messages => service-audio}/AudioMessage.hpp (96%)
 rename module-services/service-audio/{api => service-audio}/AudioServiceAPI.hpp (92%)
 rename module-services/service-audio/{ => service-audio}/ServiceAudio.hpp (97%)

diff --git a/module-apps/Application.cpp b/module-apps/Application.cpp
index 95ce17cb0..10e63da22 100644
--- a/module-apps/Application.cpp
+++ b/module-apps/Application.cpp
@@ -32,6 +32,8 @@
 #include <WindowsFactory.hpp>
 #include <service-gui/Common.hpp>
 
+#include <service-audio/AudioServiceAPI.hpp> // for GetOutputVolume
+
 namespace gui
 {
     class DrawCommand;
@@ -523,11 +525,57 @@ namespace app
         return ret == audio::RetCode::Success;
     }
 
+    auto Application::getVolume(audio::Volume &volume,
+                                const audio::Profile::Type &profileType,
+                                const audio::PlaybackType &playbackType)
+    {
+        return AudioServiceAPI::GetSetting(this, audio::Setting::Volume, volume, playbackType, profileType);
+    }
+
     bool Application::adjustCurrentVolume(const int step)
     {
         return AudioServiceAPI::KeyPressed(this, step);
     }
 
+    audio::RetCode Application::getCurrentVolume(audio::Volume &volume)
+    {
+        return AudioServiceAPI::GetSetting(this, audio::Setting::Volume, volume);
+    }
+
+    void Application::toggleTorchAndColourTemps()
+    {
+        using namespace bsp;
+
+        auto retGetState = sys::Bus::SendUnicast(std::make_shared<sevm::TorchStateMessage>(torch::Action::getState),
+                                                 service::name::evt_manager,
+                                                 this,
+                                                 pdMS_TO_TICKS(1500));
+        if (retGetState.first == sys::ReturnCodes::Success) {
+            auto msgGetState = dynamic_cast<sevm::TorchStateResultMessage *>(retGetState.second.get());
+            if (msgGetState == nullptr) {
+                return;
+            }
+            auto msgSetState = std::make_shared<sevm::TorchStateMessage>(torch::Action::setState);
+
+            switch (msgGetState->state) {
+            case torch::State::off:
+                msgSetState->state      = torch::State::on;
+                msgSetState->colourTemp = torch::warmest;
+                break;
+            case torch::State::on:
+                if (msgGetState->colourTemp == torch::warmest) { // toggle colour temp
+                    msgSetState->state      = torch::State::on;
+                    msgSetState->colourTemp = torch::coldest;
+                }
+                else {
+                    msgSetState->state = torch::State::off;
+                }
+                break;
+            }
+            sys::Bus::SendUnicast(msgSetState, service::name::evt_manager, this);
+        }
+    }
+
     void Application::requestAction(sys::Service *sender,
                                     const ApplicationName &applicationName,
                                     manager::actions::ActionId actionId,
diff --git a/module-apps/Application.hpp b/module-apps/Application.hpp
index 8c95e4b73..19649515b 100644
--- a/module-apps/Application.hpp
+++ b/module-apps/Application.hpp
@@ -5,7 +5,6 @@
 
 #include "Audio/AudioCommon.hpp"                        // for Volume, Play...
 #include "Audio/Profiles/Profile.hpp"                   // for Profile, Pro...
-#include "AudioServiceAPI.hpp"                          // for GetOutputVolume
 #include "Interface/SettingsRecord.hpp"                 // for SettingsRecord
 #include "Service/Bus.hpp"                              // for Bus
 #include "Service/Common.hpp"                           // for ReturnCodes
@@ -276,10 +275,7 @@ namespace app
 
         auto getVolume(audio::Volume &volume,
                        const audio::Profile::Type &profileType,
-                       const audio::PlaybackType &playbackType)
-        {
-            return AudioServiceAPI::GetSetting(this, audio::Setting::Volume, volume, playbackType, profileType);
-        }
+                       const audio::PlaybackType &playbackType);
 
         bool adjustCurrentVolume(const int step);
         bool increaseCurrentVolume(const audio::Volume step = audio::defaultVolumeStep)
@@ -290,44 +286,9 @@ namespace app
         {
             return adjustCurrentVolume(-step);
         }
-        auto getCurrentVolume(audio::Volume &volume)
-        {
-            return AudioServiceAPI::GetSetting(this, audio::Setting::Volume, volume);
-        }
+        audio::RetCode getCurrentVolume(audio::Volume &volume);
 
-        void toggleTorchAndColourTemps()
-        {
-            using namespace bsp;
-
-            auto retGetState = sys::Bus::SendUnicast(std::make_shared<sevm::TorchStateMessage>(torch::Action::getState),
-                                                     service::name::evt_manager,
-                                                     this,
-                                                     pdMS_TO_TICKS(1500));
-            if (retGetState.first == sys::ReturnCodes::Success) {
-                auto msgGetState = dynamic_cast<sevm::TorchStateResultMessage *>(retGetState.second.get());
-                if (msgGetState == nullptr) {
-                    return;
-                }
-                auto msgSetState = std::make_shared<sevm::TorchStateMessage>(torch::Action::setState);
-
-                switch (msgGetState->state) {
-                case torch::State::off:
-                    msgSetState->state      = torch::State::on;
-                    msgSetState->colourTemp = torch::warmest;
-                    break;
-                case torch::State::on:
-                    if (msgGetState->colourTemp == torch::warmest) { // toggle colour temp
-                        msgSetState->state      = torch::State::on;
-                        msgSetState->colourTemp = torch::coldest;
-                    }
-                    else {
-                        msgSetState->state = torch::State::off;
-                    }
-                    break;
-                }
-                sys::Bus::SendUnicast(msgSetState, service::name::evt_manager, this);
-            }
-        }
+        void toggleTorchAndColourTemps();
 
         /// @defgroup Application Application static functions
         /// All this functions are meant to be used in ApplicationManager only
diff --git a/module-apps/CMakeLists.txt b/module-apps/CMakeLists.txt
index 4b133a1f6..f00019d06 100644
--- a/module-apps/CMakeLists.txt
+++ b/module-apps/CMakeLists.txt
@@ -91,6 +91,7 @@ target_link_libraries(${PROJECT_NAME}
     PRIVATE
         service-appmgr
         service-antenna
+        service-audio
     PUBLIC
         module-bsp
         module-os
diff --git a/module-apps/application-call/ApplicationCall.cpp b/module-apps/application-call/ApplicationCall.cpp
index 72130a355..9edbf6739 100644
--- a/module-apps/application-call/ApplicationCall.cpp
+++ b/module-apps/application-call/ApplicationCall.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "ApplicationCall.hpp"
@@ -21,7 +21,7 @@
 #include <memory>
 #include <service-cellular/ServiceCellular.hpp>
 #include <service-cellular/api/CellularServiceAPI.hpp>
-#include <service-audio/api/AudioServiceAPI.hpp>
+#include <service-audio/AudioServiceAPI.hpp>
 #include <service-appmgr/Controller.hpp>
 #include <time/time_conversion.hpp>
 #include <ticks.hpp>
diff --git a/module-apps/application-call/CMakeLists.txt b/module-apps/application-call/CMakeLists.txt
index 479a3c3ce..bfb26d081 100644
--- a/module-apps/application-call/CMakeLists.txt
+++ b/module-apps/application-call/CMakeLists.txt
@@ -1,4 +1,4 @@
-
+
 include_directories( ${CMAKE_PROJECT_NAME}
 
 	PUBLIC
@@ -29,3 +29,8 @@ target_sources( ${PROJECT_NAME}
 		"${CMAKE_CURRENT_LIST_DIR}/data/CallSwitchData.hpp"
 )
 
+target_link_libraries(${PROJECT_NAME}
+    PRIVATE
+        service-audio
+)
+
diff --git a/module-apps/application-call/windows/CallWindow.cpp b/module-apps/application-call/windows/CallWindow.cpp
index e4f5c68ad..d362c50d1 100644
--- a/module-apps/application-call/windows/CallWindow.cpp
+++ b/module-apps/application-call/windows/CallWindow.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "CallWindow.hpp"
@@ -15,7 +15,7 @@
 
 #include "i18/i18.hpp"
 
-#include "service-audio/api/AudioServiceAPI.hpp"
+#include <service-audio/AudioServiceAPI.hpp>
 #include "service-cellular/api/CellularServiceAPI.hpp"
 #include "service-db/api/DBServiceAPI.hpp"
 
diff --git a/module-apps/application-meditation/CMakeLists.txt b/module-apps/application-meditation/CMakeLists.txt
index c8a6db617..494dbfd55 100644
--- a/module-apps/application-meditation/CMakeLists.txt
+++ b/module-apps/application-meditation/CMakeLists.txt
@@ -1,4 +1,4 @@
-include_directories(${CMAKE_PROJECT_NAME} PUBLIC "${CMAKE_CURRENT_LIST_DIR}")
+include_directories(${CMAKE_PROJECT_NAME} PUBLIC "${CMAKE_CURRENT_LIST_DIR}")
 include_directories(${PROJECT_NAME} PUBLIC "${CMAKE_CURRENT_LIST_DIR}")
 
 target_sources(${PROJECT_NAME}
@@ -28,3 +28,8 @@ target_sources(${PROJECT_NAME}
         widgets/TimerSetter.hpp
 )
 
+target_link_libraries(${PROJECT_NAME}
+    PRIVATE
+        service-audio
+    )
+
diff --git a/module-apps/application-meditation/widgets/MeditationTimer.cpp b/module-apps/application-meditation/widgets/MeditationTimer.cpp
index b9cc04570..48777afec 100644
--- a/module-apps/application-meditation/widgets/MeditationTimer.cpp
+++ b/module-apps/application-meditation/widgets/MeditationTimer.cpp
@@ -1,10 +1,11 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "MeditationTimer.hpp"
 
 #include <cassert>
 
+#include <service-audio/AudioServiceAPI.hpp>
 #include <application-meditation/data/Style.hpp>
 #include <time/time_conversion.hpp>
 
diff --git a/module-apps/application-meditation/windows/MeditationTimerWindow.hpp b/module-apps/application-meditation/windows/MeditationTimerWindow.hpp
index 89895a99a..819dd8d1b 100644
--- a/module-apps/application-meditation/windows/MeditationTimerWindow.hpp
+++ b/module-apps/application-meditation/windows/MeditationTimerWindow.hpp
@@ -1,10 +1,12 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once
 
 #include "AppWindow.hpp"
 
+#include <chrono>
+
 namespace gui
 {
     class MeditationTimer;
diff --git a/module-apps/application-music-player/ApplicationMusicPlayer.cpp b/module-apps/application-music-player/ApplicationMusicPlayer.cpp
index f2617ac5f..bc3dad34e 100644
--- a/module-apps/application-music-player/ApplicationMusicPlayer.cpp
+++ b/module-apps/application-music-player/ApplicationMusicPlayer.cpp
@@ -1,12 +1,11 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "ApplicationMusicPlayer.hpp"
 #include "windows/MusicPlayerAllSongsWindow.hpp"
 #include "windows/MusicPlayerEmptyWindow.hpp"
 
-#include <service-audio/api/AudioServiceAPI.hpp>
-#include <service-audio/api/AudioServiceAPI.hpp>
+#include <service-audio/AudioServiceAPI.hpp>
 #include <i18/i18.hpp>
 #include <log/log.hpp>
 #include <time/ScopedTime.hpp>
diff --git a/module-apps/application-music-player/ApplicationMusicPlayer.hpp b/module-apps/application-music-player/ApplicationMusicPlayer.hpp
index bc83d7aac..2cfb97424 100644
--- a/module-apps/application-music-player/ApplicationMusicPlayer.hpp
+++ b/module-apps/application-music-player/ApplicationMusicPlayer.hpp
@@ -1,9 +1,10 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once
 
 #include <Application.hpp>
+#include <module-audio/Audio/decoder/decoder.hpp>
 
 namespace gui
 {
diff --git a/module-apps/application-music-player/CMakeLists.txt b/module-apps/application-music-player/CMakeLists.txt
index bec4a6b02..ad59463b0 100644
--- a/module-apps/application-music-player/CMakeLists.txt
+++ b/module-apps/application-music-player/CMakeLists.txt
@@ -1,4 +1,4 @@
-
+
 include_directories( ${CMAKE_PROJECT_NAME}
 
     PUBLIC
@@ -18,3 +18,8 @@ target_sources( ${PROJECT_NAME}
     PUBLIC
         "${CMAKE_CURRENT_LIST_DIR}/ApplicationMusicPlayer.hpp"
 )
+target_link_libraries(${PROJECT_NAME}
+    PRIVATE
+        service-audio
+        module-audio
+)
diff --git a/module-apps/application-music-player/models/SongsModel.cpp b/module-apps/application-music-player/models/SongsModel.cpp
index c9cec7904..17dd4cdc8 100644
--- a/module-apps/application-music-player/models/SongsModel.cpp
+++ b/module-apps/application-music-player/models/SongsModel.cpp
@@ -1,11 +1,11 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "SongsModel.hpp"
 #include "application-music-player/widgets/SongItem.hpp"
 
 #include <ListView.hpp>
-#include <service-audio/api/AudioServiceAPI.hpp>
+#include <service-audio/AudioServiceAPI.hpp>
 #include <time/time_conversion.hpp>
 
 SongsModel::SongsModel(app::Application *app) : application(app)
diff --git a/module-apps/application-music-player/models/SongsModel.hpp b/module-apps/application-music-player/models/SongsModel.hpp
index 1f51100f3..1ecb6c165 100644
--- a/module-apps/application-music-player/models/SongsModel.hpp
+++ b/module-apps/application-music-player/models/SongsModel.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once
@@ -8,6 +8,7 @@
 #include "Application.hpp"
 
 #include <ListItemProvider.hpp>
+#include <module-audio/Audio/decoder/decoder.hpp>
 
 class SongsModel : public app::InternalModel<gui::ListItem *>, public gui::ListItemProvider
 {
diff --git a/module-apps/application-music-player/windows/MusicPlayerAllSongsWindow.cpp b/module-apps/application-music-player/windows/MusicPlayerAllSongsWindow.cpp
index 8cbd6c22a..9de200f7e 100644
--- a/module-apps/application-music-player/windows/MusicPlayerAllSongsWindow.cpp
+++ b/module-apps/application-music-player/windows/MusicPlayerAllSongsWindow.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "MusicPlayerAllSongsWindow.hpp"
@@ -8,7 +8,7 @@
 #include <cassert>
 #include <i18/i18.hpp>
 #include <log/log.hpp>
-#include <service-audio/api/AudioServiceAPI.hpp>
+#include <service-audio/AudioServiceAPI.hpp>
 
 namespace gui
 {
diff --git a/module-apps/application-music-player/windows/MusicPlayerEmptyWindow.cpp b/module-apps/application-music-player/windows/MusicPlayerEmptyWindow.cpp
index 025f11c57..c36b28689 100644
--- a/module-apps/application-music-player/windows/MusicPlayerEmptyWindow.cpp
+++ b/module-apps/application-music-player/windows/MusicPlayerEmptyWindow.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "MusicPlayerEmptyWindow.hpp"
@@ -8,7 +8,7 @@
 #include <Style.hpp>
 #include <i18/i18.hpp>
 #include <log/log.hpp>
-#include <service-audio/api/AudioServiceAPI.hpp>
+#include <service-audio/AudioServiceAPI.hpp>
 
 namespace gui
 {
diff --git a/module-apps/application-settings-new/windows/QuotesMainWindow.hpp b/module-apps/application-settings-new/windows/QuotesMainWindow.hpp
index 7c03eeeb6..198173a4b 100644
--- a/module-apps/application-settings-new/windows/QuotesMainWindow.hpp
+++ b/module-apps/application-settings-new/windows/QuotesMainWindow.hpp
@@ -1,10 +1,12 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once
 
 #include "BaseSettingsWindow.hpp"
 
+#include <vfs.hpp>
+
 namespace gui
 {
     class CheckBoxWithLabel;
diff --git a/module-apps/windows/AppWindow.cpp b/module-apps/windows/AppWindow.cpp
index 30ff95a35..77237b014 100644
--- a/module-apps/windows/AppWindow.cpp
+++ b/module-apps/windows/AppWindow.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "AppWindow.hpp"
@@ -9,7 +9,7 @@
 #include <application-desktop/ApplicationDesktop.hpp>
 #include <i18/i18.hpp>
 #include <service-appmgr/Controller.hpp>
-#include <service-audio/api/AudioServiceAPI.hpp>
+#include <service-audio/AudioServiceAPI.hpp>
 
 using namespace style::header;
 
diff --git a/module-apps/windows/AppWindow.hpp b/module-apps/windows/AppWindow.hpp
index e088938b9..4e45a5138 100644
--- a/module-apps/windows/AppWindow.hpp
+++ b/module-apps/windows/AppWindow.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once
@@ -8,7 +8,6 @@
 #include <gui/widgets/Window.hpp>
 #include <Service/Service.hpp>
 #include <Service/Message.hpp>
-#include <service-audio/api/AudioServiceAPI.hpp>
 
 namespace app
 {
diff --git a/module-bluetooth/Bluetooth/interface/profiles/A2DP/A2DP.cpp b/module-bluetooth/Bluetooth/interface/profiles/A2DP/A2DP.cpp
index e5ca4b4a1..4af728ea5 100644
--- a/module-bluetooth/Bluetooth/interface/profiles/A2DP/A2DP.cpp
+++ b/module-bluetooth/Bluetooth/interface/profiles/A2DP/A2DP.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 //
@@ -15,7 +15,7 @@
 #include <Service/Bus.hpp>
 #include <service-bluetooth/messages/BluetoothMessage.hpp>
 #include <Audio/AudioCommon.hpp>
-#include <service-audio/messages/AudioMessage.hpp>
+#include <service-audio/AudioMessage.hpp>
 #include <service-evtmgr/Constants.hpp>
 extern "C"
 {
diff --git a/module-bluetooth/Bluetooth/interface/profiles/HSP/HSP.cpp b/module-bluetooth/Bluetooth/interface/profiles/HSP/HSP.cpp
index 3d4488691..170ec935e 100644
--- a/module-bluetooth/Bluetooth/interface/profiles/HSP/HSP.cpp
+++ b/module-bluetooth/Bluetooth/interface/profiles/HSP/HSP.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "HSPImpl.hpp"
@@ -7,7 +7,7 @@
 #include <Bluetooth/Error.hpp>
 #include <log/log.hpp>
 #include <service-evtmgr/Constants.hpp>
-#include <service-audio/messages/AudioMessage.hpp>
+#include <service-audio/AudioMessage.hpp>
 
 extern "C"
 {
diff --git a/module-bluetooth/Bluetooth/interface/profiles/HSP/SCO.cpp b/module-bluetooth/Bluetooth/interface/profiles/HSP/SCO.cpp
index a1f37c19d..4a2db6634 100644
--- a/module-bluetooth/Bluetooth/interface/profiles/HSP/SCO.cpp
+++ b/module-bluetooth/Bluetooth/interface/profiles/HSP/SCO.cpp
@@ -1,11 +1,11 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "SCO.hpp"
 #include <cstdio>
 #include <Audio/AudioCommon.hpp>
 #include <service-evtmgr/Constants.hpp>
-#include <service-audio/messages/AudioMessage.hpp>
+#include <service-audio/AudioMessage.hpp>
 #include <cassert>
 extern "C"
 {
diff --git a/module-bluetooth/CMakeLists.txt b/module-bluetooth/CMakeLists.txt
index 04ed63085..5a3d5ccb2 100644
--- a/module-bluetooth/CMakeLists.txt
+++ b/module-bluetooth/CMakeLists.txt
@@ -1,4 +1,4 @@
-project(module-bluetooth VERSION 1.0 DESCRIPTION "Bluetooth module library")
+project(module-bluetooth VERSION 1.0 DESCRIPTION "Bluetooth module library")
 
 include(${CMAKE_SOURCE_DIR}/config/ModuleConfig.cmake)
 
@@ -63,5 +63,6 @@ target_link_libraries(
     module-vfs
     module-sys
     module-audio
+    service-audio
     ${BOARD_DIR_LIBRARIES}
     )
diff --git a/module-services/service-antenna/CMakeLists.txt b/module-services/service-antenna/CMakeLists.txt
index a23613fef..4ea75b46e 100644
--- a/module-services/service-antenna/CMakeLists.txt
+++ b/module-services/service-antenna/CMakeLists.txt
@@ -9,9 +9,10 @@ set(SOURCES
 add_library(${PROJECT_NAME} STATIC ${SOURCES})
 
 target_link_libraries(${PROJECT_NAME}
-    module-apps
-    module-cellular
-    module-utils
+    PRIVATE
+        module-apps
+        module-cellular
+        module-utils
 )
 
 target_include_directories(${PROJECT_NAME}
diff --git a/module-services/service-appmgr/CMakeLists.txt b/module-services/service-appmgr/CMakeLists.txt
index e9d4d08fd..1650255c3 100644
--- a/module-services/service-appmgr/CMakeLists.txt
+++ b/module-services/service-appmgr/CMakeLists.txt
@@ -12,8 +12,9 @@ set(SOURCES
 add_library(${PROJECT_NAME} STATIC ${SOURCES})
 
 target_link_libraries(${PROJECT_NAME}
-    module-apps
-    module-audio
+    PRIVATE
+        module-apps
+        module-audio
 )
 
 target_include_directories(${PROJECT_NAME}
diff --git a/module-services/service-audio/api/AudioServiceAPI.cpp b/module-services/service-audio/AudioServiceAPI.cpp
similarity index 87%
rename from module-services/service-audio/api/AudioServiceAPI.cpp
rename to module-services/service-audio/AudioServiceAPI.cpp
index 63f621c22..67b0463f6 100644
--- a/module-services/service-audio/api/AudioServiceAPI.cpp
+++ b/module-services/service-audio/AudioServiceAPI.cpp
@@ -1,16 +1,16 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include "AudioServiceAPI.hpp"
+#include "service-audio/AudioServiceAPI.hpp"
+#include "service-audio/ServiceAudio.hpp"
+#include "service-audio/AudioMessage.hpp"
 
-#include <utility> // for move, pair
+#include <Audio/decoder/decoder.hpp>
+#include <Service/Bus.hpp>
+#include <Service/Common.hpp>
+#include <log/log.hpp>
 
-#include "Service/Bus.hpp"                         // for Bus, defaultCmdTimeout
-#include "../ServiceAudio.hpp"                     // for ServiceAudio, ServiceAudio::serviceName
-#include "Audio/decoder/decoder.hpp"               // for Tags
-#include "Service/Common.hpp"                      // for ReturnCodes, ReturnCodes::Success
-#include "log/log.hpp"                             // for LOG_DEBUG, LOG_ERROR
-#include "service-audio/messages/AudioMessage.hpp" // for AudioStopRequest, AudioResponseMessage, AudioEventRequest, AudioGetFileTagsRequest, AudioGetSetting, AudioKeyPressedRequest, AudioPauseRequest, AudioResumeRequest, AudioStartPlaybackRequest, AudioStartRecorderRequest, AudioStartRoutingRequest, AudioMessage, AudioSetSetting (ptr only)
+#include <utility>
 
 namespace sys
 {
diff --git a/module-services/service-audio/CMakeLists.txt b/module-services/service-audio/CMakeLists.txt
index 8137bc3e7..558aa2d0f 100644
--- a/module-services/service-audio/CMakeLists.txt
+++ b/module-services/service-audio/CMakeLists.txt
@@ -1,21 +1,24 @@
-include_directories( ${CMAKE_PROJECT_NAME}
-
-	PUBLIC
-		"${CMAKE_CURRENT_LIST_DIR}"
-)
-
-include_directories( ${PROJECT_NAME}
-
-	PUBLIC
-		"${CMAKE_CURRENT_LIST_DIR}"
-)
-
+project(service-audio)
 message( "${PROJECT_NAME}  ${CMAKE_CURRENT_LIST_DIR}" )
 
-target_sources( ${PROJECT_NAME}
 
-	PRIVATE
-		"${CMAKE_CURRENT_LIST_DIR}/ServiceAudio.cpp"
-		"${CMAKE_CURRENT_LIST_DIR}/api/AudioServiceAPI.cpp"
+set(SOURCES
+    ServiceAudio.cpp
+    AudioServiceAPI.cpp
+)
+
+add_library(${PROJECT_NAME} STATIC ${SOURCES})
+
+target_link_libraries(${PROJECT_NAME}
+    module-bluetooth
+    module-audio
+    module-utils
+    module-db
+)
+
+
+target_include_directories(${PROJECT_NAME}
+    PUBLIC
+       ${CMAKE_CURRENT_LIST_DIR}
 )
 
diff --git a/module-services/service-audio/ServiceAudio.cpp b/module-services/service-audio/ServiceAudio.cpp
index c9816af7f..2a593b2da 100644
--- a/module-services/service-audio/ServiceAudio.cpp
+++ b/module-services/service-audio/ServiceAudio.cpp
@@ -1,16 +1,16 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include <type_traits>
-
-#include "ServiceAudio.hpp"
-#include "messages/AudioMessage.hpp"
+#include "service-audio/AudioMessage.hpp"
+#include "service-audio/ServiceAudio.hpp"
 
 #include <Audio/Operation/IdleOperation.hpp>
 #include <Audio/Operation/PlaybackOperation.hpp>
-#include <service-bluetooth/messages/BluetoothMessage.hpp>
 #include <service-bluetooth/Constants.hpp>
 #include <service-bluetooth/ServiceBluetoothCommon.hpp>
+#include <service-bluetooth/messages/BluetoothMessage.hpp>
+
+#include <type_traits>
 
 const char *ServiceAudio::serviceName = "ServiceAudio";
 
diff --git a/module-services/service-audio/messages/AudioMessage.hpp b/module-services/service-audio/service-audio/AudioMessage.hpp
similarity index 96%
rename from module-services/service-audio/messages/AudioMessage.hpp
rename to module-services/service-audio/service-audio/AudioMessage.hpp
index 7bf225ff3..febeb72f9 100644
--- a/module-services/service-audio/messages/AudioMessage.hpp
+++ b/module-services/service-audio/service-audio/AudioMessage.hpp
@@ -1,14 +1,15 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once
 
+#include <Audio/AudioCommon.hpp>
+#include <Audio/decoder/decoder.hpp>
+#include <MessageType.hpp>
+#include <Service/Message.hpp>
+
 #include <memory>
 #include <variant>
-#include "Service/Message.hpp"
-#include "MessageType.hpp"
-#include "module-audio/Audio/AudioCommon.hpp"
-#include "module-audio/Audio/decoder/decoder.hpp"
 
 class AudioMessage : public sys::DataMessage
 {
diff --git a/module-services/service-audio/api/AudioServiceAPI.hpp b/module-services/service-audio/service-audio/AudioServiceAPI.hpp
similarity index 92%
rename from module-services/service-audio/api/AudioServiceAPI.hpp
rename to module-services/service-audio/service-audio/AudioServiceAPI.hpp
index 19bdca118..8c5011bb7 100644
--- a/module-services/service-audio/api/AudioServiceAPI.hpp
+++ b/module-services/service-audio/service-audio/AudioServiceAPI.hpp
@@ -1,17 +1,18 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once
 
-#include <optional> // for optional
-#include <memory>   // for shared_ptr
-#include <string>   // for string
-#include <vector>   // for vector
+#include "AudioMessage.hpp"
 
-#include "../messages/AudioMessage.hpp"
-#include "Audio/decoder/decoder.hpp"
-#include "Audio/AudioCommon.hpp" // for PlaybackType, PlaybackType::None, Token (ptr only), RetCode, Setting, Event (ptr only), EventType
-#include "Audio/Profiles/Profile.hpp" // for Profile, Profile::Type, Profile::Type::Idle
+#include <Audio/AudioCommon.hpp>
+#include <Audio/Profiles/Profile.hpp>
+#include <Audio/decoder/decoder.hpp>
+
+#include <memory>
+#include <optional>
+#include <string>
+#include <vector>
 
 class Service;
 namespace audio
diff --git a/module-services/service-audio/ServiceAudio.hpp b/module-services/service-audio/service-audio/ServiceAudio.hpp
similarity index 97%
rename from module-services/service-audio/ServiceAudio.hpp
rename to module-services/service-audio/service-audio/ServiceAudio.hpp
index 014c9bd09..43fac33b6 100644
--- a/module-services/service-audio/ServiceAudio.hpp
+++ b/module-services/service-audio/service-audio/ServiceAudio.hpp
@@ -1,23 +1,24 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once
-#include <functional>
 
-#include "messages/AudioMessage.hpp"
+#include "AudioMessage.hpp"
 
-#include <Service/Service.hpp>
 #include <Audio/Audio.hpp>
 #include <Audio/AudioMux.hpp>
 #include <MessageType.hpp>
-
-#include <service-db/api/DBServiceAPI.hpp>
-#include <queries/settings/QuerySettingsGet_v2.hpp>
-#include <queries/settings/QuerySettingsAddOrIgnore_v2.hpp>
-#include <queries/settings/QuerySettingsUpdate_v2.hpp>
-#include <service-db/messages/QueryMessage.hpp>
+#include <Service/Service.hpp>
 #include <Utils.hpp>
 
+#include <queries/settings/QuerySettingsAddOrIgnore_v2.hpp>
+#include <queries/settings/QuerySettingsGet_v2.hpp>
+#include <queries/settings/QuerySettingsUpdate_v2.hpp>
+#include <service-db/api/DBServiceAPI.hpp>
+#include <service-db/messages/QueryMessage.hpp>
+
+#include <functional>
+
 class ServiceAudio : public sys::Service
 {
   public:
diff --git a/module-services/service-cellular/CMakeLists.txt b/module-services/service-cellular/CMakeLists.txt
index a9c053e85..a85af1375 100644
--- a/module-services/service-cellular/CMakeLists.txt
+++ b/module-services/service-cellular/CMakeLists.txt
@@ -24,5 +24,6 @@ target_sources( ${PROJECT_NAME}
 target_link_libraries(${PROJECT_NAME}
     PRIVATE
         service-antenna
+        service-audio
     )
 
diff --git a/module-services/service-cellular/ServiceCellular.cpp b/module-services/service-cellular/ServiceCellular.cpp
index 67fc28581..e7cf7a08d 100644
--- a/module-services/service-cellular/ServiceCellular.cpp
+++ b/module-services/service-cellular/ServiceCellular.cpp
@@ -46,7 +46,7 @@
 #include <service-antenna/AntennaMessage.hpp>            // for AntennaChangedMessage
 #include "time/time_conversion.hpp"                      // for Timestamp
 #include "Audio/AudioCommon.hpp"                         // for PlaybackType, PlaybackType::TextMessageRingtone
-#include "AudioServiceAPI.hpp"                           // for PlaybackStart
+#include <service-audio/AudioServiceAPI.hpp>             // for PlaybackStart
 #include "BaseInterface.hpp" // for Interface, Interface::Name, Interface::Name::Notifications, Interface::Name::SMS
 #include "CalllogRecord.hpp" // for CalllogRecord
 #include "Commands.hpp" // for AT, factory, Cmd, AT::SMS_GSM, getCommadsSet, AT::CREG, AT::CSQ, AT::QNWINFO, AT::QSIMSTAT, AT::SMS_UCSC2, AT::ATA, AT::ATD, AT::ATH, AT::CEER, AT::CIMI, AT::CLCC, AT::CMGD, AT::CMGS, AT::CNUM, AT::CUSD_CLOSE_SESSION, AT::CUSD_OPEN_SESSION, AT::CUSD_SEND, AT::DISABLE_TIME_ZONE_REPORTING, AT::DISABLE_TIME_ZONE_UPDATE, AT::ENABLE_NETWORK_REGISTRATION_URC, AT::ENABLE_TIME_ZONE_UPDATE, AT::GET_SCANMODE, AT::IPR, AT::QCMGR, AT::QCMGS, AT::QGMR, AT::QLDTMF, AT::SET_SCANMODE, AT::SET_SMS_TEXT_MODE_UCS2, AT::SET_TIME_ZONE_REPORTING, AT::SIMSTAT_ON, AT::SIM_DET, AT::SIM_DET_ON, AT::STORE_SETTINGS_ATW, AT::VTS, commadsSet, commadsSet::simInit
diff --git a/module-services/service-evtmgr/CMakeLists.txt b/module-services/service-evtmgr/CMakeLists.txt
index a8c450faf..cc02694bd 100644
--- a/module-services/service-evtmgr/CMakeLists.txt
+++ b/module-services/service-evtmgr/CMakeLists.txt
@@ -1,4 +1,4 @@
-include_directories( ${CMAKE_PROJECT_NAME}
+include_directories( ${CMAKE_PROJECT_NAME}
 
 	PUBLIC
 		"${CMAKE_CURRENT_LIST_DIR}"
@@ -30,4 +30,8 @@ target_sources( ${PROJECT_NAME}
 		"${CMAKE_CURRENT_LIST_DIR}/WorkerEvent.hpp"
 		"${CMAKE_CURRENT_LIST_DIR}/api/EventManagerServiceAPI.hpp"
 )
+target_link_libraries(${PROJECT_NAME}
+    PRIVATE
+        service-audio
+)
 
diff --git a/module-services/service-evtmgr/EventManager.cpp b/module-services/service-evtmgr/EventManager.cpp
index 0c0b271b7..f7d324059 100644
--- a/module-services/service-evtmgr/EventManager.cpp
+++ b/module-services/service-evtmgr/EventManager.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 /*
@@ -24,7 +24,6 @@
 #include "messages/EVMessages.hpp" // for TorchStateResultMessage, EVMFocusApplication, StatusStateMessage, EVMBoardResponseMessage, SIMMessage, TorchStateMessage
 #include "service-appmgr/Controller.hpp"                 // for Controller
 #include "service-db/messages/DBNotificationMessage.hpp" // for NotificationMessage
-#include "AudioServiceAPI.hpp"                           // for SendEvent
 #include "bsp/magnetometer/magnetometer.hpp"             // for GetBoard
 #include "bsp/common.hpp"                                // for c_str
 #include "bsp/rtc/rtc.hpp"                               // for rtc_SetDateTime
@@ -37,7 +36,8 @@
 #include "bsp/keyboard/key_codes.hpp"      // for KeyCodes, KeyCodes::FnRight, bsp
 #include "bsp/torch/torch.hpp" // for State, Action, getColorTemp, getState, toggle, turn, Action::getState, Action::setState, Action::toggle
 #include "common_data/RawKey.hpp"                      // for RawKey, RawKey::State, RawKey::State::Pressed
-#include "service-audio/messages/AudioMessage.hpp"     // for AudioEventRequest
+#include <service-audio/AudioServiceAPI.hpp>           // for SendEvent
+#include <service-audio/AudioMessage.hpp>              // for AudioEventRequest
 #include "service-evtmgr/messages/BatteryMessages.hpp" // for BatteryLevelMessage, BatteryPlugMessage
 #include "service-evtmgr/messages/KbdMessage.hpp"      // for KbdMessage
 #include "module-utils/time/time_conversion.hpp"       // for Time Zone handling
diff --git a/module-services/service-evtmgr/WorkerEvent.cpp b/module-services/service-evtmgr/WorkerEvent.cpp
index 6f64143ec..f3bafdd53 100644
--- a/module-services/service-evtmgr/WorkerEvent.cpp
+++ b/module-services/service-evtmgr/WorkerEvent.cpp
@@ -20,7 +20,7 @@ extern "C"
 #include "common_data/RawKey.hpp"     // for RawKey, RawKey::State, RawKey::State::Pressed, RawKey::State::Released
 //#include "harness/harness.hpp"                          // for ETX, STX
 #include "log/log.hpp"                                 // for LOG_DEBUG, LOG_ERROR
-#include "service-audio/messages/AudioMessage.hpp"     // for AudioEventRequest
+#include <service-audio/AudioMessage.hpp>              // for AudioEventRequest
 #include "service-evtmgr/messages/BatteryMessages.hpp" // for BatteryLevelMessage, BatteryPlugMessage
 #include "service-evtmgr/messages/KbdMessage.hpp"      // for KbdMessage