summaryrefslogtreecommitdiffstats
path: root/src/audio
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2019-07-02 22:05:32 +0200
committerGitHub <noreply@github.com>2019-07-02 22:05:32 +0200
commita91ea239243236a2d16fb29f676c5639a6cc23e1 (patch)
tree477b9853bea245d9cbdaa8700e02ff980abe79d5 /src/audio
parentMerge pull request #88 from gennariarmando/master (diff)
parentRevert "Implemented frontend inputs." (diff)
downloadre3-a91ea239243236a2d16fb29f676c5639a6cc23e1.tar
re3-a91ea239243236a2d16fb29f676c5639a6cc23e1.tar.gz
re3-a91ea239243236a2d16fb29f676c5639a6cc23e1.tar.bz2
re3-a91ea239243236a2d16fb29f676c5639a6cc23e1.tar.lz
re3-a91ea239243236a2d16fb29f676c5639a6cc23e1.tar.xz
re3-a91ea239243236a2d16fb29f676c5639a6cc23e1.tar.zst
re3-a91ea239243236a2d16fb29f676c5639a6cc23e1.zip
Diffstat (limited to 'src/audio')
-rw-r--r--src/audio/DMAudio.cpp9
-rw-r--r--src/audio/DMAudio.h8
2 files changed, 3 insertions, 14 deletions
diff --git a/src/audio/DMAudio.cpp b/src/audio/DMAudio.cpp
index 824d5c39..b3887c70 100644
--- a/src/audio/DMAudio.cpp
+++ b/src/audio/DMAudio.cpp
@@ -17,13 +17,8 @@ WRAPPER bool cDMAudio::CheckForAnAudioFileOnCD() { EAXJMP(0x57CA70); }
WRAPPER void cDMAudio::ChangeMusicMode(uint8 mode) { EAXJMP(0x57CCF0); }
WRAPPER void cDMAudio::PlayFrontEndSound(uint32, uint32) { EAXJMP(0x57CC20); }
-WRAPPER void cDMAudio::PlayFrontEndTrack(uint32, uint32) { EAXJMP(0x57CC80); }
-WRAPPER void cDMAudio::StopFrontEndTrack() { EAXJMP(0x57CCB0); }
-WRAPPER void cDMAudio::PlayOneShot(int32, uint16, float) { EAXJMP(0x57C840); }
-WRAPPER void cDMAudio::SetMusicMasterVolume(int8) { EAXJMP(0x57C8C0); }
-WRAPPER void cDMAudio::SetEffectsMasterVolume(int8) { EAXJMP(0x57C890); }
-WRAPPER int8 cDMAudio::SetCurrent3DProvider(int8) { EAXJMP(0x57C9B0); }
-WRAPPER int32 cDMAudio::SetSpeakerConfig(int32) { EAXJMP(0x57C9D0); }
+WRAPPER void cDMAudio::PlayOneShot(int, uint16, float) { EAXJMP(0x57C840); }
+
WRAPPER int32 cDMAudio::GetRadioInCar() { EAXJMP(0x57CE40); }
WRAPPER uint8 cDMAudio::IsMP3RadioChannelAvailable() { EAXJMP(0x57C9F0); }
diff --git a/src/audio/DMAudio.h b/src/audio/DMAudio.h
index 46914aaa..46b40e37 100644
--- a/src/audio/DMAudio.h
+++ b/src/audio/DMAudio.h
@@ -188,13 +188,7 @@ public:
bool CheckForAnAudioFileOnCD(void);
void ChangeMusicMode(uint8 mode);
void PlayFrontEndSound(uint32, uint32);
- void PlayFrontEndTrack(uint32, uint32);
- void StopFrontEndTrack();
- void PlayOneShot(int32, uint16, float);
- void SetMusicMasterVolume(int8);
- void SetEffectsMasterVolume(int8);
- int8 SetCurrent3DProvider(int8);
- int32 SetSpeakerConfig(int32);
+ void PlayOneShot(int, uint16, float);
int32 GetRadioInCar(void);
void SetEffectsFadeVol(uint8);
void SetMusicFadeVol(uint8);