aboutsummaryrefslogtreecommitdiff
path: root/src/adlmidi_midiplay.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/adlmidi_midiplay.cpp')
-rw-r--r--src/adlmidi_midiplay.cpp189
1 files changed, 109 insertions, 80 deletions
diff --git a/src/adlmidi_midiplay.cpp b/src/adlmidi_midiplay.cpp
index 1e1da07..1a20e9e 100644
--- a/src/adlmidi_midiplay.cpp
+++ b/src/adlmidi_midiplay.cpp
@@ -21,7 +21,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include "adlmidi_midiplay.hpp"
+#include "adlmidi_opl3.hpp"
#include "adlmidi_private.hpp"
+#include "midi_sequencer.hpp"
// Mapping from MIDI volume level to OPL level value.
@@ -155,7 +158,10 @@ MIDIplay::MIDIplay(unsigned long sampleRate):
m_setup.carry = 0.0;
m_setup.tick_skip_samples_delay = 0;
+ m_synth.reset(new Synth);
+
#ifndef ADLMIDI_DISABLE_MIDI_SEQUENCER
+ m_sequencer.reset(new MidiSequencer);
initSequencerInterface();
#endif
resetMIDI();
@@ -163,51 +169,57 @@ MIDIplay::MIDIplay(unsigned long sampleRate):
realTime_ResetState();
}
+MIDIplay::~MIDIplay()
+{
+}
+
void MIDIplay::applySetup()
{
- m_synth.m_musicMode = OPL3::MODE_MIDI;
+ Synth &synth = *m_synth;
+
+ synth.m_musicMode = Synth::MODE_MIDI;
m_setup.tick_skip_samples_delay = 0;
- m_synth.m_runAtPcmRate = m_setup.runAtPcmRate;
+ synth.m_runAtPcmRate = m_setup.runAtPcmRate;
#ifndef DISABLE_EMBEDDED_BANKS
- if(m_synth.m_embeddedBank != OPL3::CustomBankTag)
- m_synth.m_insBankSetup = adlbanksetup[m_setup.bankId];
+ if(synth.m_embeddedBank != Synth::CustomBankTag)
+ synth.m_insBankSetup = adlbanksetup[m_setup.bankId];
#endif
- m_synth.m_deepTremoloMode = m_setup.deepTremoloMode < 0 ?
- m_synth.m_insBankSetup.deepTremolo :
- (m_setup.deepTremoloMode != 0);
- m_synth.m_deepVibratoMode = m_setup.deepVibratoMode < 0 ?
- m_synth.m_insBankSetup.deepVibrato :
- (m_setup.deepVibratoMode != 0);
- m_synth.m_rhythmMode = m_setup.rhythmMode < 0 ?
- m_synth.m_insBankSetup.adLibPercussions :
- (m_setup.rhythmMode != 0);
- m_synth.m_scaleModulators = m_setup.scaleModulators < 0 ?
- m_synth.m_insBankSetup.scaleModulators :
- (m_setup.scaleModulators != 0);
+ synth.m_deepTremoloMode = m_setup.deepTremoloMode < 0 ?
+ synth.m_insBankSetup.deepTremolo :
+ (m_setup.deepTremoloMode != 0);
+ synth.m_deepVibratoMode = m_setup.deepVibratoMode < 0 ?
+ synth.m_insBankSetup.deepVibrato :
+ (m_setup.deepVibratoMode != 0);
+ synth.m_rhythmMode = m_setup.rhythmMode < 0 ?
+ synth.m_insBankSetup.adLibPercussions :
+ (m_setup.rhythmMode != 0);
+ synth.m_scaleModulators = m_setup.scaleModulators < 0 ?
+ synth.m_insBankSetup.scaleModulators :
+ (m_setup.scaleModulators != 0);
if(m_setup.logarithmicVolumes)
- m_synth.setVolumeScaleModel(ADLMIDI_VolumeModel_NativeOPL3);
+ synth.setVolumeScaleModel(ADLMIDI_VolumeModel_NativeOPL3);
else
- m_synth.setVolumeScaleModel(static_cast<ADLMIDI_VolumeModels>(m_setup.volumeScaleModel));
+ synth.setVolumeScaleModel(static_cast<ADLMIDI_VolumeModels>(m_setup.volumeScaleModel));
if(m_setup.volumeScaleModel == ADLMIDI_VolumeModel_AUTO)//Use bank default volume model
- m_synth.m_volumeScale = (OPL3::VolumesScale)m_synth.m_insBankSetup.volumeModel;
+ synth.m_volumeScale = (Synth::VolumesScale)synth.m_insBankSetup.volumeModel;
- m_synth.m_numChips = m_setup.numChips;
+ synth.m_numChips = m_setup.numChips;
m_cmfPercussionMode = false;
if(m_setup.numFourOps >= 0)
- m_synth.m_numFourOps = m_setup.numFourOps;
+ synth.m_numFourOps = m_setup.numFourOps;
else
adlCalculateFourOpChannels(this, true);
- m_synth.reset(m_setup.emulator, m_setup.PCM_RATE, this);
+ synth.reset(m_setup.emulator, m_setup.PCM_RATE, this);
m_chipChannels.clear();
- m_chipChannels.resize(m_synth.m_numChannels);
+ m_chipChannels.resize(synth.m_numChannels);
// Reset the arpeggio counter
m_arpeggioCounter = 0;
@@ -215,12 +227,13 @@ void MIDIplay::applySetup()
void MIDIplay::partialReset()
{
+ Synth &synth = *m_synth;
realTime_panic();
m_setup.tick_skip_samples_delay = 0;
- m_synth.m_runAtPcmRate = m_setup.runAtPcmRate;
- m_synth.reset(m_setup.emulator, m_setup.PCM_RATE, this);
+ synth.m_runAtPcmRate = m_setup.runAtPcmRate;
+ synth.reset(m_setup.emulator, m_setup.PCM_RATE, this);
m_chipChannels.clear();
- m_chipChannels.resize((size_t)m_synth.m_numChannels);
+ m_chipChannels.resize((size_t)synth.m_numChannels);
}
void MIDIplay::resetMIDI()
@@ -240,7 +253,8 @@ void MIDIplay::resetMIDI()
void MIDIplay::TickIterators(double s)
{
- for(uint16_t c = 0; c < m_synth.m_numChannels; ++c)
+ Synth &synth = *m_synth;
+ for(uint16_t c = 0; c < synth.m_numChannels; ++c)
m_chipChannels[c].addAge(static_cast<int64_t>(s * 1e6));
updateVibrato(s);
updateArpeggio(s);
@@ -251,11 +265,12 @@ void MIDIplay::TickIterators(double s)
void MIDIplay::realTime_ResetState()
{
+ Synth &synth = *m_synth;
for(size_t ch = 0; ch < m_midiChannels.size(); ch++)
{
MIDIchannel &chan = m_midiChannels[ch];
chan.resetAllControllers();
- chan.volume = (m_synth.m_musicMode == OPL3::MODE_RSXX) ? 127 : 100;
+ chan.volume = (synth.m_musicMode == Synth::MODE_RSXX) ? 127 : 100;
chan.vibpos = 0.0;
chan.lastlrpn = 0;
chan.lastmrpn = 0;
@@ -270,10 +285,12 @@ void MIDIplay::realTime_ResetState()
bool MIDIplay::realTime_NoteOn(uint8_t channel, uint8_t note, uint8_t velocity)
{
+ Synth &synth = *m_synth;
+
if(note >= 128)
note = 127;
- if((m_synth.m_musicMode == OPL3::MODE_RSXX) && (velocity != 0))
+ if((synth.m_musicMode == Synth::MODE_RSXX) && (velocity != 0))
{
// Check if this is just a note after-touch
MIDIchannel::activenoteiterator i = m_midiChannels[channel].activenotes_find(note);
@@ -328,17 +345,17 @@ bool MIDIplay::realTime_NoteOn(uint8_t channel, uint8_t note, uint8_t velocity)
}
if(isPercussion)
- bank += OPL3::PercussionTag;
+ bank += Synth::PercussionTag;
- const adlinsdata2 *ains = &OPL3::m_emptyInstrument;
+ const adlinsdata2 *ains = &Synth::m_emptyInstrument;
//Set bank bank
- const OPL3::Bank *bnk = NULL;
+ const Synth::Bank *bnk = NULL;
bool caughtMissingBank = false;
- if((bank & ~static_cast<uint16_t>(OPL3::PercussionTag)) > 0)
+ if((bank & ~static_cast<uint16_t>(Synth::PercussionTag)) > 0)
{
- OPL3::BankMap::iterator b = m_synth.m_insBanks.find(bank);
- if(b != m_synth.m_insBanks.end())
+ Synth::BankMap::iterator b = synth.m_insBanks.find(bank);
+ if(b != synth.m_insBanks.end())
bnk = &b->second;
if(bnk)
ains = &bnk->ins[midiins];
@@ -352,9 +369,9 @@ bool MIDIplay::realTime_NoteOn(uint8_t channel, uint8_t note, uint8_t velocity)
size_t fallback = bank & ~(size_t)0x7F;
if(fallback != bank)
{
- OPL3::BankMap::iterator b = m_synth.m_insBanks.find(fallback);
+ Synth::BankMap::iterator b = synth.m_insBanks.find(fallback);
caughtMissingBank = false;
- if(b != m_synth.m_insBanks.end())
+ if(b != synth.m_insBanks.end())
bnk = &b->second;
if(bnk)
ains = &bnk->ins[midiins];
@@ -373,15 +390,15 @@ bool MIDIplay::realTime_NoteOn(uint8_t channel, uint8_t note, uint8_t velocity)
{
hooks.onDebugMessage(hooks.onDebugMessage_userData,
"[%i] Playing missing %s MIDI bank %i (patch %i)",
- channel, text, (bank & ~static_cast<uint16_t>(OPL3::PercussionTag)), midiins);
+ channel, text, (bank & ~static_cast<uint16_t>(Synth::PercussionTag)), midiins);
}
}
//Or fall back to first bank
if((ains->flags & adlinsdata::Flag_NoSound) != 0)
{
- OPL3::BankMap::iterator b = m_synth.m_insBanks.find(bank & OPL3::PercussionTag);
- if(b != m_synth.m_insBanks.end())
+ Synth::BankMap::iterator b = synth.m_insBanks.find(bank & Synth::PercussionTag);
+ if(b != synth.m_insBanks.end())
bnk = &b->second;
if(bnk)
ains = &bnk->ins[midiins];
@@ -436,7 +453,7 @@ bool MIDIplay::realTime_NoteOn(uint8_t channel, uint8_t note, uint8_t velocity)
voices[1].pseudo4op = pseudo_4op;
#endif /* __WATCOMC__ */
- if((m_synth.m_rhythmMode == 1) && PercussionMap[midiins & 0xFF])
+ if((synth.m_rhythmMode == 1) && PercussionMap[midiins & 0xFF])
voices[1] = voices[0];//i[1] = i[0];
bool isBlankNote = (ains->flags & adlinsdata::Flag_NoSound) != 0;
@@ -476,7 +493,7 @@ bool MIDIplay::realTime_NoteOn(uint8_t channel, uint8_t note, uint8_t velocity)
int32_t c = -1;
int32_t bs = -0x7FFFFFFFl;
- for(size_t a = 0; a < (size_t)m_synth.m_numChannels; ++a)
+ for(size_t a = 0; a < (size_t)synth.m_numChannels; ++a)
{
if(ccount == 1 && static_cast<int32_t>(a) == adlchannel[0]) continue;
// ^ Don't use the same channel for primary&secondary
@@ -486,7 +503,7 @@ bool MIDIplay::realTime_NoteOn(uint8_t channel, uint8_t note, uint8_t velocity)
// Only use regular channels
uint32_t expected_mode = 0;
- if(m_synth.m_rhythmMode)
+ if(synth.m_rhythmMode)
{
if(m_cmfPercussionMode)
expected_mode = channel < 11 ? 0 : (3 + channel - 11); // CMF
@@ -494,7 +511,7 @@ bool MIDIplay::realTime_NoteOn(uint8_t channel, uint8_t note, uint8_t velocity)
expected_mode = PercussionMap[midiins & 0xFF];
}
- if(m_synth.m_channelCategory[a] != expected_mode)
+ if(synth.m_channelCategory[a] != expected_mode)
continue;
}
else
@@ -502,7 +519,7 @@ bool MIDIplay::realTime_NoteOn(uint8_t channel, uint8_t note, uint8_t velocity)
if(ccount == 0)
{
// Only use four-op master channels
- if(m_synth.m_channelCategory[a] != OPL3::ChanCat_4op_Master)
+ if(synth.m_channelCategory[a] != Synth::ChanCat_4op_Master)
continue;
}
else
@@ -637,6 +654,7 @@ void MIDIplay::realTime_ChannelAfterTouch(uint8_t channel, uint8_t atVal)
void MIDIplay::realTime_Controller(uint8_t channel, uint8_t type, uint8_t value)
{
+ Synth &synth = *m_synth;
if(static_cast<size_t>(channel) > m_midiChannels.size())
channel = channel % 16;
switch(type)
@@ -773,7 +791,7 @@ void MIDIplay::realTime_Controller(uint8_t channel, uint8_t type, uint8_t value)
break;
case 103:
- if(m_synth.m_musicMode == OPL3::MODE_CMF)
+ if(synth.m_musicMode == Synth::MODE_CMF)
m_cmfPercussionMode = (value != 0);
break; // CMF (ctrl 0x67) rhythm mode
@@ -1069,11 +1087,12 @@ size_t MIDIplay::realTime_currentDevice(size_t track)
void MIDIplay::realTime_rawOPL(uint8_t reg, uint8_t value)
{
+ Synth &synth = *m_synth;
if((reg & 0xF0) == 0xC0)
value |= 0x30;
//std::printf("OPL poke %02X, %02X\n", reg, value);
//std::fflush(stdout);
- m_synth.writeReg(0, reg, value);
+ synth.writeReg(0, reg, value);
}
#if defined(ADLMIDI_AUDIO_TICK_HANDLER)
@@ -1100,6 +1119,7 @@ void MIDIplay::noteUpdate(size_t midCh,
unsigned props_mask,
int32_t select_adlchn)
{
+ Synth &synth = *m_synth;
MIDIchannel::NoteInfo &info = *i;
const int16_t noteTone = info.noteTone;
const double currentTone = info.currentTone;
@@ -1126,7 +1146,7 @@ void MIDIplay::noteUpdate(size_t midCh,
if(props_mask & Upd_Patch)
{
- m_synth.setPatch(c, ins.ains);
+ synth.setPatch(c, ins.ains);
AdlChannel::LocationData *d = m_chipChannels[c].users_find_or_create(my_loc);
if(d) // inserts if necessary
{
@@ -1162,10 +1182,10 @@ void MIDIplay::noteUpdate(size_t midCh,
if(do_erase_user && m_chipChannels[c].users_empty())
{
- m_synth.noteOff(c);
+ synth.noteOff(c);
if(props_mask & Upd_Mute) // Mute the note
{
- m_synth.touchNote(c, 0);
+ synth.touchNote(c, 0);
m_chipChannels[c].koff_time_until_neglible_us = 0;
}
else
@@ -1191,7 +1211,7 @@ void MIDIplay::noteUpdate(size_t midCh,
}
if(props_mask & Upd_Pan)
- m_synth.setPan(c, m_midiChannels[midCh].panning);
+ synth.setPan(c, m_midiChannels[midCh].panning);
if(props_mask & Upd_Volume)
{
@@ -1208,10 +1228,10 @@ void MIDIplay::noteUpdate(size_t midCh,
brightness *= 2;
}
- switch(m_synth.m_volumeScale)
+ switch(synth.m_volumeScale)
{
default:
- case OPL3::VOLUME_Generic:
+ case Synth::VOLUME_Generic:
{
volume = vol * m_masterVolume * m_midiChannels[midCh].volume * m_midiChannels[midCh].expression;
@@ -1231,7 +1251,7 @@ void MIDIplay::noteUpdate(size_t midCh,
}
break;
- case OPL3::VOLUME_NATIVE:
+ case Synth::VOLUME_NATIVE:
{
volume = vol * m_midiChannels[midCh].volume * m_midiChannels[midCh].expression;
// volume = volume * m_masterVolume / (127 * 127 * 127) / 2;
@@ -1239,7 +1259,7 @@ void MIDIplay::noteUpdate(size_t midCh,
}
break;
- case OPL3::VOLUME_DMX:
+ case Synth::VOLUME_DMX:
{
volume = 2 * (m_midiChannels[midCh].volume * m_midiChannels[midCh].expression * m_masterVolume / 16129) + 1;
//volume = 2 * (Ch[MidCh].volume) + 1;
@@ -1247,7 +1267,7 @@ void MIDIplay::noteUpdate(size_t midCh,
}
break;
- case OPL3::VOLUME_APOGEE:
+ case Synth::VOLUME_APOGEE:
{
volume = (m_midiChannels[midCh].volume * m_midiChannels[midCh].expression * m_masterVolume / 16129);
volume = ((64 * (vol + 0x80)) * volume) >> 15;
@@ -1255,7 +1275,7 @@ void MIDIplay::noteUpdate(size_t midCh,
}
break;
- case OPL3::VOLUME_9X:
+ case Synth::VOLUME_9X:
{
//volume = 63 - W9X_volume_mapping_table[(((vol * Ch[MidCh].volume /** Ch[MidCh].expression*/) * m_masterVolume / 16129 /*2048383*/) >> 2)];
volume = 63 - W9X_volume_mapping_table[((vol * m_midiChannels[midCh].volume * m_midiChannels[midCh].expression * m_masterVolume / 2048383) >> 2)];
@@ -1264,7 +1284,7 @@ void MIDIplay::noteUpdate(size_t midCh,
break;
}
- m_synth.touchNote(c, static_cast<uint8_t>(volume), static_cast<uint8_t>(brightness));
+ synth.touchNote(c, static_cast<uint8_t>(volume), static_cast<uint8_t>(brightness));
/* DEBUG ONLY!!!
static uint32_t max = 0;
@@ -1302,7 +1322,7 @@ void MIDIplay::noteUpdate(size_t midCh,
bend += static_cast<double>(vibrato) * m_midiChannels[midCh].vibdepth * std::sin(m_midiChannels[midCh].vibpos);
#define BEND_COEFFICIENT 172.4387
- m_synth.noteOn(c, c_slave, BEND_COEFFICIENT * std::exp(0.057762265 * (currentTone + bend + phase)));
+ synth.noteOn(c, c_slave, BEND_COEFFICIENT * std::exp(0.057762265 * (currentTone + bend + phase)));
#undef BEND_COEFFICIENT
if(hooks.onNote)
hooks.onNote(hooks.onNote_userData, c, noteTone, midiins, vol, midibend);
@@ -1340,6 +1360,7 @@ void MIDIplay::setErrorString(const std::string &err)
int64_t MIDIplay::calculateChipChannelGoodness(size_t c, const MIDIchannel::NoteInfo::Phys &ins) const
{
+ Synth &synth = *m_synth;
const AdlChannel &chan = m_chipChannels[c];
int64_t koff_ms = chan.koff_time_until_neglible_us / 1000;
int64_t s = -koff_ms;
@@ -1350,7 +1371,7 @@ int64_t MIDIplay::calculateChipChannelGoodness(size_t c, const MIDIchannel::Note
s -= 40000;
// If it's same instrument, better chance to get it when no free channels
if(chan.recent_ins == ins)
- s = (m_synth.m_musicMode == OPL3::MODE_CMF) ? 0 : -koff_ms;
+ s = (synth.m_musicMode == Synth::MODE_CMF) ? 0 : -koff_ms;
return s;
}
@@ -1395,12 +1416,12 @@ int64_t MIDIplay::calculateChipChannelGoodness(size_t c, const MIDIchannel::Note
// increase the score slightly.
unsigned n_evacuation_stations = 0;
- for(size_t c2 = 0; c2 < static_cast<size_t>(m_synth.m_numChannels); ++c2)
+ for(size_t c2 = 0; c2 < static_cast<size_t>(synth.m_numChannels); ++c2)
{
if(c2 == c) continue;
- if(m_synth.m_channelCategory[c2]
- != m_synth.m_channelCategory[c]) continue;
+ if(synth.m_channelCategory[c2]
+ != synth.m_channelCategory[c]) continue;
for(AdlChannel::LocationData *m = m_chipChannels[c2].users_first; m; m = m->next)
{
@@ -1422,6 +1443,8 @@ void MIDIplay::prepareChipChannelForNewNote(size_t c, const MIDIchannel::NoteInf
{
if(m_chipChannels[c].users_empty()) return; // Nothing to do
+ Synth &synth = *m_synth;
+
//bool doing_arpeggio = false;
for(AdlChannel::LocationData *jnext = m_chipChannels[c].users_first; jnext;)
{
@@ -1458,13 +1481,14 @@ void MIDIplay::prepareChipChannelForNewNote(size_t c, const MIDIchannel::NoteInf
// Keyoff the channel so that it can be retriggered,
// unless the new note will be introduced as just an arpeggio.
if(m_chipChannels[c].users_empty())
- m_synth.noteOff(c);
+ synth.noteOff(c);
}
void MIDIplay::killOrEvacuate(size_t from_channel,
AdlChannel::LocationData *j,
MIDIplay::MIDIchannel::activenoteiterator i)
{
+ Synth &synth = *m_synth;
uint32_t maxChannels = ADL_MAX_CHIPS * 18;
// Before killing the note, check if it can be
@@ -1472,7 +1496,7 @@ void MIDIplay::killOrEvacuate(size_t from_channel,
// instrument. This helps if e.g. all channels
// are full of strings and we want to do percussion.
// FIXME: This does not care about four-op entanglements.
- for(uint32_t c = 0; c < m_synth.m_numChannels; ++c)
+ for(uint32_t c = 0; c < synth.m_numChannels; ++c)
{
uint16_t cs = static_cast<uint16_t>(c);
@@ -1480,7 +1504,7 @@ void MIDIplay::killOrEvacuate(size_t from_channel,
break;
if(c == from_channel)
continue;
- if(m_synth.m_channelCategory[c] != m_synth.m_channelCategory[from_channel])
+ if(synth.m_channelCategory[c] != synth.m_channelCategory[from_channel])
continue;
AdlChannel &adlch = m_chipChannels[c];
@@ -1540,7 +1564,8 @@ void MIDIplay::panic()
void MIDIplay::killSustainingNotes(int32_t midCh, int32_t this_adlchn, uint32_t sustain_type)
{
- uint32_t first = 0, last = m_synth.m_numChannels;
+ Synth &synth = *m_synth;
+ uint32_t first = 0, last = synth.m_numChannels;
if(this_adlchn >= 0)
{
@@ -1572,13 +1597,14 @@ void MIDIplay::killSustainingNotes(int32_t midCh, int32_t this_adlchn, uint32_t
// Keyoff the channel, if there are no users left.
if(m_chipChannels[c].users_empty())
- m_synth.noteOff(c);
+ synth.noteOff(c);
}
}
void MIDIplay::markSostenutoNotes(int32_t midCh)
{
- uint32_t first = 0, last = m_synth.m_numChannels;
+ Synth &synth = *m_synth;
+ uint32_t first = 0, last = synth.m_numChannels;
for(uint32_t c = first; c < last; ++c)
{
if(m_chipChannels[c].users_empty())
@@ -1686,6 +1712,9 @@ void MIDIplay::updateArpeggio(double) // amount = amount of time passed
{
// If there is an adlib channel that has multiple notes
// simulated on the same channel, arpeggio them.
+
+ Synth &synth = *m_synth;
+
#if 0
const unsigned desired_arpeggio_rate = 40; // Hz (upper limit)
# if 1
@@ -1708,7 +1737,7 @@ void MIDIplay::updateArpeggio(double) // amount = amount of time passed
++m_arpeggioCounter;
- for(uint32_t c = 0; c < m_synth.m_numChannels; ++c)
+ for(uint32_t c = 0; c < synth.m_numChannels; ++c)
{
retry_arpeggio:
if(c > uint32_t(std::numeric_limits<int32_t>::max()))
@@ -1790,7 +1819,7 @@ void MIDIplay::describeChannels(char *str, char *attr, size_t size)
if (!str || size <= 0)
return;
- OPL3 &synth = m_synth;
+ Synth &synth = *m_synth;
uint32_t numChannels = synth.m_numChannels;
uint32_t index = 0;
@@ -1811,11 +1840,11 @@ void MIDIplay::describeChannels(char *str, char *attr, size_t size)
{
switch(synth.m_channelCategory[index])
{
- case OPL3::ChanCat_Regular:
+ case Synth::ChanCat_Regular:
str[index] = '+';
break;
- case OPL3::ChanCat_4op_Master:
- case OPL3::ChanCat_4op_Slave:
+ case Synth::ChanCat_4op_Master:
+ case Synth::ChanCat_4op_Slave:
str[index] = '#';
break;
default: // rhythm-mode percussion
@@ -1843,7 +1872,7 @@ struct AdlInstrumentTester::Impl
uint32_t cur_gm;
uint32_t ins_idx;
std::vector<uint32_t> adl_ins_list;
- OPL3 *opl;
+ Synth *opl;
MIDIplay *play;
};
@@ -1855,7 +1884,7 @@ ADLMIDI_EXPORT AdlInstrumentTester::AdlInstrumentTester(ADL_MIDIPlayer *device)
P->cur_gm = 0;
P->ins_idx = 0;
P->play = play;
- P->opl = play ? &play->m_synth : NULL;
+ P->opl = play ? play->m_synth.get() : NULL;
#else
ADL_UNUSED(device);
#endif
@@ -1885,8 +1914,8 @@ ADLMIDI_EXPORT void AdlInstrumentTester::FindAdlList()
ADLMIDI_EXPORT void AdlInstrumentTester::Touch(unsigned c, unsigned volume) // Volume maxes at 127*127*127
{
#ifndef DISABLE_EMBEDDED_BANKS
- OPL3 *opl = P->opl;
- if(opl->m_volumeScale == OPL3::VOLUME_NATIVE)
+ Synth *opl = P->opl;
+ if(opl->m_volumeScale == Synth::VOLUME_NATIVE)
opl->touchNote(c, static_cast<uint8_t>(volume * 127 / (127 * 127 * 127) / 2));
else
{
@@ -1905,7 +1934,7 @@ ADLMIDI_EXPORT void AdlInstrumentTester::DoNote(int note)
{
#ifndef DISABLE_EMBEDDED_BANKS
MIDIplay *play = P->play;
- OPL3 *opl = P->opl;
+ Synth *opl = P->opl;
if(P->adl_ins_list.empty()) FindAdlList();
const unsigned meta = P->adl_ins_list[P->ins_idx];
const adlinsdata2 ains = adlinsdata2::from_adldata(::adlins[meta]);
@@ -1971,7 +2000,7 @@ ADLMIDI_EXPORT void AdlInstrumentTester::NextGM(int offset)
ADLMIDI_EXPORT void AdlInstrumentTester::NextAdl(int offset)
{
#ifndef DISABLE_EMBEDDED_BANKS
- //OPL3 *opl = P->opl;
+ //Synth *opl = P->opl;
if(P->adl_ins_list.empty()) FindAdlList();
const unsigned NumBanks = (unsigned)adl_getBanksCount();
P->ins_idx = (uint32_t)((int32_t)P->ins_idx + (int32_t)P->adl_ins_list.size() + offset) % (int32_t)P->adl_ins_list.size();
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-04 06:00:44 +0000