Merge pull request #156 from InfiniTimeOrg/remove_MusicService

Remove sim copy of MusicService.h and use InfiniTime version
InfiniTimeOrg · Jan 12, 2025 · 7595686 · 7595686
2 parents eedcaf4 + b586806
commit 7595686
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 290 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -129,8 +129,6 @@ target_sources(infinisim PUBLIC
   sim/displayapp/LittleVgl.cpp
   sim/components/battery/BatteryController.h
   sim/components/battery/BatteryController.cpp
-  sim/components/ble/MusicService.h
-  sim/components/ble/MusicService.cpp
   sim/components/ble/NimbleController.h
   sim/components/ble/NimbleController.cpp
   sim/components/brightness/BrightnessController.h
@@ -199,6 +197,8 @@ target_sources(infinisim PUBLIC
   ${InfiniTime_DIR}/src/components/ble/AlertNotificationService.cpp
   ${InfiniTime_DIR}/src/components/ble/MotionService.h
   ${InfiniTime_DIR}/src/components/ble/MotionService.cpp
+  ${InfiniTime_DIR}/src/components/ble/MusicService.h
+  ${InfiniTime_DIR}/src/components/ble/MusicService.cpp
   ${InfiniTime_DIR}/src/components/ble/NavigationService.h
   ${InfiniTime_DIR}/src/components/ble/NavigationService.cpp
   ${InfiniTime_DIR}/src/components/ble/NotificationManager.h

diff --git a/sim/components/ble/MusicService.cpp b/sim/components/ble/MusicService.cpp
diff --git a/sim/components/ble/MusicService.h b/sim/components/ble/MusicService.h
diff --git a/sim/components/ble/NimbleController.cpp b/sim/components/ble/NimbleController.cpp
@@ -43,7 +43,7 @@ NimbleController::NimbleController(Pinetime::System::SystemTask& systemTask,
     anService {systemTask, notificationManager},
 //    alertNotificationClient {systemTask, notificationManager},
 //    currentTimeService {dateTimeController},
-    musicService {systemTask},
+    musicService {*this},
     weatherService {dateTimeController},
 //    batteryInformationService {batteryController},
 //    immediateAlertService {systemTask, notificationManager},