RomanRom2/whoa
1
0
Fork 0
mirror of https://github.com/whoahq/whoa.git synced 2026-02-01 00:02:45 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

feat(sound): link ready SEDiskSounds to ready list for processing

Browse Source
This commit is contained in:
fallenoak 2025-11-25 19:53:31 -06:00
parent 95d8bb926d
commit 05a6b15eeb
No known key found for this signature in database
GPG Key ID: 7628F8E61AEA070D
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/sound/SESound.cpp
View File

@ -17,6 +17,7 @@ TSHashTable<SOUND_INTERNAL_LOOKUP, HASHKEY_NONE> SESound::s_InternalLookupTable;
HASHKEY_NONE SESound::s_InternalLookupKey; HASHKEY_NONE SESound::s_InternalLookupKey;
SCritSect SESound::s_LoadingCritSect; SCritSect SESound::s_LoadingCritSect;
FMOD::System* SESound::s_pGameSystem; FMOD::System* SESound::s_pGameSystem;
STORM_EXPLICIT_LIST(SEDiskSound, m_readyLink) SESound::s_ReadyDiskSounds;
uint32_t SESound::s_UniqueID; uint32_t SESound::s_UniqueID;
void* FSoundAllocCallback(uint32_t size, FMOD_MEMORY_TYPE type, const char* sourcestr) { void* FSoundAllocCallback(uint32_t size, FMOD_MEMORY_TYPE type, const char* sourcestr) {
@ -31,14 +32,14 @@ void FSoundFreeCallback(void* ptr, FMOD_MEMORY_TYPE type, const char *sourcestr)
SMemFree(ptr, "FMod", 0, 0x0); SMemFree(ptr, "FMod", 0, 0x0);
} }
FMOD_RESULT DoneLoadingCallback(FMOD_SOUND* sound, FMOD_RESULT callbackResult) { FMOD_RESULT DoneLoadingCallback(FMOD_SOUND* fmodSound, FMOD_RESULT callbackResult) {
FMOD_RESULT result; FMOD_RESULT result;
// Get hash value // Get hash value
void* userData = nullptr; void* userData = nullptr;
result = FMOD_Sound_GetUserData(sound, &userData); result = FMOD_Sound_GetUserData(fmodSound, &userData);
if (result != FMOD_OK && result != FMOD_ERR_CHANNEL_STOLEN && result != FMOD_ERR_INVALID_HANDLE && result != FMOD_ERR_OUTPUT_DRIVERCALL) { if (result != FMOD_OK && result != FMOD_ERR_CHANNEL_STOLEN && result != FMOD_ERR_INVALID_HANDLE && result != FMOD_ERR_OUTPUT_DRIVERCALL) {
LOG_WRITE(result, ""); LOG_WRITE(result, "");
@ -68,12 +69,24 @@ FMOD_RESULT DoneLoadingCallback(FMOD_SOUND* sound, FMOD_RESULT callbackResult) {
return callbackResult; return callbackResult;
} }
// TODO pending load list // Add to ready list (processed by SESound::Heartbeat)
for (auto existing = SESound::s_InternalList.Head(); existing; existing = SESound::s_InternalList.Link(internal)->Next()) {
auto pendingLoad = internal->m_type == 1
&& static_cast<SEDiskSound*>(existing)->m_fmodSound == reinterpret_cast<FMOD::Sound*>(fmodSound)
&& !existing->m_fmodChannel;
if (pendingLoad) {
SESound::s_ReadyDiskSounds.LinkToTail(static_cast<SEDiskSound*>(existing));
}
}
SESound::s_InternalCritSect.Leave(); SESound::s_InternalCritSect.Leave();
SESound::s_LoadingCritSect.Enter(); SESound::s_LoadingCritSect.Enter();
// Mark cache sound node as loaded
if (internal->m_useCache) { if (internal->m_useCache) {
internal->m_cacheNode->loaded = 1; internal->m_cacheNode->loaded = 1;
} }
@ -439,6 +452,7 @@ int32_t SESound::LoadDiskSound(FMOD::System* fmodSystem, const char* filename, F
// TODO // TODO
// Used to permit instant playback of cached sounds
internal->m_nonblockingReady = nonblockingReady; internal->m_nonblockingReady = nonblockingReady;
s_LoadingCritSect.Leave(); s_LoadingCritSect.Leave();

1
src/sound/SESound.hpp
View File

@ -22,6 +22,7 @@ class SESound {
static HASHKEY_NONE s_InternalLookupKey; static HASHKEY_NONE s_InternalLookupKey;
static SCritSect s_LoadingCritSect; static SCritSect s_LoadingCritSect;
static FMOD::System* s_pGameSystem; static FMOD::System* s_pGameSystem;
static STORM_EXPLICIT_LIST(SEDiskSound, m_readyLink) s_ReadyDiskSounds;
static uint32_t s_UniqueID; static uint32_t s_UniqueID;
// Public static functions // Public static functions

1
src/sound/SESoundInternal.hpp
View File

@ -45,6 +45,7 @@ class SEDiskSound : public SESoundInternal {
public: public:
// Member variables // Member variables
// TODO // TODO
TSLink<SEDiskSound> m_readyLink;
SFile* m_file = nullptr; SFile* m_file = nullptr;
// TODO // TODO
FMOD::Sound* m_fmodSound = nullptr; FMOD::Sound* m_fmodSound = nullptr;