7 files changed, 44 insertions(+), 19 deletions(-)

M module-apps/CMakeLists.txt
M module-apps/application-music-player/ApplicationMusicPlayer.cpp
M module-apps/application-music-player/CMakeLists.txt
M module-apps/application-music-player/data/MusicPlayerStyle.hpp
R module-apps/application-music-player/{ => include}/application-music-player/ApplicationMusicPlayer.hpp
M products/BellHybrid/CMakeLists.txt
M products/PurePhone/CMakeLists.txt

@@ 10,6 10,7 @@ add_library(${PROJECT_NAME} STATIC)
 
 add_subdirectory(apps-common)
 add_subdirectory(application-antenna)
+add_subdirectory(application-music-player)
 
 set(APPLICATIONS
     clock


@@ 24,7 25,6 @@ set(APPLICATIONS
     messages
     calllog
     special-input
-    music-player
     meditation
     calculator
     alarm-clock

@@ 1,9 1,9 @@
 // Copyright (c) 2017-2021, 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 <application-music-player/ApplicationMusicPlayer.hpp>
+#include <windows/MusicPlayerAllSongsWindow.hpp>
+#include <windows/MusicPlayerEmptyWindow.hpp>
 
 #include <filesystem>
 #include <log.hpp>

@@ 1,25 1,49 @@
-
-include_directories( ${CMAKE_PROJECT_NAME}
+# Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+# For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
+add_library(application-music-player STATIC)
+
+target_include_directories(application-music-player
+    PRIVATE
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
     PUBLIC
-        "${CMAKE_CURRENT_LIST_DIR}"
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
 )
 
-target_sources( ${PROJECT_NAME}
-
+target_sources(application-music-player
     PRIVATE
-        "${CMAKE_CURRENT_LIST_DIR}/ApplicationMusicPlayer.cpp"
-        "${CMAKE_CURRENT_LIST_DIR}/windows/MusicPlayerAllSongsWindow.cpp"
-        "${CMAKE_CURRENT_LIST_DIR}/windows/MusicPlayerEmptyWindow.cpp"
-        "${CMAKE_CURRENT_LIST_DIR}/widgets/SongItem.cpp"
-        "${CMAKE_CURRENT_LIST_DIR}/widgets/Action.cpp"
-        "${CMAKE_CURRENT_LIST_DIR}/models/SongsModel.cpp"
-        
+        ApplicationMusicPlayer.cpp
+        models/SongsModel.cpp
+        widgets/Action.cpp
+        widgets/SongItem.cpp
+        windows/MusicPlayerAllSongsWindow.cpp
+        windows/MusicPlayerEmptyWindow.cpp
+    PRIVATE
+        data/MusicPlayerStyle.hpp
+        models/SongsModel.hpp
+        widgets/Action.hpp
+        widgets/SongItem.hpp
+        windows/MusicPlayerAllSongsWindow.hpp
+        windows/MusicPlayerEmptyWindow.hpp
     PUBLIC
-        "${CMAKE_CURRENT_LIST_DIR}/ApplicationMusicPlayer.hpp"
+        include/application-music-player/ApplicationMusicPlayer.hpp
 )
-target_link_libraries(${PROJECT_NAME}
+
+option(ENABLE_APP_MUSIC_PLAYER "Enable application music player" ON)
+
+target_compile_definitions(application-music-player
+    INTERFACE
+        $<$<BOOL:${ENABLE_APP_MUSIC_PLAYER}>:ENABLE_APP_MUSIC_PLAYER>
+)
+
+target_link_libraries(application-music-player
     PRIVATE
+        i18n
+        log
+        module-gui
         service-audio
+        time
+    PUBLIC
+        apps-common
         module-audio
 )

@@ 3,7 3,6 @@
 
 #pragma once
 #include <Style.hpp>
-#include <utf8/UTF8.hpp>
 
 namespace musicPlayerStyle
 {

@@ 46,6 46,7 @@ set_target_properties(BellHybrid
 
 target_link_libraries(BellHybrid
     PRIVATE
+        application-music-player
         module-apps
         service-desktop
         service-bluetooth

@@ 49,6 49,7 @@ set_target_properties(PurePhone
 target_link_libraries(PurePhone
     PRIVATE
         application-antenna
+        application-music-player
         module-apps
         service-desktop
         service-bluetooth