summaryrefslogtreecommitdiffstats
path: root/src/audio/AudioManager.cpp
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-04-23 22:10:46 +0200
committeraap <aap@papnet.eu>2020-04-23 22:10:46 +0200
commit6467e2003a0fc9f6bb5f8b86dd699b674f5e5b9a (patch)
treef98c56e1e5428a9cd9dd6c26369a3358727db78b /src/audio/AudioManager.cpp
parentfixed extra directory issues (diff)
parentremoved fix that made no sense (diff)
downloadre3-6467e2003a0fc9f6bb5f8b86dd699b674f5e5b9a.tar
re3-6467e2003a0fc9f6bb5f8b86dd699b674f5e5b9a.tar.gz
re3-6467e2003a0fc9f6bb5f8b86dd699b674f5e5b9a.tar.bz2
re3-6467e2003a0fc9f6bb5f8b86dd699b674f5e5b9a.tar.lz
re3-6467e2003a0fc9f6bb5f8b86dd699b674f5e5b9a.tar.xz
re3-6467e2003a0fc9f6bb5f8b86dd699b674f5e5b9a.tar.zst
re3-6467e2003a0fc9f6bb5f8b86dd699b674f5e5b9a.zip
Diffstat (limited to 'src/audio/AudioManager.cpp')
-rw-r--r--src/audio/AudioManager.cpp8
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);
}