From 046214a0130922baa322d195ae39c813693c446b Mon Sep 17 00:00:00 2001 From: JP Cimalando Date: Fri, 5 Oct 2018 20:13:39 +0200 Subject: reorganize MIDIplay code --- src/adlmidi_private.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'src/adlmidi_private.cpp') diff --git a/src/adlmidi_private.cpp b/src/adlmidi_private.cpp index 4e8e488..00507ff 100644 --- a/src/adlmidi_private.cpp +++ b/src/adlmidi_private.cpp @@ -21,6 +21,7 @@ * along with this program. If not, see . */ +#include "adlmidi_midiplay.hpp" #include "adlmidi_private.hpp" std::string ADLMIDI_ErrorString; @@ -36,16 +37,17 @@ void adl_audioTickHandler(void *instance, uint32_t chipId, uint32_t rate) int adlCalculateFourOpChannels(MIDIplay *play, bool silent) { + OPL3 &synth = *play->m_synth; size_t n_fourop[2] = {0, 0}, n_total[2] = {0, 0}; //Automatically calculate how much 4-operator channels is necessary #ifndef DISABLE_EMBEDDED_BANKS - if(play->m_synth.m_embeddedBank == OPL3::CustomBankTag) + if(synth.m_embeddedBank == OPL3::CustomBankTag) #endif { //For custom bank - OPL3::BankMap::iterator it = play->m_synth.m_insBanks.begin(); - OPL3::BankMap::iterator end = play->m_synth.m_insBanks.end(); + OPL3::BankMap::iterator it = synth.m_insBanks.begin(); + OPL3::BankMap::iterator end = synth.m_insBanks.end(); for(; it != end; ++it) { size_t bank = it->first; @@ -99,10 +101,10 @@ int adlCalculateFourOpChannels(MIDIplay *play, bool silent) : (play->m_setup.NumCards == 1 ? 1 : play->m_setup.NumCards * 4); */ - play->m_synth.m_numFourOps = static_cast(numFourOps * play->m_synth.m_numChips); + synth.m_numFourOps = static_cast(numFourOps * synth.m_numChips); // Update channel categories and set up four-operator channels if(!silent) - play->m_synth.updateChannelCategories(); + synth.updateChannelCategories(); return 0; } -- cgit v1.2.3 From 6bb43bedde33404428f1baa75c1f0f97896a5cc7 Mon Sep 17 00:00:00 2001 From: JP Cimalando Date: Fri, 5 Oct 2018 20:36:31 +0200 Subject: reorganize around a lighter adlmidi_private header --- src/adlmidi_private.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/adlmidi_private.cpp') diff --git a/src/adlmidi_private.cpp b/src/adlmidi_private.cpp index 00507ff..8c9e769 100644 --- a/src/adlmidi_private.cpp +++ b/src/adlmidi_private.cpp @@ -22,6 +22,7 @@ */ #include "adlmidi_midiplay.hpp" +#include "adlmidi_opl3.hpp" #include "adlmidi_private.hpp" std::string ADLMIDI_ErrorString; -- cgit v1.2.3 From c542a7576de33ecc9c9744cf5a4df7d094af5c47 Mon Sep 17 00:00:00 2001 From: JP Cimalando Date: Fri, 5 Oct 2018 22:29:37 +0200 Subject: typedef OPL3 as Synth --- src/adlmidi_private.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/adlmidi_private.cpp') diff --git a/src/adlmidi_private.cpp b/src/adlmidi_private.cpp index 8c9e769..b2c9b8d 100644 --- a/src/adlmidi_private.cpp +++ b/src/adlmidi_private.cpp @@ -38,21 +38,21 @@ void adl_audioTickHandler(void *instance, uint32_t chipId, uint32_t rate) int adlCalculateFourOpChannels(MIDIplay *play, bool silent) { - OPL3 &synth = *play->m_synth; + Synth &synth = *play->m_synth; size_t n_fourop[2] = {0, 0}, n_total[2] = {0, 0}; //Automatically calculate how much 4-operator channels is necessary #ifndef DISABLE_EMBEDDED_BANKS - if(synth.m_embeddedBank == OPL3::CustomBankTag) + if(synth.m_embeddedBank == Synth::CustomBankTag) #endif { //For custom bank - OPL3::BankMap::iterator it = synth.m_insBanks.begin(); - OPL3::BankMap::iterator end = synth.m_insBanks.end(); + Synth::BankMap::iterator it = synth.m_insBanks.begin(); + Synth::BankMap::iterator end = synth.m_insBanks.end(); for(; it != end; ++it) { size_t bank = it->first; - size_t div = (bank & OPL3::PercussionTag) ? 1 : 0; + size_t div = (bank & Synth::PercussionTag) ? 1 : 0; for(size_t i = 0; i < 128; ++i) { adlinsdata2 &ins = it->second.ins[i]; -- cgit v1.2.3