6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-08-07 23:25:00 +00:00
Code Issues Projects Releases Wiki Activity

Fixes the use-sustain flag.

Browse Source
This commit is contained in:
Thomas Harte
2020-05-08 20:49:39 -04:00
parent dc5654b941
commit 792aed242d
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Components/OPL2/OPLL.cpp
View File

@@ -175,7 +175,12 @@ void OPLL::set_channel_period(int channel) {
key_level_scalers_[channel + 9].set_period(channels_[channel].period, channels_[channel].octave); key_level_scalers_[channel + 9].set_period(channels_[channel].period, channels_[channel].octave);
} }
const uint8_t *OPLL::instrument_definition(int instrument) { const uint8_t *OPLL::instrument_definition(int instrument, int channel) {
// Divert to the appropriate rhythm instrument if in rhythm mode.
if(channel >= 6 && rhythm_mode_enabled_) {
return &percussion_patch_set[(channel - 6) * 8];
}
// Instrument 0 is the custom instrument. // Instrument 0 is the custom instrument.
if(!instrument) return custom_instrument_; if(!instrument) return custom_instrument_;
@@ -193,9 +198,7 @@ void OPLL::install_instrument(int channel) {
auto &modulator_phase = phase_generators_[channel + 9]; auto &modulator_phase = phase_generators_[channel + 9];
auto &modulator_scaler = key_level_scalers_[channel + 9]; auto &modulator_scaler = key_level_scalers_[channel + 9];
const uint8_t *const instrument = ((channel < 6) || !rhythm_mode_enabled_) ? const uint8_t *const instrument = instrument_definition(channels_[channel].instrument, channel);
instrument_definition(channels_[channel].instrument) :
&percussion_patch_set[(channel - 6) * 8];
// Bytes 0 (modulator) and 1 (carrier): // Bytes 0 (modulator) and 1 (carrier):
// //
@@ -256,9 +259,9 @@ void OPLL::install_instrument(int channel) {
} }
void OPLL::set_use_sustain(int channel) { void OPLL::set_use_sustain(int channel) {
const uint8_t *const instrument = instrument_definition(channels_[channel].instrument); const uint8_t *const instrument = instrument_definition(channels_[channel].instrument, channel);
envelope_generators_[channel + 0].set_sustain_level((instrument[1] & 0x20) || channels_[channel].use_sustain); envelope_generators_[channel + 0].set_use_sustain_level((instrument[1] & 0x20) || channels_[channel].use_sustain);
envelope_generators_[channel + 9].set_sustain_level((instrument[0] & 0x20) || channels_[channel].use_sustain); envelope_generators_[channel + 9].set_use_sustain_level((instrument[0] & 0x20) || channels_[channel].use_sustain);
} }
// MARK: - Output generation. // MARK: - Output generation.

2
Components/OPL2/OPLL.hpp
View File

@@ -117,7 +117,7 @@ class OPLL: public OPLBase<OPLL> {
void set_use_sustain(int channel); void set_use_sustain(int channel);
/// @returns The 8-byte definition of instrument @c instrument. /// @returns The 8-byte definition of instrument @c instrument.
const uint8_t *instrument_definition(int instrument); const uint8_t *instrument_definition(int instrument, int channel);
}; };
} }