From add65318c22c1d4a5e8489360d11fb66a8c022b0 Mon Sep 17 00:00:00 2001 From: Triang3l Date: Sat, 5 Jun 2021 16:27:40 +0300 Subject: [PATCH] [APU] XMA: ConvertFrame always returns true --- src/xenia/apu/xma_context.cc | 4 +--- src/xenia/apu/xma_context.h | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/xenia/apu/xma_context.cc b/src/xenia/apu/xma_context.cc index c7bebf1f1..205392492 100644 --- a/src/xenia/apu/xma_context.cc +++ b/src/xenia/apu/xma_context.cc @@ -806,7 +806,7 @@ int XmaContext::PrepareDecoder(uint8_t* packet, int sample_rate, return 0; } -bool XmaContext::ConvertFrame(const uint8_t** samples, bool is_two_channel, +void XmaContext::ConvertFrame(const uint8_t** samples, bool is_two_channel, uint8_t* output_buffer) { // Loop through every sample, convert and drop it into the output array. // If more than one channel, we need to interleave the samples from each @@ -880,8 +880,6 @@ bool XmaContext::ConvertFrame(const uint8_t** samples, bool is_two_channel, } } #endif - - return true; } } // namespace apu diff --git a/src/xenia/apu/xma_context.h b/src/xenia/apu/xma_context.h index c786f353f..d9e9b360a 100644 --- a/src/xenia/apu/xma_context.h +++ b/src/xenia/apu/xma_context.h @@ -186,7 +186,7 @@ class XmaContext { static std::tuple GetPacketFrameCount(uint8_t* packet); // Convert sample format and swap bytes - static bool ConvertFrame(const uint8_t** samples, bool is_two_channel, + static void ConvertFrame(const uint8_t** samples, bool is_two_channel, uint8_t* output_buffer); bool ValidFrameOffset(uint8_t* block, size_t size_bytes,