diff --git a/extern/vgsound_emu-modified/vgsound_emu/src/es550x/es5506.cpp b/extern/vgsound_emu-modified/vgsound_emu/src/es550x/es5506.cpp index 17ba705a..1bf78189 100644 --- a/extern/vgsound_emu-modified/vgsound_emu/src/es550x/es5506.cpp +++ b/extern/vgsound_emu-modified/vgsound_emu/src/es550x/es5506.cpp @@ -55,7 +55,6 @@ void es5506_core::voice_tick() // Voice updates every 2 E clock cycle (or 4 BCLK clock cycle) // Update voice for (int i=0; i m_end)))) + return ((!m_cr.m_lei) && + (((m_cr.m_dir) && (m_accum < m_start)) || ((!m_cr.m_dir) && (m_accum > m_end)))) ? true : false; } void es550x_shared_core::es550x_voice_t::es550x_alu_t::loop_exec() { - if (m_cr.dir()) // Reverse playback + if (m_cr.m_dir) // Reverse playback { - if (m_cr.lpe()) // Loop enable + if (m_cr.m_lpe) // Loop enable { - if (m_cr.ble()) // Bidirectional + if (m_cr.m_ble) // Bidirectional { m_cr.set_dir(false); m_accum = m_start + (m_start - m_accum); @@ -55,7 +55,7 @@ void es550x_shared_core::es550x_voice_t::es550x_alu_t::loop_exec() m_accum = m_end - (m_start - m_accum); } } - else if (m_cr.ble() && m_transwave) // m_transwave + else if (m_cr.m_ble && m_transwave) // m_transwave { m_cr.set_loop(0); m_cr.set_lei(true); // Loop end ignore @@ -68,9 +68,9 @@ void es550x_shared_core::es550x_voice_t::es550x_alu_t::loop_exec() } else { - if (m_cr.lpe()) // Loop enable + if (m_cr.m_lpe) // Loop enable { - if (m_cr.ble()) // Bidirectional + if (m_cr.m_ble) // Bidirectional { m_cr.set_dir(true); m_accum = m_end - (m_end - m_accum); @@ -80,7 +80,7 @@ void es550x_shared_core::es550x_voice_t::es550x_alu_t::loop_exec() m_accum = (m_accum - m_end) + m_start; } } - else if (m_cr.ble() && m_transwave) // m_transwave + else if (m_cr.m_ble && m_transwave) // m_transwave { m_cr.set_loop(0); m_cr.set_lei(true); // Loop end ignore diff --git a/extern/vgsound_emu-modified/vgsound_emu/src/es550x/es550x_filter.cpp b/extern/vgsound_emu-modified/vgsound_emu/src/es550x/es550x_filter.cpp index 1ba62a57..afff686d 100644 --- a/extern/vgsound_emu-modified/vgsound_emu/src/es550x/es550x_filter.cpp +++ b/extern/vgsound_emu-modified/vgsound_emu/src/es550x/es550x_filter.cpp @@ -50,7 +50,7 @@ void es550x_shared_core::es550x_voice_t::es550x_filter_t::tick(s32 in) } } -void es550x_shared_core::es550x_voice_t::es550x_filter_t::lp_exec(s32 coeff, s32 in, s32 out) +void es550x_shared_core::es550x_voice_t::es550x_filter_t::lp_exec(s32 coeff, const s32 in, const s32 out) { // Store previous filter data m_o[out][1] = m_o[out][0]; @@ -59,7 +59,7 @@ void es550x_shared_core::es550x_voice_t::es550x_filter_t::lp_exec(s32 coeff, s32 m_o[out][0] = ((coeff * (m_o[in][0] - m_o[out][0])) / 4096) + m_o[out][0]; } -void es550x_shared_core::es550x_voice_t::es550x_filter_t::hp_exec(s32 coeff, s32 in, s32 out) +void es550x_shared_core::es550x_voice_t::es550x_filter_t::hp_exec(s32 coeff, const s32 in, const s32 out) { // Store previous filter data m_o[out][1] = m_o[out][0];