From 320624edc87778960906d28252752f2471f8a571 Mon Sep 17 00:00:00 2001 From: Sergeanur Date: Mon, 30 Aug 2021 11:25:14 +0300 Subject: [PATCH] Audio: ps2 code ifdef # Conflicts: # src/audio/AudioManager.h --- src/audio/AudioManager.cpp | 16 +++++++++------- src/audio/AudioManager.h | 4 +++- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/audio/AudioManager.cpp b/src/audio/AudioManager.cpp index 8921ff7b..a0afe94d 100644 --- a/src/audio/AudioManager.cpp +++ b/src/audio/AudioManager.cpp @@ -1393,13 +1393,6 @@ cAudioManager::ClearActiveSamples() } } -void -cAudioManager::LoadBankIfNecessary(uint8 bank) -{ - if(!SampleManager.IsSampleBankLoaded(bank)) - SampleManager.LoadSampleBank(bank); -} - void cAudioManager::GenerateIntegerRandomNumberTable() { @@ -1407,6 +1400,15 @@ cAudioManager::GenerateIntegerRandomNumberTable() m_anRandomTable[i] = myrand(); } +#ifdef GTA_PS2 +void +cAudioManager::LoadBankIfNecessary(uint8 bank) +{ + if(!SampleManager.IsSampleBankLoaded(bank)) + SampleManager.LoadSampleBank(bank); +} +#endif + #ifdef EXTERNAL_3D_SOUND void cAudioManager::AdjustSamplesVolume() diff --git a/src/audio/AudioManager.h b/src/audio/AudioManager.h index b537c37e..1312826b 100644 --- a/src/audio/AudioManager.h +++ b/src/audio/AudioManager.h @@ -349,7 +349,9 @@ public: void ClearRequestedQueue(); // inlined in vc void ClearActiveSamples(); void GenerateIntegerRandomNumberTable(); - void LoadBankIfNecessary(uint8 bank); +#ifdef GTA_PS2 + void LoadBankIfNecessary(uint8 bank); // this is used only on PS2 but technically not a platform code +#endif #ifdef EXTERNAL_3D_SOUND // actually must have been && AUDIO_MSS as well void AdjustSamplesVolume(); // inlined