From a3ba70ad14fa1c323b0fb26c637e4cddc89fae96 Mon Sep 17 00:00:00 2001 From: arbee Date: Tue, 14 Dec 2021 11:26:27 -0500 Subject: gt913: fix single-driver build, fix invalid Unicode character. [R. Belmont] --- scripts/src/machine.lua | 4 +++- src/devices/machine/gt913_snd.cpp | 16 ++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/scripts/src/machine.lua b/scripts/src/machine.lua index 358a7f7581f..e0c955ce9aa 100644 --- a/scripts/src/machine.lua +++ b/scripts/src/machine.lua @@ -1427,7 +1427,9 @@ end --------------------------------------------------- -- ---@src/devices/machine/gt913.h,MACHINES["GT913"] = true +--@src/devices/machine/gt913_io.h,MACHINES["GT913"] = true +--@src/devices/machine/gt913_kbd.h,MACHINES["GT913"] = true +--@src/devices/machine/gt913_snd.h,MACHINES["GT913"] = true --------------------------------------------------- if (MACHINES["GT913"]~=null) then diff --git a/src/devices/machine/gt913_snd.cpp b/src/devices/machine/gt913_snd.cpp index f06930d3697..02b4181d030 100644 --- a/src/devices/machine/gt913_snd.cpp +++ b/src/devices/machine/gt913_snd.cpp @@ -8,13 +8,13 @@ which is then input to either a serial DAC or a HG51B-based DSP, depending on the model of keyboard. - The sample format, as well as other details such as the linear interpolation, - are covered in these two Japanese patents: - https://patents.google.com/patent/JP3603343B2/en - https://patents.google.com/patent/JPH07199996A/en + The sample format, as well as other details such as the linear interpolation, + are covered in these two Japanese patents: + https://patents.google.com/patent/JP3603343B2/en + https://patents.google.com/patent/JPH07199996A/en - TODO: Volume envelope rates still need adjusting. - (See comment in gt913_sound_device::command_w regarding command 6007) + TODO: Volume envelope rates still need adjusting. + (See comment in gt913_sound_device::command_w regarding command 6007) ***************************************************************************/ @@ -142,7 +142,7 @@ void gt913_sound_device::mix_sample(voice_t& voice, s64& left, s64& right) const u8 env = (voice.m_volume_current >> 24); /* the current envelope level effects amplitude non-linearly, just apply the value twice - (this hardware family is branded as "A² (A-Square) Sound Source" in some of Casio's + (this hardware family is branded as "A� (A-Square) Sound Source" in some of Casio's promotional materials, possibly for this reason?) */ const s64 sample = ((s64)voice.m_sample + (voice.m_sample_next * step / 8)) * voice.m_gain * env * env; @@ -164,7 +164,7 @@ void gt913_sound_device::update_sample(voice_t& voice) so once we've reached that point, use those values to reload the current sample and exponent */ const u32 addr_loop_data = (voice.m_addr_end + 1) & ~1; - + voice.m_sample_next = read_word(addr_loop_data) - voice.m_sample; voice.m_exp = read_word(addr_loop_data + 10) & 7; } -- cgit v1.2.3