diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2021-05-23 15:47:16 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2021-06-24 20:34:33 +0200 |
| commit | 02655313e9726a044dcecdeb143c261614d00f0f (patch) | |
| tree | d019ad3353e749dc17dd3bfac885cd3d97558d5f /src/audio/AudioManager.h | |
| parent | Fix MAX_DIGITAL_MIXER_CHANNELS (diff) | |
| download | re3-02655313e9726a044dcecdeb143c261614d00f0f.tar re3-02655313e9726a044dcecdeb143c261614d00f0f.tar.gz re3-02655313e9726a044dcecdeb143c261614d00f0f.tar.bz2 re3-02655313e9726a044dcecdeb143c261614d00f0f.tar.lz re3-02655313e9726a044dcecdeb143c261614d00f0f.tar.xz re3-02655313e9726a044dcecdeb143c261614d00f0f.tar.zst re3-02655313e9726a044dcecdeb143c261614d00f0f.zip | |
Diffstat (limited to 'src/audio/AudioManager.h')
| -rw-r--r-- | src/audio/AudioManager.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/audio/AudioManager.h b/src/audio/AudioManager.h index 49535252..d5b3ce15 100644 --- a/src/audio/AudioManager.h +++ b/src/audio/AudioManager.h @@ -205,10 +205,10 @@ public: int32 m_nTimer; tSound m_sQueueSample; uint8 m_nActiveSampleQueue; - tSound m_asSamples[NUM_SOUNDS_SAMPLES_BANKS][NUM_SOUNDS_SAMPLES_SLOTS]; - uint8 m_abSampleQueueIndexTable[NUM_SOUNDS_SAMPLES_BANKS][NUM_SOUNDS_SAMPLES_SLOTS]; + tSound m_asSamples[NUM_SOUNDS_SAMPLES_BANKS][NUM_CHANNELS_GENERIC]; + uint8 m_abSampleQueueIndexTable[NUM_SOUNDS_SAMPLES_BANKS][NUM_CHANNELS_GENERIC]; uint8 m_SampleRequestQueuesStatus[NUM_SOUNDS_SAMPLES_BANKS]; - tSound m_asActiveSamples[NUM_SOUNDS_SAMPLES_SLOTS]; + tSound m_asActiveSamples[NUM_CHANNELS_GENERIC]; tAudioEntity m_asAudioEntities[NUM_AUDIOENTITIES]; int32 m_anAudioEntityIndices[NUM_AUDIOENTITIES]; int32 m_nAudioEntitiesTotal; @@ -544,7 +544,7 @@ public: #endif }; -#ifdef AUDIO_MSS +#if defined(AUDIO_MSS) && !defined(PS2_AUDIO_CHANNELS) static_assert(sizeof(cAudioManager) == 0x5558, "cAudioManager: error"); #endif |