diff options
Diffstat (limited to 'src/audio/DMAudio.cpp')
-rw-r--r-- | src/audio/DMAudio.cpp | 94 |
1 files changed, 64 insertions, 30 deletions
diff --git a/src/audio/DMAudio.cpp b/src/audio/DMAudio.cpp index 9d278046..486daebf 100644 --- a/src/audio/DMAudio.cpp +++ b/src/audio/DMAudio.cpp @@ -65,6 +65,15 @@ cDMAudio::SetMonoMode(uint8 mono) } void +cDMAudio::SetMP3BoostVolume(uint8 volume) +{ + uint8 vol = volume; + if (vol > MAX_VOLUME) vol = MAX_VOLUME; + + AudioManager.SetMP3BoostVolume(vol); +} + +void cDMAudio::SetEffectsMasterVolume(uint8 volume) { uint8 vol = volume; @@ -114,24 +123,7 @@ cDMAudio::Get3DProviderName(uint8 id) int8 cDMAudio::AutoDetect3DProviders(void) { - for ( int32 i = 0; i < GetNum3DProvidersAvailable(); i++ ) - { - wchar buff[64]; - - char *name = Get3DProviderName(i); - AsciiToUnicode(name, buff); - char *providername = UnicodeToAscii(buff); - strupr(providername); -#if defined(AUDIO_MSS) - if ( !strcmp(providername, "MILES FAST 2D POSITIONAL AUDIO") ) - return i; -#elif defined(AUDIO_OAL) - if ( !strcmp(providername, "OPENAL SOFT") ) - return i; -#endif - } - - return -1; + return AudioManager.AutoDetect3DProviders(); } int8 @@ -296,39 +288,39 @@ 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); } bool -cDMAudio::IsMissionAudioSampleFinished(void) +cDMAudio::IsMissionAudioSampleFinished(uint8 slot) { - return AudioManager.IsMissionAudioSampleFinished(); + return AudioManager.IsMissionAudioSampleFinished(slot); } void -cDMAudio::ClearMissionAudio(void) +cDMAudio::ClearMissionAudio(uint8 slot) { - AudioManager.ClearMissionAudio(); + AudioManager.ClearMissionAudio(slot); } uint8 @@ -348,3 +340,45 @@ cDMAudio::SetRadioChannel(int8 radio, int32 pos) { MusicManager.SetRadioChannelByScript(radio, pos); } + +void +cDMAudio::SetStartingTrackPositions(uint8 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, uint8 status) +{ + return AudioManager.SetPedTalkingStatus(ped, status); +} + +void +cDMAudio::SetPlayersMood(uint8 mood, int32 time) +{ + return AudioManager.SetPlayersMood(mood, time); +} + +void +cDMAudio::ShutUpPlayerTalking(uint8 state) +{ + AudioManager.m_bIsPlayerShutUp = state; +}
\ No newline at end of file |