summaryrefslogtreecommitdiffstats
path: root/src/audio
diff options
context:
space:
mode:
authorFire_Head <Fire-Head@users.noreply.github.com>2020-06-29 10:23:02 +0200
committerGitHub <noreply@github.com>2020-06-29 10:23:02 +0200
commita01fe76db72a8890f56da21c9e04503f487e7654 (patch)
treebdab5315528220a05436eeb81756784ac74930b9 /src/audio
parentMerge remote-tracking branch 'upstream/master' (diff)
parentUpdate MBlur.cpp (diff)
downloadre3-a01fe76db72a8890f56da21c9e04503f487e7654.tar
re3-a01fe76db72a8890f56da21c9e04503f487e7654.tar.gz
re3-a01fe76db72a8890f56da21c9e04503f487e7654.tar.bz2
re3-a01fe76db72a8890f56da21c9e04503f487e7654.tar.lz
re3-a01fe76db72a8890f56da21c9e04503f487e7654.tar.xz
re3-a01fe76db72a8890f56da21c9e04503f487e7654.tar.zst
re3-a01fe76db72a8890f56da21c9e04503f487e7654.zip
Diffstat (limited to 'src/audio')
-rw-r--r--src/audio/AudioLogic.cpp6
-rw-r--r--src/audio/AudioManager.cpp12
-rw-r--r--src/audio/AudioManager.h4
-rw-r--r--src/audio/DMAudio.cpp6
-rw-r--r--src/audio/DMAudio.h1
-rw-r--r--src/audio/soundlist.h4
6 files changed, 23 insertions, 10 deletions
diff --git a/src/audio/AudioLogic.cpp b/src/audio/AudioLogic.cpp
index 58fd9ef3..77e3a6b5 100644
--- a/src/audio/AudioLogic.cpp
+++ b/src/audio/AudioLogic.cpp
@@ -8125,12 +8125,12 @@ cAudioManager::ProcessFrontEnd()
stereo = true;
frontendBank = true;
break;
- case SOUND_9A:
+ case SOUND_FRONTEND_STEREO:
m_sQueueSample.m_nSampleIndex = SFX_STEREO_LEFT;
stereo = true;
frontendBank = true;
break;
- case SOUND_9B:
+ case SOUND_FRONTEND_MONO:
m_sQueueSample.m_nSampleIndex = SFX_MONO;
frontendBank = true;
break;
@@ -8858,4 +8858,4 @@ cAudioManager::ProcessMissionAudio()
break;
}
}
-#pragma endregion All the mission audio stuff \ No newline at end of file
+#pragma endregion All the mission audio stuff
diff --git a/src/audio/AudioManager.cpp b/src/audio/AudioManager.cpp
index c34ad90a..757254e6 100644
--- a/src/audio/AudioManager.cpp
+++ b/src/audio/AudioManager.cpp
@@ -235,6 +235,12 @@ cAudioManager::SetEffectsFadeVol(uint8 volume) const
}
void
+cAudioManager::SetMonoMode(uint8 mono)
+{
+ SampleManager.SetMonoMode(mono);
+}
+
+void
cAudioManager::SetMusicFadeVol(uint8 volume) const
{
SampleManager.SetMusicFadeVolume(volume);
@@ -384,9 +390,9 @@ cAudioManager::ReacquireDigitalHandle() const
}
void
-cAudioManager::SetDynamicAcousticModelingStatus(bool status)
+cAudioManager::SetDynamicAcousticModelingStatus(uint8 status)
{
- m_bDynamicAcousticModelingStatus = status;
+ m_bDynamicAcousticModelingStatus = status!=0;
}
bool
@@ -966,4 +972,4 @@ cAudioManager::ComputeEmittingVolume(uint8 emittingVolume, float intensity, floa
return (quatIntensity - (dist - diffIntensity)) * (float)emittingVolume / quatIntensity;
return emittingVolume;
}
-#endif
+#endif \ No newline at end of file
diff --git a/src/audio/AudioManager.h b/src/audio/AudioManager.h
index 190d9add..52c26552 100644
--- a/src/audio/AudioManager.h
+++ b/src/audio/AudioManager.h
@@ -443,14 +443,14 @@ public:
void ServicePoliceRadioChannel(int32 wantedLevel);
void ServiceSoundEffects();
int8 SetCurrent3DProvider(uint8 which);
- void SetDynamicAcousticModelingStatus(bool status);
+ void SetDynamicAcousticModelingStatus(uint8 status);
void SetEffectsFadeVol(uint8 volume) const;
void SetEffectsMasterVolume(uint8 volume) const;
void SetEntityStatus(int32 id, uint8 status);
uint32 SetLoopingCollisionRequestedSfxFreqAndGetVol(const cAudioCollision &audioCollision);
void SetMissionAudioLocation(float x, float y, float z);
void SetMissionScriptPoliceAudio(int32 sfx) const;
- void SetMonoMode(uint8); // todo (mobile)
+ void SetMonoMode(uint8 mono);
void SetMusicFadeVol(uint8 volume) const;
void SetMusicMasterVolume(uint8 volume) const;
void SetSpeakerConfig(int32 conf) const;
diff --git a/src/audio/DMAudio.cpp b/src/audio/DMAudio.cpp
index 76b134ec..dd55f76d 100644
--- a/src/audio/DMAudio.cpp
+++ b/src/audio/DMAudio.cpp
@@ -59,6 +59,12 @@ cDMAudio::DestroyAllGameCreatedEntities(void)
}
void
+cDMAudio::SetMonoMode(uint8 mono)
+{
+ AudioManager.SetMonoMode(mono);
+}
+
+void
cDMAudio::SetEffectsMasterVolume(uint8 volume)
{
uint8 vol = volume;
diff --git a/src/audio/DMAudio.h b/src/audio/DMAudio.h
index c0e1de1d..bb95f303 100644
--- a/src/audio/DMAudio.h
+++ b/src/audio/DMAudio.h
@@ -26,6 +26,7 @@ public:
void PlayOneShot(int32 audioEntity, uint16 oneShot, float volume);
void DestroyAllGameCreatedEntities(void);
+ void SetMonoMode(uint8 mono);
void SetEffectsMasterVolume(uint8 volume);
void SetMusicMasterVolume(uint8 volume);
void SetEffectsFadeVol(uint8 volume);
diff --git a/src/audio/soundlist.h b/src/audio/soundlist.h
index c88229a2..856b691a 100644
--- a/src/audio/soundlist.h
+++ b/src/audio/soundlist.h
@@ -156,8 +156,8 @@ enum eSound : uint16
SOUND_FRONTEND_MENU_NAVIGATION,
SOUND_FRONTEND_MENU_SETTING_CHANGE,
SOUND_FRONTEND_MENU_BACK,
- SOUND_9A,
- SOUND_9B,
+ SOUND_FRONTEND_STEREO,
+ SOUND_FRONTEND_MONO,
SOUND_FRONTEND_AUDIO_TEST,
SOUND_FRONTEND_FAIL,
SOUND_FRONTEND_NO_RADIO,