diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-04-23 18:12:20 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-04-23 18:12:20 +0200 |
| commit | 05ddc80ea22cee3c97f274b1d5c3d3d1d5cafdbd (patch) | |
| tree | d1b9a842f2d767a0d05b1a23c3a0a4746d2b5e70 /src/audio/AudioManager.cpp | |
| parent | Merge remote-tracking branch 'upstream/master' (diff) | |
| parent | removed fix that made no sense (diff) | |
| download | re3-05ddc80ea22cee3c97f274b1d5c3d3d1d5cafdbd.tar re3-05ddc80ea22cee3c97f274b1d5c3d3d1d5cafdbd.tar.gz re3-05ddc80ea22cee3c97f274b1d5c3d3d1d5cafdbd.tar.bz2 re3-05ddc80ea22cee3c97f274b1d5c3d3d1d5cafdbd.tar.lz re3-05ddc80ea22cee3c97f274b1d5c3d3d1d5cafdbd.tar.xz re3-05ddc80ea22cee3c97f274b1d5c3d3d1d5cafdbd.tar.zst re3-05ddc80ea22cee3c97f274b1d5c3d3d1d5cafdbd.zip | |
Diffstat (limited to 'src/audio/AudioManager.cpp')
| -rw-r--r-- | src/audio/AudioManager.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/audio/AudioManager.cpp b/src/audio/AudioManager.cpp index f836f1c4..0c4b007f 100644 --- a/src/audio/AudioManager.cpp +++ b/src/audio/AudioManager.cpp @@ -9548,6 +9548,9 @@ cAudioManager::ResetTimers(uint32 time) SampleManager.SetEffectsFadeVolume(0); SampleManager.SetMusicFadeVolume(0); MusicManager.ResetMusicAfterReload(); +#ifdef OPENAL + SampleManager.Service(); +#endif } } @@ -9603,6 +9606,9 @@ cAudioManager::ServiceSoundEffects() ProcessMissionAudio(); AdjustSamplesVolume(); ProcessActiveQueues(); +#ifdef OPENAL + SampleManager.Service(); +#endif for(int32 i = 0; i < m_sAudioScriptObjectManager.m_nScriptObjectEntityTotal; ++i) { cAudioScriptObject *object = (cAudioScriptObject *)m_asAudioEntities[m_sAudioScriptObjectManager.m_anScriptObjectEntityIndices[i]] @@ -9983,7 +9989,7 @@ cAudioManager::Terminate() m_sAudioScriptObjectManager.m_nScriptObjectEntityTotal = 0; PreTerminateGameSpecificShutdown(); - for(uint32 i = 0; i < DIGITALCHANNELS; i++) { + for(uint32 i = 0; i < MAX_SAMPLEBANKS; i++) { if(SampleManager.IsSampleBankLoaded(i)) SampleManager.UnloadSampleBank(i); } |