From eeb09c703147a0845c7eb4886dfe60caac23b45b Mon Sep 17 00:00:00 2001 From: cam900 Date: Sat, 17 Sep 2022 14:02:43 +0900 Subject: [PATCH] Sync with master --- .../vgsound_emu/src/core/vox/vox.hpp | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/extern/vgsound_emu-modified/vgsound_emu/src/core/vox/vox.hpp b/extern/vgsound_emu-modified/vgsound_emu/src/core/vox/vox.hpp index ead2ca75..231f9b63 100644 --- a/extern/vgsound_emu-modified/vgsound_emu/src/core/vox/vox.hpp +++ b/extern/vgsound_emu-modified/vgsound_emu/src/core/vox/vox.hpp @@ -40,17 +40,11 @@ class vox_core : public vgsound_emu_core s32 step() { return m_step; } - decoder_state_t &operator=(decoder_state_t &src) - { - copy_state(src); - return *this; - } + void copy_state(decoder_state_t &src); private: const bool m_wraparound = false; // wraparound or clamp? - void copy_state(decoder_state_t &src); - vox_core &m_vox; s8 m_index = 0; s32 m_step = 16; @@ -76,7 +70,7 @@ class vox_core : public vgsound_emu_core { if (!m_loop_saved) { - m_loop = m_curr; + m_loop.copy_state(m_curr); m_loop_saved = true; } } @@ -85,7 +79,7 @@ class vox_core : public vgsound_emu_core { if (m_loop_saved) { - m_curr = m_loop; + m_curr.copy_state(m_loop); } }