From 19dd772931143110975c30c8126e8836d9a9fd5b Mon Sep 17 00:00:00 2001 From: Aaron Giles Date: Sun, 20 Sep 2020 21:18:08 -0700 Subject: Fix merge error --- src/devices/sound/qsoundhle.cpp | 12 ++++-------- src/devices/sound/qsoundhle.h | 2 +- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/devices/sound/qsoundhle.cpp b/src/devices/sound/qsoundhle.cpp index 9ff99ee8cab..fe25c3a8eaa 100644 --- a/src/devices/sound/qsoundhle.cpp +++ b/src/devices/sound/qsoundhle.cpp @@ -161,17 +161,13 @@ void qsound_hle_device::device_reset() // sound_stream_update_legacy - handle a stream update //------------------------------------------------- -void qsound_hle_device::sound_stream_update_legacy(sound_stream &stream, stream_sample_t const * const *inputs, stream_sample_t * const *outputs, int samples) +void qsound_hle_device::sound_stream_update(sound_stream &stream, std::vector const &inputs, std::vector &outputs) { - // Clear the buffers - std::fill_n(outputs[0], samples, 0); - std::fill_n(outputs[1], samples, 0); - - for (int i = 0; i < samples; i ++) + for (int i = 0; i < outputs[0].samples(); i ++) { update_sample(); - outputs[0][i] = m_out[0]; - outputs[1][i] = m_out[1]; + outputs[0].put_int(i, m_out[0], 32768); + outputs[1].put_int(i, m_out[1], 32768); } } diff --git a/src/devices/sound/qsoundhle.h b/src/devices/sound/qsoundhle.h index 23b92738b9b..4d6f61e0c7d 100644 --- a/src/devices/sound/qsoundhle.h +++ b/src/devices/sound/qsoundhle.h @@ -30,7 +30,7 @@ protected: virtual void device_reset() override; // device_sound_interface implementation - virtual void sound_stream_update_legacy(sound_stream &stream, stream_sample_t const * const *inputs, stream_sample_t * const *outputs, int samples) override; + virtual void sound_stream_update(sound_stream &stream, std::vector const &inputs, std::vector &outputs) override; // device_rom_interface implementation virtual void rom_bank_updated() override; -- cgit v1.2.3