From be5cdf28369da49f316e08dca0e51c24f37cfe84 Mon Sep 17 00:00:00 2001
From: Wohlstand <admin@wohlnet.ru>
Date: Sun, 13 Sep 2020 19:01:30 +0300
Subject: Refactor internal instrument data structures

---
 src/adlmidi_midiplay.hpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/adlmidi_midiplay.hpp')

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
                 {
-- 
cgit v1.2.3