diff --git a/Source/Core/Core/DSP/DSPAccelerator.cpp b/Source/Core/Core/DSP/DSPAccelerator.cpp index 7e57499d54..2ecf3121ce 100644 --- a/Source/Core/Core/DSP/DSPAccelerator.cpp +++ b/Source/Core/Core/DSP/DSPAccelerator.cpp @@ -126,7 +126,7 @@ u16 Accelerator::ReadSample(const s16* coefs) u16 val = 0; u8 step_size = 0; s16 raw_sample; - if (m_sample_format.decode == FormatDecode::MMIOPCMHalt || + if (m_sample_format.decode == FormatDecode::MMIOPCMNoInc || m_sample_format.decode == FormatDecode::MMIOPCMInc) { // The addresses can be complete nonsense in either of these modes @@ -184,7 +184,7 @@ u16 Accelerator::ReadSample(const s16* coefs) } break; } - case FormatDecode::MMIOPCMHalt: + case FormatDecode::MMIOPCMNoInc: case FormatDecode::PCM: // 16-bit PCM audio case FormatDecode::MMIOPCMInc: { @@ -211,7 +211,7 @@ u16 Accelerator::ReadSample(const s16* coefs) m_yn2 = m_yn1; m_yn1 = val; step_size = 2; - if (m_sample_format.decode != FormatDecode::MMIOPCMHalt) + if (m_sample_format.decode != FormatDecode::MMIOPCMNoInc) { m_current_address += 1; } diff --git a/Source/Core/Core/DSP/DSPAccelerator.h b/Source/Core/Core/DSP/DSPAccelerator.h index ac3ed641af..8e7bbc8fb0 100644 --- a/Source/Core/Core/DSP/DSPAccelerator.h +++ b/Source/Core/Core/DSP/DSPAccelerator.h @@ -64,10 +64,10 @@ protected: enum class FormatDecode : u16 { - ADPCM = 0, // ADPCM reads from ARAM, ACCA increments - MMIOPCMHalt = 1, // PCM Reads from ACIN, ACCA doesn't increment - PCM = 2, // PCM reads from ARAM, ACCA increments - MMIOPCMInc = 3 // PCM reads from ACIN, ACCA increments + ADPCM = 0, // ADPCM reads from ARAM, ACCA increments + MMIOPCMNoInc = 1, // PCM Reads from ACIN, ACCA doesn't increment + PCM = 2, // PCM reads from ARAM, ACCA increments + MMIOPCMInc = 3 // PCM reads from ACIN, ACCA increments }; // When reading samples (at least in PCM mode), they are multiplied by the gain, then divided by