ass::Sound fix (#313)

* ass::Sound fix * onFinished playback fix * invoking onFinished on player's thread
aui-framework · Jul 24, 2024 · 948b5a0 · 948b5a0
1 parent a00450b
commit 948b5a0
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 18 deletions.
diff --git a/aui.audio/src/AUI/Audio/AAudioMixer.cpp b/aui.audio/src/AUI/Audio/AAudioMixer.cpp
@@ -51,8 +51,10 @@ size_t AAudioMixer::readSoundData(std::span<std::byte> destination) {
             return true;
         }), mPlayers.end());
     }
-    for (const auto& player: itemsToRemove) {
-        player->onFinished();
+    for (auto& player: itemsToRemove) {
+        player->getThread()->enqueue([player = std::move(player)]() {
+            player->onFinished();
+        });
     }
 
     return result;

diff --git a/aui.audio/src/AUI/Audio/IAudioPlayer.h b/aui.audio/src/AUI/Audio/IAudioPlayer.h
@@ -59,10 +59,7 @@ class API_AUI_AUDIO IAudioPlayer: public AObject {
      * sound stream would be rewind.
      * @param loop New loop flag
      */
-    void setLoop(bool loop) {
-        mLoop = loop;
-        onLoopSet();
-    }
+    void setLoop(bool loop);
 
     /**
      * @return Current loop flag
@@ -76,11 +73,7 @@ class API_AUI_AUDIO IAudioPlayer: public AObject {
      * @brief Set level of volume.
      * @param volume Integer number from 0 to 256 inclusively, works linear
      */
-    void setVolume(aui::audio::VolumeLevel volume) {
-        mVolume = volume;
-        AUI_NULLSAFE(mResampledStream)->setVolume(volume);
-        onVolumeSet();
-    }
+    void setVolume(aui::audio::VolumeLevel volume);
 
     /**
      * @return Current volume level.
@@ -95,18 +88,13 @@ class API_AUI_AUDIO IAudioPlayer: public AObject {
      * @details
      * See IAudioPlayer::finished for listening for this event.
      */
-    void onFinished() {
-        emit finished;
-    }
+    void onFinished();
 
     const AUrl& url() const noexcept {
         return mUrl;
     }
 
-    void rewind() {
-        release();
-        initialize();
-    }
+    void rewind();
 
 signals:
     /**

diff --git a/aui.audio/src/AUI/Audio/Platform/IAudioPlayer.cpp b/aui.audio/src/AUI/Audio/Platform/IAudioPlayer.cpp
@@ -55,3 +55,27 @@ void IAudioPlayer::release() {
     mResampledStream.reset();
     mSourceStream.reset();
 }
+
+void IAudioPlayer::setLoop(bool loop) {
+    mLoop = loop;
+    onLoopSet();
+}
+
+void IAudioPlayer::setVolume(aui::audio::VolumeLevel volume) {
+    mVolume = volume;
+    AUI_NULLSAFE(mResampledStream)->setVolume(volume);
+    onVolumeSet();
+}
+
+void IAudioPlayer::onFinished() {
+    if (!loop()) {
+        mPlaybackStatus = PlaybackStatus::STOPPED;
+        release();
+    }
+    emit finished;
+}
+
+void IAudioPlayer::rewind() {
+    release();
+    initialize();
+}