Moved out AudioSamplePool

captainurist · Nov 9, 2023 · 31c774a · 31c774a
1 parent cb3a74c
commit 31c774a
Show file tree

Hide file tree

Showing 5 changed files with 160 additions and 147 deletions.
diff --git a/src/Media/Audio/AudioPlayer.cpp b/src/Media/Audio/AudioPlayer.cpp
@@ -39,6 +39,16 @@ constexpr Pid FAKE_HOUSE_SPEECH_PID = Pid::fromPacked(-6);
 
 extern OpenALSoundProvider *provider;
 
+// TODO(captainurist): doesn't belong here
+#pragma pack(push, 1)
+struct SoundHeader_mm7 {
+    char pSoundName[40];
+    uint32_t uFileOffset;
+    uint32_t uCompressedSize;
+    uint32_t uDecompressedSize;
+};
+#pragma pack(pop)
+
 AudioPlayer::~AudioPlayer() = default;
 
 void AudioPlayer::MusicPlayTrack(MusicID eTrack) {
@@ -395,124 +405,6 @@ bool AudioPlayer::isWalkingSoundPlays() {
     return false;
 }
 
-bool AudioSamplePool::playNew(PAudioSample sample, PAudioDataSource source, bool positional) {
-    update();
-    if (!sample->Open(source)) {
-        return false;
-    }
-    sample->Play(_looping, positional);
-    _samplePool.push_back(AudioSamplePoolEntry(sample, SOUND_Invalid, Pid()));
-    return true;
-}
-
-bool AudioSamplePool::playUniqueSoundId(PAudioSample sample, PAudioDataSource source, SoundID id, bool positional) {
-    update();
-    for (AudioSamplePoolEntry &entry : _samplePool) {
-        if (entry.id == id) {
-            return true;
-        }
-    }
-    if (!sample->Open(source)) {
-        return false;
-    }
-    sample->Play(_looping, positional);
-    _samplePool.push_back(AudioSamplePoolEntry(sample, id, Pid()));
-    return true;
-}
-
-bool AudioSamplePool::playUniquePid(PAudioSample sample, PAudioDataSource source, Pid pid, bool positional) {
-    update();
-    for (AudioSamplePoolEntry &entry : _samplePool) {
-        if (entry.pid == pid) {
-            return true;
-        }
-    }
-    if (!sample->Open(source)) {
-        return false;
-    }
-    sample->Play(_looping, positional);
-    _samplePool.push_back(AudioSamplePoolEntry(sample, SOUND_Invalid, pid));
-    return true;
-}
-
-void AudioSamplePool::pause() {
-    update();
-    for (AudioSamplePoolEntry &entry : _samplePool) {
-        entry.samplePtr->Pause();
-    }
-}
-
-void AudioSamplePool::resume() {
-    update();
-    for (AudioSamplePoolEntry &entry : _samplePool) {
-        entry.samplePtr->Resume();
-    }
-}
-
-void AudioSamplePool::stop() {
-    for (AudioSamplePoolEntry &entry : _samplePool) {
-        entry.samplePtr->Stop();
-    }
-    _samplePool.clear();
-}
-
-void AudioSamplePool::stopSoundId(SoundID soundId) {
-    assert(soundId != SOUND_Invalid);
-
-    auto it = _samplePool.begin();
-    while (it != _samplePool.end()) {
-        if ((*it).id == soundId) {
-            (*it).samplePtr->Stop();
-            it = _samplePool.erase(it);
-        } else {
-            it++;
-        }
-    }
-}
-
-void AudioSamplePool::stopPid(Pid pid) {
-    assert(pid != Pid());
-
-    auto it = _samplePool.begin();
-    while (it != _samplePool.end()) {
-        if ((*it).pid == pid) {
-            (*it).samplePtr->Stop();
-            it = _samplePool.erase(it);
-        } else {
-            it++;
-        }
-    }
-}
-
-void AudioSamplePool::update() {
-    auto it = _samplePool.begin();
-    std::erase_if(_samplePool, [](const AudioSamplePoolEntry& entry) { return entry.samplePtr->IsStopped(); });
-}
-
-void AudioSamplePool::setVolume(float value) {
-    for (AudioSamplePoolEntry &entry : _samplePool) {
-        entry.samplePtr->SetVolume(value);
-    }
-}
-
-bool AudioSamplePool::hasPlaying() {
-    for (AudioSamplePoolEntry &entry : _samplePool) {
-        if (!entry.samplePtr->IsStopped()) {
-            return true;
-        }
-    }
-    return false;
-}
-
-#pragma pack(push, 1)
-struct SoundHeader_mm7 {
-    char pSoundName[40];
-    uint32_t uFileOffset;
-    uint32_t uCompressedSize;
-    uint32_t uDecompressedSize;
-};
-#pragma pack(pop)
-
 void AudioPlayer::LoadAudioSnd() {
     static_assert(sizeof(SoundHeader_mm7) == 52, "Wrong type size");
 

diff --git a/src/Media/Audio/AudioPlayer.h b/src/Media/Audio/AudioPlayer.h
@@ -16,35 +16,7 @@
 #include "Utility/Streams/FileInputStream.h"
 
 #include "SoundEnums.h"
-
-struct AudioSamplePoolEntry {
-    AudioSamplePoolEntry(PAudioSample samplePtr, SoundID id, Pid pid) : samplePtr(samplePtr), id(id), pid(pid) {}
-
-    PAudioSample samplePtr;
-    SoundID id;
-    Pid pid;
-};
-
-class AudioSamplePool {
- public:
-    explicit AudioSamplePool(bool looping):_looping(looping) {}
-
-    bool playNew(PAudioSample sample, PAudioDataSource source, bool positional = false);
-    bool playUniqueSoundId(PAudioSample sample, PAudioDataSource source, SoundID id, bool positional = false);
-    bool playUniquePid(PAudioSample sample, PAudioDataSource source, Pid pid, bool positional = false);
-    void pause();
-    void resume();
-    void stop();
-    void stopSoundId(SoundID soundId);
-    void stopPid(Pid pid);
-    void update();
-    void setVolume(float value);
-    bool hasPlaying();
- private:
-    std::list<AudioSamplePoolEntry> _samplePool;
-    bool _looping;
-};
-
+#include "AudioSamplePool.h"
 
 class AudioPlayer {
  protected:

diff --git a/src/Media/Audio/AudioSamplePool.cpp b/src/Media/Audio/AudioSamplePool.cpp
@@ -0,0 +1,110 @@
+#include "AudioSamplePool.h"
+
+bool AudioSamplePool::playNew(PAudioSample sample, PAudioDataSource source, bool positional) {
+    update();
+    if (!sample->Open(source)) {
+        return false;
+    }
+    sample->Play(_looping, positional);
+    _samplePool.push_back(AudioSamplePoolEntry(sample, SOUND_Invalid, Pid()));
+    return true;
+}
+
+bool AudioSamplePool::playUniqueSoundId(PAudioSample sample, PAudioDataSource source, SoundID id, bool positional) {
+    update();
+    for (AudioSamplePoolEntry &entry : _samplePool) {
+        if (entry.id == id) {
+            return true;
+        }
+    }
+    if (!sample->Open(source)) {
+        return false;
+    }
+    sample->Play(_looping, positional);
+    _samplePool.push_back(AudioSamplePoolEntry(sample, id, Pid()));
+    return true;
+}
+
+bool AudioSamplePool::playUniquePid(PAudioSample sample, PAudioDataSource source, Pid pid, bool positional) {
+    update();
+    for (AudioSamplePoolEntry &entry : _samplePool) {
+        if (entry.pid == pid) {
+            return true;
+        }
+    }
+    if (!sample->Open(source)) {
+        return false;
+    }
+    sample->Play(_looping, positional);
+    _samplePool.push_back(AudioSamplePoolEntry(sample, SOUND_Invalid, pid));
+    return true;
+}
+
+void AudioSamplePool::pause() {
+    update();
+    for (AudioSamplePoolEntry &entry : _samplePool) {
+        entry.samplePtr->Pause();
+    }
+}
+
+void AudioSamplePool::resume() {
+    update();
+    for (AudioSamplePoolEntry &entry : _samplePool) {
+        entry.samplePtr->Resume();
+    }
+}
+
+void AudioSamplePool::stop() {
+    for (AudioSamplePoolEntry &entry : _samplePool) {
+        entry.samplePtr->Stop();
+    }
+    _samplePool.clear();
+}
+
+void AudioSamplePool::stopSoundId(SoundID soundId) {
+    assert(soundId != SOUND_Invalid);
+
+    auto it = _samplePool.begin();
+    while (it != _samplePool.end()) {
+        if ((*it).id == soundId) {
+            (*it).samplePtr->Stop();
+            it = _samplePool.erase(it);
+        } else {
+            it++;
+        }
+    }
+}
+
+void AudioSamplePool::stopPid(Pid pid) {
+    assert(pid != Pid());
+
+    auto it = _samplePool.begin();
+    while (it != _samplePool.end()) {
+        if ((*it).pid == pid) {
+            (*it).samplePtr->Stop();
+            it = _samplePool.erase(it);
+        } else {
+            it++;
+        }
+    }
+}
+
+void AudioSamplePool::update() {
+    auto it = _samplePool.begin();
+    std::erase_if(_samplePool, [](const AudioSamplePoolEntry& entry) { return entry.samplePtr->IsStopped(); });
+}
+
+void AudioSamplePool::setVolume(float value) {
+    for (AudioSamplePoolEntry &entry : _samplePool) {
+        entry.samplePtr->SetVolume(value);
+    }
+}
+
+bool AudioSamplePool::hasPlaying() {
+    for (AudioSamplePoolEntry &entry : _samplePool) {
+        if (!entry.samplePtr->IsStopped()) {
+            return true;
+        }
+    }
+    return false;
+}
diff --git a/src/Media/Audio/AudioSamplePool.h b/src/Media/Audio/AudioSamplePool.h
@@ -0,0 +1,37 @@
+#pragma once
+
+#include <list>
+
+#include "Engine/Pid.h"
+
+#include "Media/Media.h"
+
+#include "SoundEnums.h"
+
+struct AudioSamplePoolEntry {
+    AudioSamplePoolEntry(PAudioSample samplePtr, SoundID id, Pid pid) : samplePtr(samplePtr), id(id), pid(pid) {}
+
+    PAudioSample samplePtr;
+    SoundID id;
+    Pid pid;
+};
+
+class AudioSamplePool {
+ public:
+    explicit AudioSamplePool(bool looping):_looping(looping) {}
+
+    bool playNew(PAudioSample sample, PAudioDataSource source, bool positional = false);
+    bool playUniqueSoundId(PAudioSample sample, PAudioDataSource source, SoundID id, bool positional = false);
+    bool playUniquePid(PAudioSample sample, PAudioDataSource source, Pid pid, bool positional = false);
+    void pause();
+    void resume();
+    void stop();
+    void stopSoundId(SoundID soundId);
+    void stopPid(Pid pid);
+    void update();
+    void setVolume(float value);
+    bool hasPlaying();
+ private:
+    std::list<AudioSamplePoolEntry> _samplePool;
+    bool _looping;
+};
diff --git a/src/Media/Audio/CMakeLists.txt b/src/Media/Audio/CMakeLists.txt
@@ -2,11 +2,13 @@ cmake_minimum_required(VERSION 3.24 FATAL_ERROR)
 
 set(MEDIA_AUDIO_SOURCES
         AudioPlayer.cpp
+        AudioSamplePool.cpp
         OpenALSoundProvider.cpp
         SoundList.cpp)
 
 set(MEDIA_AUDIO_HEADERS
         AudioPlayer.h
+        AudioSamplePool.h
         OpenALSoundProvider.h
         SoundEnums.h
         SoundInfo.h