aboutsummaryrefslogtreecommitdiff
path: root/src/adlmidi_midiplay.cpp
diff options
context:
space:
mode:
authorWohlstand <admin@wohlnet.ru>2017-11-05 21:01:37 +0300
committerWohlstand <admin@wohlnet.ru>2017-11-05 21:01:37 +0300
commit3bcaac365e914b82f80839e047ebedd6b81fc634 (patch)
tree61105b57fac1fed72f5562ee47f7829bb0af1fb0 /src/adlmidi_midiplay.cpp
parent44b9892c91476fe4e64b67f3868322b097003335 (diff)
downloadlibADLMIDI-3bcaac365e914b82f80839e047ebedd6b81fc634.tar.gz
libADLMIDI-3bcaac365e914b82f80839e047ebedd6b81fc634.tar.bz2
libADLMIDI-3bcaac365e914b82f80839e047ebedd6b81fc634.zip
Tri-state for deep-tremolo/vibrato/sm/adlib-percussion modes
By default every flag will have "auto" type which means mode will be set in dependence on a bank.
Diffstat (limited to 'src/adlmidi_midiplay.cpp')
-rw-r--r--src/adlmidi_midiplay.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/adlmidi_midiplay.cpp b/src/adlmidi_midiplay.cpp
index 27ec8d4..fa95e32 100644
--- a/src/adlmidi_midiplay.cpp
+++ b/src/adlmidi_midiplay.cpp
@@ -639,13 +639,13 @@ MIDIplay::MIDIplay():
m_setup.AdlBank = 0;
m_setup.NumFourOps = 7;
m_setup.NumCards = 2;
- m_setup.HighTremoloMode = false;
- m_setup.HighVibratoMode = false;
- m_setup.AdlPercussionMode = false;
- m_setup.LogarithmicVolumes = false;
- m_setup.SkipForward = 0;
+ m_setup.HighTremoloMode = -1;
+ m_setup.HighVibratoMode = -1;
+ m_setup.AdlPercussionMode = -1;
+ m_setup.LogarithmicVolumes = false;
+ //m_setup.SkipForward = 0;
m_setup.loopingIsEnabled = false;
- m_setup.ScaleModulators = false;
+ m_setup.ScaleModulators = -1;
m_setup.delay = 0.0;
m_setup.carry = 0.0;
m_setup.stored_samples = 0;
@@ -654,11 +654,11 @@ MIDIplay::MIDIplay():
opl.NumCards = m_setup.NumCards;
opl.AdlBank = m_setup.AdlBank;
opl.NumFourOps = m_setup.NumFourOps;
- opl.LogarithmicVolumes = m_setup.LogarithmicVolumes;
- opl.HighTremoloMode = m_setup.HighTremoloMode;
- opl.HighVibratoMode = m_setup.HighVibratoMode;
- opl.AdlPercussionMode = m_setup.AdlPercussionMode;
- opl.ScaleModulators = m_setup.ScaleModulators;
+ opl.LogarithmicVolumes = m_setup.LogarithmicVolumes;
+ opl.HighTremoloMode = m_setup.HighTremoloMode == -1 ? adlbanksetup[m_setup.AdlBank].deepTremolo : (bool)m_setup.HighTremoloMode;
+ opl.HighVibratoMode = m_setup.HighVibratoMode == -1 ? adlbanksetup[m_setup.AdlBank].deepVibrato : (bool)m_setup.HighVibratoMode;
+ opl.AdlPercussionMode = m_setup.AdlPercussionMode == -1 ? adlbanksetup[m_setup.AdlBank].adLibPercussions : (bool)m_setup.AdlPercussionMode;
+ opl.ScaleModulators = m_setup.ScaleModulators == -1 ? adlbanksetup[m_setup.AdlBank].scaleModulators : (bool)m_setup.ScaleModulators;
}
uint64_t MIDIplay::ReadVarLen(uint8_t **ptr)