diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2021-06-24 20:50:09 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2021-06-24 20:50:09 +0200 |
| commit | 74867af2e73b8cbbef97ff9395c3b0b157ec79ee (patch) | |
| tree | a2a0edab9e9c0db56aec7cd0097562037da4a287 /src/audio/sampman_oal.cpp | |
| parent | Don't restart OAL device when switching EAX (diff) | |
| download | re3-74867af2e73b8cbbef97ff9395c3b0b157ec79ee.tar re3-74867af2e73b8cbbef97ff9395c3b0b157ec79ee.tar.gz re3-74867af2e73b8cbbef97ff9395c3b0b157ec79ee.tar.bz2 re3-74867af2e73b8cbbef97ff9395c3b0b157ec79ee.tar.lz re3-74867af2e73b8cbbef97ff9395c3b0b157ec79ee.tar.xz re3-74867af2e73b8cbbef97ff9395c3b0b157ec79ee.tar.zst re3-74867af2e73b8cbbef97ff9395c3b0b157ec79ee.zip | |
Diffstat (limited to 'src/audio/sampman_oal.cpp')
| -rw-r--r-- | src/audio/sampman_oal.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/audio/sampman_oal.cpp b/src/audio/sampman_oal.cpp index a4ff5941..186990a4 100644 --- a/src/audio/sampman_oal.cpp +++ b/src/audio/sampman_oal.cpp @@ -215,7 +215,6 @@ add_providers() static void release_existing() { - for ( int32 i = 0; i < MAXCHANNELS+MAX2DCHANNELS; i++ ) if ( IsFXSupported() ) { if ( alIsEffect(ALEffect) ) @@ -280,7 +279,6 @@ set_new_provider(int index) //SampleManager.SetSpeakerConfig(speaker_type); - aChannel[CHANNEL2D+i].Init(CHANNEL2D+i, true); if ( IsFXSupported() ) { for ( int32 i = 0; i < MAXCHANNELS; i++ ) @@ -1653,7 +1651,7 @@ cSampleManager::InitialiseChannel(uint32 nChannel, uint32 nSfx, uint8 nBank) void cSampleManager::SetChannelEmittingVolume(uint32 nChannel, uint32 nVolume) { - ASSERT( nChannel < CHANNEL2D ); + ASSERT( nChannel < MAXCHANNELS ); uint32 vol = nVolume; if ( vol > MAX_VOLUME ) vol = MAX_VOLUME; @@ -1674,7 +1672,7 @@ cSampleManager::SetChannelEmittingVolume(uint32 nChannel, uint32 nVolume) void cSampleManager::SetChannel3DPosition(uint32 nChannel, float fX, float fY, float fZ) { - ASSERT( nChannel < CHANNEL2D ); + ASSERT( nChannel < MAXCHANNELS ); aChannel[nChannel].SetPosition(-fX, fY, fZ); } @@ -1682,17 +1680,17 @@ cSampleManager::SetChannel3DPosition(uint32 nChannel, float fX, float fY, float void cSampleManager::SetChannel3DDistances(uint32 nChannel, float fMax, float fMin) { - ASSERT( nChannel < CHANNEL2D ); + ASSERT( nChannel < MAXCHANNELS ); aChannel[nChannel].SetDistances(fMax, fMin); } void cSampleManager::SetChannelVolume(uint32 nChannel, uint32 nVolume) { - ASSERT(nChannel >= CHANNEL2D ); + ASSERT( nChannel >= MAXCHANNELS ); ASSERT( nChannel < NUM_CHANNELS ); - if(nChannel >= CHANNEL2D) + if( nChannel >= CHANNEL_POLICE_RADIO ) { uint32 vol = nVolume; if ( vol > MAX_VOLUME ) vol = MAX_VOLUME; @@ -1714,10 +1712,10 @@ cSampleManager::SetChannelVolume(uint32 nChannel, uint32 nVolume) void cSampleManager::SetChannelPan(uint32 nChannel, uint32 nPan) { - ASSERT(nChannel >= CHANNEL2D); + ASSERT( nChannel >= MAXCHANNELS ); ASSERT( nChannel < NUM_CHANNELS ); - if ( nChannel >= CHANNEL2D ) + if ( nChannel >= CHANNEL_POLICE_RADIO ) { aChannel[nChannel].SetPan(nPan); } |