6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-26 08:49:37 +00:00
Code Issues Projects Releases Wiki Activity

Ensures rhythm envelope generators don't pick up should_damp state.

Browse Source
This commit is contained in:
Thomas Harte 2020-05-08 00:18:31 -04:00
parent 24100ec3b0
commit ea25ead19d
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Components/OPL2/OPLL.cpp
View File

@ -18,21 +18,6 @@ OPLL::OPLL(Concurrency::DeferringAsyncTaskQueue &task_queue, int audio_divider,
// be larger than 4. // be larger than 4.
assert(audio_divider <= 4); assert(audio_divider <= 4);
// Set up proper damping management.
for(int c = 0; c < 9; ++c) {
envelope_generators_[c].set_should_damp([this, c] {
// Propagate attack mode to the modulator, and reset both phases.
envelope_generators_[c + 9].set_key_on(true);
phase_generators_[c + 0].reset();
phase_generators_[c + 9].reset();
});
}
// Set default instrument.
for(int c = 0; c < 9; ++c) {
install_instrument(c);
}
// Setup the rhythm envelope generators. // Setup the rhythm envelope generators.
// Treat the bass exactly as if it were a melodic channel. // Treat the bass exactly as if it were a melodic channel.
@ -59,9 +44,21 @@ OPLL::OPLL(Concurrency::DeferringAsyncTaskQueue &task_queue, int audio_divider,
// Return to ordinary default mode. // Return to ordinary default mode.
rhythm_mode_enabled_ = false; rhythm_mode_enabled_ = false;
install_instrument(6);
install_instrument(7); // Set up proper damping management.
install_instrument(8); for(int c = 0; c < 9; ++c) {
envelope_generators_[c].set_should_damp([this, c] {
// Propagate attack mode to the modulator, and reset both phases.
envelope_generators_[c + 9].set_key_on(true);
phase_generators_[c + 0].reset();
phase_generators_[c + 9].reset();
});
}
// Set default instrument.
for(int c = 0; c < 9; ++c) {
install_instrument(c);
}
} }
// MARK: - Machine-facing programmatic input. // MARK: - Machine-facing programmatic input.