diff options
Diffstat (limited to 'scumm/imuse_digi/dimuse_sndmgr.cpp')
| -rw-r--r-- | scumm/imuse_digi/dimuse_sndmgr.cpp | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/scumm/imuse_digi/dimuse_sndmgr.cpp b/scumm/imuse_digi/dimuse_sndmgr.cpp index 87848d7853..d10c04f100 100644 --- a/scumm/imuse_digi/dimuse_sndmgr.cpp +++ b/scumm/imuse_digi/dimuse_sndmgr.cpp @@ -352,18 +352,17 @@ int ImuseDigiSndMgr::getJumpIdByRegionId(soundStruct *soundHandle, int number) { return -1; } -int ImuseDigiSndMgr::getSyncSizeById(soundStruct *soundHandle, int number) { +void ImuseDigiSndMgr::getSyncSizeAndPtrById(soundStruct *soundHandle, int number, int32 &sync_size, byte **sync_ptr) { Common::StackLock tmpLock(_mutex); assert(soundHandle && checkForProperHandle(soundHandle)); - assert(number >= 0 && number < soundHandle->numSyncs); - return soundHandle->sync[number].size; -} - -byte *ImuseDigiSndMgr::getSyncPtrById(soundStruct *soundHandle, int number) { - Common::StackLock tmpLock(_mutex); - assert(soundHandle && checkForProperHandle(soundHandle)); - assert(number >= 0 && number < soundHandle->numSyncs); - return soundHandle->sync[number].ptr; + assert(number >= 0); + if (number < soundHandle->numSyncs) { + sync_size = soundHandle->sync[number].size; + *sync_ptr = soundHandle->sync[number].ptr; + } else { + sync_size = 0; + *sync_ptr = NULL; + } } int ImuseDigiSndMgr::getRegionIdByHookId(soundStruct *soundHandle, int number) { |