1 files changed, 86 insertions, 18 deletions

diff --git a/src/audio/DMAudio.cpp b/src/audio/DMAudio.cpp
index 688da201..3843007d 100644
--- a/src/audio/DMAudio.cpp
+++ b/src/audio/DMAudio.cpp
@@ -63,9 +63,18 @@ cDMAudio::DestroyAllGameCreatedEntities(void)
 }
 
 void
-cDMAudio::SetMonoMode(bool8 mono)
+cDMAudio::SetOutputMode(bool8 surround)
 {
-	AudioManager.SetMonoMode(mono);
+	AudioManager.SetOutputMode(surround);
+}
+
+void
+cDMAudio::SetMP3BoostVolume(uint8 volume)
+{
+	uint8 vol = volume;
+	if (vol > MAX_VOLUME) vol = MAX_VOLUME;
+
+	AudioManager.SetMP3BoostVolume(vol);
 }
 
 void
@@ -116,6 +125,11 @@ cDMAudio::Get3DProviderName(uint8 id)
 	return AudioManager.Get3DProviderName(id);
 }
 
+int8 cDMAudio::AutoDetect3DProviders(void)
+{
+	return AudioManager.AutoDetect3DProviders();
+}
+
 int8
 cDMAudio::GetCurrent3DProviderIndex(void)
 {
@@ -236,13 +250,13 @@ cDMAudio::PlayFrontEndSound(uint16 frontend, uint32 volume)
 }
 
 void
-cDMAudio::PlayRadioAnnouncement(uint8 announcement)
+cDMAudio::PlayRadioAnnouncement(uint32 announcement)
 {
 	MusicManager.PlayAnnouncement(announcement);
 }
 
 void
-cDMAudio::PlayFrontEndTrack(uint8 track, bool8 frontendFlag)
+cDMAudio::PlayFrontEndTrack(uint32 track, bool8 frontendFlag)
 {
 	MusicManager.PlayFrontEndTrack(track, frontendFlag);
 }
@@ -266,7 +280,7 @@ cDMAudio::ChangeMusicMode(uint8 mode)
 }
 
 void
-cDMAudio::PreloadCutSceneMusic(uint8 track)
+cDMAudio::PreloadCutSceneMusic(uint32 track)
 {
 	MusicManager.PreloadCutSceneMusic(track);
 }
@@ -284,39 +298,51 @@ cDMAudio::StopCutSceneMusic(void)
 }
 
 void
-cDMAudio::PreloadMissionAudio(Const char *missionAudio)
+cDMAudio::PreloadMissionAudio(uint8 slot, Const char *missionAudio)
 {
-	AudioManager.PreloadMissionAudio(missionAudio);
+	AudioManager.PreloadMissionAudio(slot, missionAudio);
 }
 
 uint8
-cDMAudio::GetMissionAudioLoadingStatus(void)
+cDMAudio::GetMissionAudioLoadingStatus(uint8 slot)
 {
-	return AudioManager.GetMissionAudioLoadingStatus();
+	return AudioManager.GetMissionAudioLoadingStatus(slot);
 }
 
 void
-cDMAudio::SetMissionAudioLocation(float x, float y, float z)
+cDMAudio::SetMissionAudioLocation(uint8 slot, float x, float y, float z)
 {
-	AudioManager.SetMissionAudioLocation(x, y, z);
+	AudioManager.SetMissionAudioLocation(slot, x, y, z);
 }
 
 void
-cDMAudio::PlayLoadedMissionAudio(void)
+cDMAudio::PlayLoadedMissionAudio(uint8 slot)
 {
-	AudioManager.PlayLoadedMissionAudio();
+	AudioManager.PlayLoadedMissionAudio(slot);
 }
 
 bool8
-cDMAudio::IsMissionAudioSampleFinished(void)
+cDMAudio::IsMissionAudioSamplePlaying(uint8 slot)
 {
-	return AudioManager.IsMissionAudioSampleFinished();
+	return AudioManager.IsMissionAudioSamplePlaying(slot);
+}
+
+bool8
+cDMAudio::IsMissionAudioSampleFinished(uint8 slot)
+{
+	return AudioManager.IsMissionAudioSampleFinished(slot);
 }
 
 void
-cDMAudio::ClearMissionAudio(void)
+cDMAudio::ClearMissionAudio(uint8 slot)
+{
+	AudioManager.ClearMissionAudio(slot);
+}
+
+const char *
+cDMAudio::GetMissionAudioLoadedLabel(uint8 slot)
 {
-	AudioManager.ClearMissionAudio();
+	return AudioManager.GetMissionAudioLoadedLabel(slot);
 }
 
 uint8
@@ -332,7 +358,49 @@ cDMAudio::SetRadioInCar(uint32 radio)
 }
 
 void
-cDMAudio::SetRadioChannel(uint8 radio, int32 pos)
+cDMAudio::SetRadioChannel(uint32 radio, int32 pos)
 {
 	MusicManager.SetRadioChannelByScript(radio, pos);
 }
+
+void
+cDMAudio::SetStartingTrackPositions(bool8 isStartGame)
+{
+	MusicManager.SetStartingTrackPositions(isStartGame);
+}
+
+float *
+cDMAudio::GetListenTimeArray()
+{
+	return MusicManager.GetListenTimeArray();
+}
+
+uint32
+cDMAudio::GetFavouriteRadioStation()
+{
+	return MusicManager.GetFavouriteRadioStation();
+}
+
+int32
+cDMAudio::GetRadioPosition(uint32 station)
+{
+	return MusicManager.GetRadioPosition(station);
+}
+
+void
+cDMAudio::SetPedTalkingStatus(CPed *ped, bool8 status)
+{
+	return AudioManager.SetPedTalkingStatus(ped, status);
+}
+
+void
+cDMAudio::SetPlayersMood(uint8 mood, uint32 time)
+{
+	return AudioManager.SetPlayersMood(mood, time);
+}
+
+void
+cDMAudio::ShutUpPlayerTalking(bool8 state)
+{
+	AudioManager.m_bIsPlayerShutUp = state;
+}
\ No newline at end of file