aboutsummaryrefslogtreecommitdiff
path: root/src/adlmidi_midiplay.hpp
diff options
context:
space:
mode:
authorWohlstand <admin@wohlnet.ru>2020-09-13 19:01:30 +0300
committerWohlstand <admin@wohlnet.ru>2020-09-13 19:01:30 +0300
commitbe5cdf28369da49f316e08dca0e51c24f37cfe84 (patch)
tree3ac091873325e2a00950c01a423a5a2f979fc48a /src/adlmidi_midiplay.hpp
parent10ee01dbcab85c3b2828b0551e017a2c2963a41b (diff)
downloadlibADLMIDI-be5cdf28369da49f316e08dca0e51c24f37cfe84.tar.gz
libADLMIDI-be5cdf28369da49f316e08dca0e51c24f37cfe84.tar.bz2
libADLMIDI-be5cdf28369da49f316e08dca0e51c24f37cfe84.zip
Refactor internal instrument data structures
Diffstat (limited to 'src/adlmidi_midiplay.hpp')
-rw-r--r--src/adlmidi_midiplay.hpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/adlmidi_midiplay.hpp b/src/adlmidi_midiplay.hpp
index ff741ee..78cd89a 100644
--- a/src/adlmidi_midiplay.hpp
+++ b/src/adlmidi_midiplay.hpp
@@ -172,7 +172,7 @@ public:
//! Time-to-live until release (short percussion note fix)
double ttl;
//! Patch selected
- const adlinsdata2 *ains;
+ const OplInstMeta *ains;
enum
{
MaxNumPhysChans = 2,
@@ -196,18 +196,18 @@ public:
//! Destination chip channel
uint16_t chip_chan;
//! ins, inde to adl[]
- adldata ains;
+ OplTimbre op;
//! Is this voice must be detunable?
bool pseudo4op;
void assign(const Phys &oth)
{
- ains = oth.ains;
+ op = oth.op;
pseudo4op = oth.pseudo4op;
}
bool operator==(const Phys &oth) const
{
- return (ains == oth.ains) && (pseudo4op == oth.pseudo4op);
+ return (op == oth.op) && (pseudo4op == oth.pseudo4op);
}
bool operator!=(const Phys &oth) const
{