summaryrefslogtreecommitdiffstats
path: root/src/audio
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2021-08-12 14:03:38 +0200
committerSergeanur <s.anureev@yandex.ua>2021-08-12 14:03:38 +0200
commit0a2df3ca4c8daa180c75684fe54a3e04fb30ff8c (patch)
tree440bc97306a8e8ae362fa40933e6217aaf11ada3 /src/audio
parentSync audio changes from master (diff)
downloadre3-0a2df3ca4c8daa180c75684fe54a3e04fb30ff8c.tar
re3-0a2df3ca4c8daa180c75684fe54a3e04fb30ff8c.tar.gz
re3-0a2df3ca4c8daa180c75684fe54a3e04fb30ff8c.tar.bz2
re3-0a2df3ca4c8daa180c75684fe54a3e04fb30ff8c.tar.lz
re3-0a2df3ca4c8daa180c75684fe54a3e04fb30ff8c.tar.xz
re3-0a2df3ca4c8daa180c75684fe54a3e04fb30ff8c.tar.zst
re3-0a2df3ca4c8daa180c75684fe54a3e04fb30ff8c.zip
Diffstat (limited to '')
-rw-r--r--src/audio/AudioManager.cpp5
-rw-r--r--src/audio/sampman_null.cpp4
2 files changed, 7 insertions, 2 deletions
diff --git a/src/audio/AudioManager.cpp b/src/audio/AudioManager.cpp
index fce86915..8e6ef4ff 100644
--- a/src/audio/AudioManager.cpp
+++ b/src/audio/AudioManager.cpp
@@ -466,7 +466,8 @@ cAudioManager::CheckForAnAudioFileOnCD()
char
cAudioManager::GetCDAudioDriveLetter()
{
- if(m_bIsInitialised) return SampleManager.GetCDAudioDriveLetter();
+ if (m_bIsInitialised)
+ return SampleManager.GetCDAudioDriveLetter();
return '\0';
}
@@ -912,7 +913,7 @@ cAudioManager::ProcessActiveQueues()
}
for (int32 i = 0; i < m_SampleRequestQueuesStatus[m_nActiveSampleQueue]; i++) {
- tSound& sample = m_asSamples[m_nActiveSampleQueue][m_abSampleQueueIndexTable[m_nActiveSampleQueue][i]];
+ tSound &sample = m_asSamples[m_nActiveSampleQueue][m_abSampleQueueIndexTable[m_nActiveSampleQueue][i]];
if (sample.m_nSampleIndex != NO_SAMPLE) {
for (int32 j = 0; j < m_nActiveSamples; j++) {
if (sample.m_nEntityIndex == m_asActiveSamples[j].m_nEntityIndex && sample.m_nCounter == m_asActiveSamples[j].m_nCounter &&
diff --git a/src/audio/sampman_null.cpp b/src/audio/sampman_null.cpp
index af4c54ad..627d122b 100644
--- a/src/audio/sampman_null.cpp
+++ b/src/audio/sampman_null.cpp
@@ -19,6 +19,7 @@ cSampleManager::~cSampleManager(void)
}
+#ifdef EXTERNAL_3D_SOUND
void cSampleManager::SetSpeakerConfig(int32 nConfig)
{
@@ -59,6 +60,7 @@ int8 cSampleManager::SetCurrent3DProvider(uint8 nProvider)
{
return 0;
}
+#endif
bool8
cSampleManager::IsMP3RadioChannelAvailable(void)
@@ -228,6 +230,7 @@ cSampleManager::InitialiseChannel(uint32 nChannel, uint32 nSfx, uint8 nBank)
return FALSE;
}
+#ifdef EXTERNAL_3D_SOUND
void
cSampleManager::SetChannelEmittingVolume(uint32 nChannel, uint32 nVolume)
{
@@ -248,6 +251,7 @@ cSampleManager::SetChannel3DDistances(uint32 nChannel, float fMax, float fMin)
ASSERT( nChannel < MAXCHANNELS );
ASSERT( nChannel < MAXCHANNELS+MAX2DCHANNELS );
}
+#endif
void
cSampleManager::SetChannelVolume(uint32 nChannel, uint32 nVolume)