summaryrefslogtreecommitdiffstats
path: root/src/audio
diff options
context:
space:
mode:
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
5 files changed, 21 insertions, 8 deletions
diff --git a/src/audio/AudioLogic.cpp b/src/audio/AudioLogic.cpp
index 5d8ee745..54aa5300 100644
--- a/src/audio/AudioLogic.cpp
+++ b/src/audio/AudioLogic.cpp
@@ -4775,8 +4775,8 @@ cAudioManager::ProcessFrontEnd()
m_sQueueSample.m_nSampleIndex = SFX_FE_SELECT_LEFT;
stereo = true;
frontendBank = true;
- frontendBank = true;
- frontendBank = true;
+
+
break;
//case SOUND_FRONTEND_EXIT:
// m_sQueueSample.m_nSampleIndex = SFX_SUB_MENU_BACK_LEFT;
@@ -5906,4 +5906,4 @@ cAudioManager::ProcessMissionAudio()
field_5538 = 127;
}
}
-#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 d8d28e1e..8c795477 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);
@@ -385,9 +391,9 @@ cAudioManager::ReacquireDigitalHandle() const
}
void
-cAudioManager::SetDynamicAcousticModelingStatus(bool status)
+cAudioManager::SetDynamicAcousticModelingStatus(uint8 status)
{
- m_bDynamicAcousticModelingStatus = status;
+ m_bDynamicAcousticModelingStatus = status!=0;
}
bool
@@ -967,4 +973,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 e89efbd2..738aae58 100644
--- a/src/audio/AudioManager.h
+++ b/src/audio/AudioManager.h
@@ -383,14 +383,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(uint8 slot, 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 7f2dd176..7581114d 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 378b90b2..bb1454c9 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);