feat: Update bell to develop

feelfreelinux · Oct 21, 2024 · 0a928b5 · 0a928b5
1 parent 5c35a33
commit 0a928b5
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 11 deletions.
diff --git a/cspot/bell b/cspot/bell
diff --git a/cspot/include/Logger.h b/cspot/include/Logger.h
@@ -2,7 +2,10 @@
 
 #include <BellLogger.h>
 
-#define CSPOT_LOG(type, ...)                                                \
-  do {                                                                      \
-    bell::bellGlobalLogger->type(__FILE__, __LINE__, "cspot", __VA_ARGS__); \
-  } while (0)
+#define CSPOT_LOG(type, ...)                                  \
+  {                                                           \
+    std::scoped_lock lock(bell::bellRegisteredLoggersMutex);  \
+    for (auto& logger : bell::bellRegisteredLoggers) {        \
+      logger->type(__FILE__, __LINE__, "cspot", __VA_ARGS__); \
+    }                                                         \
+  }
diff --git a/targets/cli/CliPlayer.cpp b/targets/cli/CliPlayer.cpp
@@ -29,7 +29,7 @@ CliPlayer::CliPlayer(std::unique_ptr<AudioSink> sink,
       std::make_shared<bell::CentralAudioBuffer>(128 * 1024);
 
 #ifndef BELL_DISABLE_CODECS
-  this->dsp = std::make_shared<bell::BellDSP>(this->centralAudioBuffer);
+  this->dsp = std::make_shared<bell::BellDSP>();
 #endif
 
   auto hashFunc = std::hash<std::string_view>();
@@ -111,8 +111,8 @@ void CliPlayer::runTask() {
 
       if (!chunk || chunk->pcmSize == 0) {
         if (this->playlistEnd) {
-            this->handler->notifyAudioEnded();
-            this->playlistEnd = false;
+          this->handler->notifyAudioEnded();
+          this->playlistEnd = false;
         }
         BELL_SLEEP_MS(10);
         continue;
@@ -123,7 +123,8 @@ void CliPlayer::runTask() {
         }
 
 #ifndef BELL_DISABLE_CODECS
-        this->dsp->process(chunk->pcmData, chunk->pcmSize, 2, 44100,
+        this->dsp->process(chunk->pcmData, chunk->pcmSize, chunk->pcmData,
+                           chunk->pcmSize, 2, bell::SampleRate::SR_44100,
                            bell::BitWidth::BW_16);
 #endif
         this->audioSink->feedPCMFrames(chunk->pcmData, chunk->pcmSize);

diff --git a/targets/cli/main.cpp b/targets/cli/main.cpp
@@ -114,7 +114,6 @@ int main(int argc, char** argv) {
     exit(1);
 #endif
   bell::setDefaultLogger();
-  bell::enableTimestampLogging();
 #ifdef CSPOT_ENABLE_ALSA_SINK
   auto audioSink = std::make_unique<ALSAAudioSink>();
 #elif defined(CSPOT_ENABLE_PORTAUDIO_SINK)

diff --git a/targets/esp32/main/main.cpp b/targets/esp32/main/main.cpp
@@ -277,7 +277,6 @@ void app_main(void) {
   //auto taskHandle = xTaskCreatePinnedToCore(&cspotTask, "cspot", 12*1024, NULL, 5, NULL, 1);
   /*auto taskHandle = */
   bell::setDefaultLogger();
-  bell::enableTimestampLogging();
   auto task = std::make_unique<CSpotTask>();
   vTaskSuspend(NULL);
 }