diff options
author | Sergeanur <s.anureev@yandex.ua> | 2021-07-27 21:30:45 +0200 |
---|---|---|
committer | Sergeanur <s.anureev@yandex.ua> | 2021-07-27 21:30:45 +0200 |
commit | fbb42085bd0d300fd42b49ae5469415de153f8d5 (patch) | |
tree | a70264d9d8daec811156c67ab415fdea2278cf62 /src/audio/AudioManager.cpp | |
parent | fix (diff) | |
parent | AudioManager.cpp reordering (diff) | |
download | re3-fbb42085bd0d300fd42b49ae5469415de153f8d5.tar re3-fbb42085bd0d300fd42b49ae5469415de153f8d5.tar.gz re3-fbb42085bd0d300fd42b49ae5469415de153f8d5.tar.bz2 re3-fbb42085bd0d300fd42b49ae5469415de153f8d5.tar.lz re3-fbb42085bd0d300fd42b49ae5469415de153f8d5.tar.xz re3-fbb42085bd0d300fd42b49ae5469415de153f8d5.tar.zst re3-fbb42085bd0d300fd42b49ae5469415de153f8d5.zip |
Diffstat (limited to 'src/audio/AudioManager.cpp')
-rw-r--r-- | src/audio/AudioManager.cpp | 66 |
1 files changed, 40 insertions, 26 deletions
diff --git a/src/audio/AudioManager.cpp b/src/audio/AudioManager.cpp index f8fc5ff1..d348737a 100644 --- a/src/audio/AudioManager.cpp +++ b/src/audio/AudioManager.cpp @@ -218,39 +218,39 @@ cAudioManager::PlayOneShot(int32 index, uint16 sound, float vol) } void -cAudioManager::SetMP3BoostVolume(uint8 volume) const +cAudioManager::SetEffectsMasterVolume(uint8 volume) { - SampleManager.SetMP3BoostVolume(volume); + SampleManager.SetEffectsMasterVolume(volume); } void -cAudioManager::SetEffectsMasterVolume(uint8 volume) const +cAudioManager::SetMusicMasterVolume(uint8 volume) { - SampleManager.SetEffectsMasterVolume(volume); + SampleManager.SetMusicMasterVolume(volume); } void -cAudioManager::SetMusicMasterVolume(uint8 volume) const +cAudioManager::SetMP3BoostVolume(uint8 volume) { - SampleManager.SetMusicMasterVolume(volume); + SampleManager.SetMP3BoostVolume(volume); } void -cAudioManager::SetEffectsFadeVol(uint8 volume) const +cAudioManager::SetEffectsFadeVol(uint8 volume) { SampleManager.SetEffectsFadeVolume(volume); } void -cAudioManager::SetMonoMode(bool8 mono) +cAudioManager::SetMusicFadeVol(uint8 volume) { - SampleManager.SetMonoMode(mono); + SampleManager.SetMusicFadeVolume(volume); } void -cAudioManager::SetMusicFadeVol(uint8 volume) const +cAudioManager::SetMonoMode(bool8 mono) { - SampleManager.SetMusicFadeVolume(volume); + SampleManager.SetMonoMode(mono); } void @@ -319,8 +319,10 @@ cAudioManager::DestroyAllGameCreatedEntities() } } +#ifdef GTA_PC + uint8 -cAudioManager::GetNum3DProvidersAvailable() const +cAudioManager::GetNum3DProvidersAvailable() { if (m_bIsInitialised) return SampleManager.GetNum3DProvidersAvailable(); @@ -328,7 +330,7 @@ cAudioManager::GetNum3DProvidersAvailable() const } char * -cAudioManager::Get3DProviderName(uint8 id) const +cAudioManager::Get3DProviderName(uint8 id) { if (!m_bIsInitialised) return nil; @@ -343,7 +345,7 @@ cAudioManager::Get3DProviderName(uint8 id) const } int8 -cAudioManager::GetCurrent3DProviderIndex() const +cAudioManager::GetCurrent3DProviderIndex() { if (m_bIsInitialised) return SampleManager.GetCurrent3DProviderIndex(); @@ -352,7 +354,7 @@ cAudioManager::GetCurrent3DProviderIndex() const } int8 -cAudioManager::AutoDetect3DProviders() const +cAudioManager::AutoDetect3DProviders() { if (m_bIsInitialised) return SampleManager.AutoDetect3DProviders(); @@ -384,13 +386,13 @@ cAudioManager::SetCurrent3DProvider(uint8 which) } void -cAudioManager::SetSpeakerConfig(int32 conf) const +cAudioManager::SetSpeakerConfig(int32 conf) { SampleManager.SetSpeakerConfig(conf); } bool8 -cAudioManager::IsMP3RadioChannelAvailable() const +cAudioManager::IsMP3RadioChannelAvailable() { if (m_bIsInitialised) return SampleManager.IsMP3RadioChannelAvailable(); @@ -399,7 +401,7 @@ cAudioManager::IsMP3RadioChannelAvailable() const } void -cAudioManager::ReleaseDigitalHandle() const +cAudioManager::ReleaseDigitalHandle() { if (m_bIsInitialised) { SampleManager.ReleaseDigitalHandle(); @@ -407,7 +409,7 @@ cAudioManager::ReleaseDigitalHandle() const } void -cAudioManager::ReacquireDigitalHandle() const +cAudioManager::ReacquireDigitalHandle() { if (m_bIsInitialised) { SampleManager.ReacquireDigitalHandle(); @@ -421,24 +423,26 @@ cAudioManager::SetDynamicAcousticModelingStatus(bool8 status) } bool8 -cAudioManager::CheckForAnAudioFileOnCD() const +cAudioManager::CheckForAnAudioFileOnCD() { return SampleManager.CheckForAnAudioFileOnCD(); } char -cAudioManager::GetCDAudioDriveLetter() const +cAudioManager::GetCDAudioDriveLetter() { if(m_bIsInitialised) return SampleManager.GetCDAudioDriveLetter(); return '\0'; } bool8 -cAudioManager::IsAudioInitialised() const +cAudioManager::IsAudioInitialised() { return m_bIsInitialised; } +#endif // GTA_PC + void cAudioManager::ServiceSoundEffects() { @@ -497,7 +501,7 @@ cAudioManager::ServiceSoundEffects() } uint8 -cAudioManager::ComputeVolume(uint8 emittingVolume, float soundIntensity, float distance) const +cAudioManager::ComputeVolume(uint8 emittingVolume, float soundIntensity, float distance) { float newSoundIntensity; float newEmittingVolume; @@ -515,7 +519,7 @@ cAudioManager::ComputeVolume(uint8 emittingVolume, float soundIntensity, float d } void -cAudioManager::TranslateEntity(Const CVector *in, CVector *out) const +cAudioManager::TranslateEntity(Const CVector *in, CVector *out) { *out = MultiplyInverse(TheCamera.GetMatrix(), *in); } @@ -533,7 +537,7 @@ cAudioManager::ComputePan(float dist, CVector *vec) } uint32 -cAudioManager::ComputeDopplerEffectedFrequency(uint32 oldFreq, float position1, float position2, float speedMultiplier) const +cAudioManager::ComputeDopplerEffectedFrequency(uint32 oldFreq, float position1, float position2, float speedMultiplier) { uint32 newFreq = oldFreq; if (!TheCamera.Get_Just_Switched_Status() && speedMultiplier != 0.0f) { @@ -550,7 +554,7 @@ cAudioManager::ComputeDopplerEffectedFrequency(uint32 oldFreq, float position1, } int32 -cAudioManager::RandomDisplacement(uint32 seed) const +cAudioManager::RandomDisplacement(uint32 seed) { int32 value; @@ -624,6 +628,7 @@ cAudioManager::AddSampleToRequestedQueue() AddReflectionsToRequestedQueue(); } } + void cAudioManager::AddDetailsToRequestedOrderList(uint8 sample) { @@ -641,6 +646,7 @@ cAudioManager::AddDetailsToRequestedOrderList(uint8 sample) m_abSampleQueueIndexTable[m_nActiveSampleQueue][i] = sample; } +#ifdef GTA_PC void cAudioManager::AddReflectionsToRequestedQueue() { @@ -778,6 +784,7 @@ cAudioManager::UpdateReflections() m_afReflectionsDistances[7] = 100.0f; } } +#endif // GTA_PC void cAudioManager::AddReleasingSounds() @@ -1074,6 +1081,13 @@ cAudioManager::ClearActiveSamples() } void +cAudioManager::LoadBankIfNecessary(uint8 bank) +{ + if(!SampleManager.IsSampleBankLoaded(bank)) + SampleManager.LoadSampleBank(bank); +} + +void cAudioManager::GenerateIntegerRandomNumberTable() { for (int32 i = 0; i < ARRAY_SIZE(m_anRandomTable); i++) { |