Refactor audio events

voicesmith/src/main/cpp/de/jurihock/voicesmith/CMakeLists.txt

@@ -15,6 +15,7 @@ target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Werror)
 
 include("${CMAKE_CURRENT_LIST_DIR}/libs/cpm.cmake")
 include("${CMAKE_CURRENT_LIST_DIR}/libs/easyloggingpp.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/libs/eventpp.cmake")
 include("${CMAKE_CURRENT_LIST_DIR}/libs/fmt.cmake")
 include("${CMAKE_CURRENT_LIST_DIR}/libs/oboe.cmake")
 include("${CMAKE_CURRENT_LIST_DIR}/libs/pffft.cmake")
@@ -25,6 +26,7 @@ include("${CMAKE_CURRENT_LIST_DIR}/libs/stftpitchshift.cmake")
 target_link_libraries(${PROJECT_NAME} PRIVATE
   android
   easyloggingpp
+  eventpp
   fmt
   log
   oboe

voicesmith/src/main/cpp/de/jurihock/voicesmith/io/AudioEvent.h

@@ -0,0 +1,24 @@
+#pragma once
+
+#include <voicesmith/Header.h>
+
+#include <voicesmith/io/AudioEventCode.h>
+#include <voicesmith/io/AudioEventCodeExtensions.h>
+
+#include <eventpp/callbacklist.h>
+
+class AudioEvent final : public eventpp::CallbackList<void(const AudioEventCode code, const std::string& text)> {
+
+public:
+
+  class Emitter {
+
+  public:
+
+    virtual ~Emitter() = default;
+
+    virtual void subscribe(const Callback& callback) = 0;
+
+  };
+
+};

voicesmith/src/main/cpp/de/jurihock/voicesmith/io/AudioEventCode.h

@@ -0,0 +1,11 @@
+#pragma once
+
+enum class AudioEventCode {
+  Info,
+  Warning,
+  SourceOverrun,
+  SinkUnderrun,
+  Error,
+  SourceError,
+  SinkError,
+};

voicesmith/src/main/cpp/de/jurihock/voicesmith/io/AudioEventCodeExtensions.h

@@ -0,0 +1,9 @@
+#pragma once
+
+#include <voicesmith/Header.h>
+
+#include <voicesmith/io/AudioEventCode.h>
+
+constexpr int operator!(AudioEventCode code) noexcept {
+  return static_cast<int>(code);
+}

voicesmith/src/main/cpp/de/jurihock/voicesmith/io/AudioPipeline.cpp

@@ -16,12 +16,8 @@ AudioPipeline::~AudioPipeline() {
   close();
 }
 
-void AudioPipeline::onerror() {
-  events.error.reset();
-}
-
-void AudioPipeline::onerror(std::function<void()> callback) {
-  events.error.set(callback);
+void AudioPipeline::subscribe(const AudioEvent::Callback& callback) {
+  event.append(callback);
 }
 
 void AudioPipeline::open() {
@@ -64,32 +60,18 @@ void AudioPipeline::open() {
   source->fifo()->resize(fifosize, source->blocksize());
   sink->fifo()->resize(fifosize, sink->blocksize());
 
-  source->onxrun([&](const int32_t count) {
-    onxrun(oboe::Direction::Input, count);
-  });
-
-  sink->onxrun([&](const int32_t count) {
-    onxrun(oboe::Direction::Output, count);
-  });
-
-  source->onerror([&](const oboe::Result error) {
-    return onerror(oboe::Direction::Input, error);
+  source->subscribe([&](const AudioEventCode code, const std::string& text) {
+    onevent(code, text);
   });
 
-  sink->onerror([&](const oboe::Result error) {
-    return onerror(oboe::Direction::Output, error);
+  source->subscribe([&](const AudioEventCode code, const std::string& text) {
+    onevent(code, text);
   });
 }
 
 void AudioPipeline::close() {
   stop();
 
-  source->onxrun();
-  sink->onxrun();
-
-  source->onerror();
-  sink->onerror();
-
   source->close();
   sink->close();
 }
@@ -101,7 +83,7 @@ void AudioPipeline::start() {
   sink->start();
 
   state.loopthread = std::make_shared<std::thread>(
-    [&]() { loop(); });
+    [&]() { onloop(); });
 }
 
 void AudioPipeline::stop() {
@@ -121,7 +103,7 @@ void AudioPipeline::stop() {
   source->fifo()->flush();
 }
 
-void AudioPipeline::loop() {
+void AudioPipeline::onloop() {
   struct timers_t {
     Timer<std::chrono::milliseconds> outer;
     Timer<std::chrono::milliseconds> inner;
@@ -190,25 +172,12 @@ void AudioPipeline::loop() {
   }
 }
 
-void AudioPipeline::onxrun(const oboe::Direction direction, const int32_t count) {
-  switch (direction) {
-    case oboe::Direction::Input:
-      LOG(WARNING) << $("Audio source {0} overruns occured!", count);
-      break;
-    case oboe::Direction::Output:
-      LOG(WARNING) << $("Audio sink {0} underruns occured!", count);
-      break;
+void AudioPipeline::onevent(const AudioEventCode code, const std::string& text) {
+  if (code >= AudioEventCode::Error) {
+    LOG(WARNING) << $("Aborting audio pipeline due to error: {0}!", text);
+    std::unique_lock lock(eventmutex);
+    close();
   }
-}
 
-bool AudioPipeline::onerror(const oboe::Direction direction, const oboe::Result error) {
-  std::unique_lock lock(onerrormutex);
-
-  LOG(WARNING) << $("Aborting audio pipeline due to {0} error {1}!",
-                    oboe::convertToText(direction),
-                    oboe::convertToText(error));
-
-  close();
-  events.error();
-  return true;
+  event(code, text);
 }

voicesmith/src/main/cpp/de/jurihock/voicesmith/io/AudioPipeline.h

@@ -2,12 +2,12 @@
 
 #include <voicesmith/Header.h>
 
-#include <voicesmith/etc/Event.h>
 #include <voicesmith/fx/AudioEffect.h>
+#include <voicesmith/io/AudioEvent.h>
 #include <voicesmith/io/AudioSink.h>
 #include <voicesmith/io/AudioSource.h>
 
-class AudioPipeline final {
+class AudioPipeline final : public AudioEvent::Emitter {
 
 public:
 
@@ -17,8 +17,7 @@ class AudioPipeline final {
 
   ~AudioPipeline();
 
-  void onerror();
-  void onerror(std::function<void()> callback);
+  void subscribe(const AudioEvent::Callback& callback) override;
 
   void open();
   void close();
@@ -32,23 +31,17 @@ class AudioPipeline final {
   const std::shared_ptr<AudioSink> sink;
   const std::shared_ptr<AudioEffect> effect;
 
-  struct {
-
-    Event<void()> error = []() {};
-
-  } events;
-
   struct {
 
     std::shared_ptr<std::thread> loopthread;
     bool doloop;
 
   } state;
 
-  void loop();
-  void onxrun(const oboe::Direction direction, const int32_t count);
+  AudioEvent event;
+  std::mutex eventmutex;
 
-  std::mutex onerrormutex;
-  bool onerror(const oboe::Direction direction, const oboe::Result error);
+  void onloop();
+  void onevent(const AudioEventCode code, const std::string& text);
 
 };

voicesmith/src/main/cpp/de/jurihock/voicesmith/io/AudioSink.cpp

@@ -9,19 +9,7 @@ AudioSink::AudioSink(const std::optional<int> device,
                      const std::shared_ptr<AudioBlockQueue> queue) :
   AudioStream(oboe::Direction::Output, device, samplerate, blocksize),
   effect(effect),
-  queue((queue != nullptr) ? queue : std::make_shared<AudioBlockQueue>()) {
-
-  if (effect) {
-    onopen([this]() {
-      this->effect->reset(this->samplerate(), this->blocksize());
-    });
-  }
-
-  onstart([this]() {
-    this->index = {0, 0};
-    this->underflows = {false, 0};
-  });
-}
+  queue((queue != nullptr) ? queue : std::make_shared<AudioBlockQueue>()) {}
 
 std::shared_ptr<AudioEffect> AudioSink::fx() const {
   return effect;
@@ -58,3 +46,14 @@ void AudioSink::callback(const std::span<float> samples) {
 
   ++index.outer;
 }
+
+void AudioSink::onopen() {
+  if (effect) {
+    effect->reset(samplerate(), blocksize());
+  }
+}
+
+void AudioSink::onstart() {
+  index = {0, 0};
+  underflows = {false, 0};
+}

voicesmith/src/main/cpp/de/jurihock/voicesmith/io/AudioSink.h

@@ -23,6 +23,9 @@ class AudioSink final : public AudioStream {
 
   void callback(const std::span<float> samples) override;
 
+  void onopen() override;
+  void onstart() override;
+
 private:
 
   const std::shared_ptr<AudioEffect> effect;

voicesmith/src/main/cpp/de/jurihock/voicesmith/io/AudioSource.cpp

@@ -9,18 +9,7 @@ AudioSource::AudioSource(const std::optional<int> device,
                          const std::shared_ptr<AudioBlockQueue> queue) :
   AudioStream(oboe::Direction::Input, device, samplerate, blocksize),
   effect(effect),
-  queue((queue != nullptr) ? queue : std::make_shared<AudioBlockQueue>()) {
-
-  if (effect) {
-    onopen([this]() {
-      this->effect->reset(this->samplerate(), this->blocksize());
-    });
-  }
-
-  onstart([this]() {
-    this->index = {0, 0};
-  });
-}
+  queue((queue != nullptr) ? queue : std::make_shared<AudioBlockQueue>()) {}
 
 std::shared_ptr<AudioEffect> AudioSource::fx() const {
   return effect;
@@ -46,3 +35,13 @@ void AudioSource::callback(const std::span<float> samples) {
 
   ++index.outer;
 }
+
+void AudioSource::onopen() {
+  if (effect) {
+    effect->reset(samplerate(), blocksize());
+  }
+}
+
+void AudioSource::onstart() {
+  index = {0, 0};
+}

voicesmith/src/main/cpp/de/jurihock/voicesmith/io/AudioSource.h

@@ -23,6 +23,9 @@ class AudioSource final : public AudioStream {
 
   void callback(const std::span<float> samples) override;
 
+  void onopen() override;
+  void onstart() override;
+
 private:
 
   const std::shared_ptr<AudioEffect> effect;