1 files changed, 1 insertions, 16 deletions
diff --git a/src/adlmidi_load.cpp b/src/adlmidi_load.cpp
index 89428c9..f33c091 100644
--- a/src/adlmidi_load.cpp
+++ b/src/adlmidi_load.cpp
@@ -379,22 +379,7 @@ bool MIDIplay::LoadMIDI(MIDIplay::fileReader &fr)
     }
 
     /**** Set all properties BEFORE starting of actial file reading! ****/
-    m_setup.tick_skip_samples_delay = 0;
-    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;
-    opl.LogarithmicVolumes = m_setup.LogarithmicVolumes;
-    //opl.CartoonersVolumes = false;
-    opl.m_musicMode = OPL3::MODE_MIDI;
-    opl.ChangeVolumeRangesModel(static_cast<ADLMIDI_VolumeModels>(m_setup.VolumeModel));
-    if(m_setup.VolumeModel == ADLMIDI_VolumeModel_AUTO)//Use bank default volume model
-        opl.m_volumeScale = (OPL3::VolumesScale)adlbanksetup[m_setup.AdlBank].volumeModel;
-
-    opl.NumCards    = m_setup.NumCards;
-    opl.NumFourOps  = m_setup.NumFourOps;
-    cmf_percussion_mode = false;
-    opl.Reset(m_setup.PCM_RATE);
+    applySetup();
 
     atEnd            = false;
     loopStart        = true;