Sync with master

This commit is contained in:
cam900 2022-09-17 14:02:43 +09:00
parent 81f812b216
commit eeb09c7031
1 changed files with 3 additions and 9 deletions

View File

@ -40,17 +40,11 @@ class vox_core : public vgsound_emu_core
s32 step() { return m_step; } s32 step() { return m_step; }
decoder_state_t &operator=(decoder_state_t &src) void copy_state(decoder_state_t &src);
{
copy_state(src);
return *this;
}
private: private:
const bool m_wraparound = false; // wraparound or clamp? const bool m_wraparound = false; // wraparound or clamp?
void copy_state(decoder_state_t &src);
vox_core &m_vox; vox_core &m_vox;
s8 m_index = 0; s8 m_index = 0;
s32 m_step = 16; s32 m_step = 16;
@ -76,7 +70,7 @@ class vox_core : public vgsound_emu_core
{ {
if (!m_loop_saved) if (!m_loop_saved)
{ {
m_loop = m_curr; m_loop.copy_state(m_curr);
m_loop_saved = true; m_loop_saved = true;
} }
} }
@ -85,7 +79,7 @@ class vox_core : public vgsound_emu_core
{ {
if (m_loop_saved) if (m_loop_saved)
{ {
m_curr = m_loop; m_curr.copy_state(m_loop);
} }
} }