Lock settings for CMF and IMF playing to don't destroy them

For now, all settings are in safe, except of custom bank that getting be dropped away by CMF file that does passing of own custom instruments.

1 files changed, 94 insertions, 37 deletions

diff --git a/src/adlmidi.cpp b/src/adlmidi.cpp
index bde8757..097fce8 100644
--- a/src/adlmidi.cpp
+++ b/src/adlmidi.cpp
@@ -68,7 +68,7 @@ ADLMIDI_EXPORT struct ADL_MIDIPlayer *adl_init(long sample_rate)
         return NULL;
     }
     midi_device->adl_midiPlayer = player;
-    adlRefreshNumCards(midi_device);
+    adlCalculateFourOpChannels(player);
     return midi_device;
 }
 
@@ -113,10 +113,25 @@ ADLMIDI_EXPORT int adl_setNumChips(ADL_MIDIPlayer *device, int numChips)
         return -1;
     }
 
-    play->m_synth.m_numChips = play->m_setup.numChips;
-    play->partialReset();
+    int maxFourOps = static_cast<int>(play->m_setup.numChips * 6);
+
+    if(play->m_setup.numFourOps > maxFourOps)
+        play->m_setup.numFourOps = maxFourOps;
+    else if(play->m_setup.numFourOps < -1)
+        play->m_setup.numFourOps = -1;
 
-    return adlRefreshNumCards(device);
+    if(!play->m_synth.setupLocked())
+    {
+        play->m_synth.m_numChips = play->m_setup.numChips;
+        if(play->m_setup.numFourOps < 0)
+            adlCalculateFourOpChannels(play, true);
+        else
+            play->m_synth.m_numFourOps = static_cast<uint32_t>(play->m_setup.numFourOps);
+        play->partialReset();
+        return 0;
+    }
+
+    return 0;
 }
 
 ADLMIDI_EXPORT int adl_getNumChips(struct ADL_MIDIPlayer *device)
@@ -128,6 +143,15 @@ ADLMIDI_EXPORT int adl_getNumChips(struct ADL_MIDIPlayer *device)
     return (int)play->m_setup.numChips;
 }
 
+ADLMIDI_EXPORT int adl_getNumChipsObtained(struct ADL_MIDIPlayer *device)
+{
+    if(device == NULL)
+        return -2;
+    MidiPlayer *play = GET_MIDI_PLAYER(device);
+    assert(play);
+    return (int)play->m_synth.m_numChips;
+}
+
 ADLMIDI_EXPORT int adl_setBank(ADL_MIDIPlayer *device, int bank)
 {
 #ifdef DISABLE_EMBEDDED_BANKS
@@ -159,7 +183,7 @@ ADLMIDI_EXPORT int adl_setBank(ADL_MIDIPlayer *device, int bank)
     play->m_synth.setEmbeddedBank(play->m_setup.bankId);
     play->applySetup();
 
-    return adlRefreshNumCards(device);
+    return 0;
 #endif
 }
 
@@ -357,9 +381,6 @@ ADLMIDI_EXPORT int adl_setNumFourOpsChn(ADL_MIDIPlayer *device, int ops4)
     if(!device)
         return -1;
 
-    if(ops4 == -1)
-        return adlRefreshNumCards(device);
-
     MidiPlayer *play = GET_MIDI_PLAYER(device);
     assert(play);
     if((unsigned int)ops4 > 6 * play->m_setup.numChips)
@@ -371,8 +392,14 @@ ADLMIDI_EXPORT int adl_setNumFourOpsChn(ADL_MIDIPlayer *device, int ops4)
     }
 
     play->m_setup.numFourOps = static_cast<unsigned int>(ops4);
-    play->m_synth.m_numFourOps = play->m_setup.numFourOps;
-    play->m_synth.updateChannelCategories();
+    if(!play->m_synth.setupLocked())
+    {
+        if(play->m_setup.numFourOps >= 0)
+            play->m_synth.m_numFourOps = play->m_setup.numFourOps;
+        else
+            adlCalculateFourOpChannels(play);
+        play->m_synth.updateChannelCategories();
+    }
 
     return 0;
 }
@@ -380,22 +407,35 @@ ADLMIDI_EXPORT int adl_setNumFourOpsChn(ADL_MIDIPlayer *device, int ops4)
 ADLMIDI_EXPORT int adl_getNumFourOpsChn(struct ADL_MIDIPlayer *device)
 {
     if(!device)
-        return -1;
+        return -2;
     MidiPlayer *play = GET_MIDI_PLAYER(device);
     assert(play);
-    return (int)play->m_setup.numFourOps;
+    return play->m_setup.numFourOps;
 }
 
+ADLMIDI_EXPORT int adl_getNumFourOpsChnObtained(struct ADL_MIDIPlayer *device)
+{
+    if(!device)
+        return -2;
+    MidiPlayer *play = GET_MIDI_PLAYER(device);
+    assert(play);
+    return (int)play->m_synth.m_numFourOps;
+}
+
+
 ADLMIDI_EXPORT void adl_setPercMode(ADL_MIDIPlayer *device, int percmod)
 {
     if(!device) return;
     MidiPlayer *play = GET_MIDI_PLAYER(device);
     assert(play);
     play->m_setup.rhythmMode = percmod;
-    play->m_synth.m_rhythmMode   = play->m_setup.rhythmMode < 0 ?
-                              (play->m_synth.m_insBankSetup.adLibPercussions) :
-                              (play->m_setup.rhythmMode != 0);
-    play->m_synth.updateChannelCategories();
+    if(!play->m_synth.setupLocked())
+    {
+        play->m_synth.m_rhythmMode   = play->m_setup.rhythmMode < 0 ?
+                                  (play->m_synth.m_insBankSetup.adLibPercussions) :
+                                  (play->m_setup.rhythmMode != 0);
+        play->m_synth.updateChannelCategories();
+    }
 }
 
 ADLMIDI_EXPORT void adl_setHVibrato(ADL_MIDIPlayer *device, int hvibro)
@@ -404,10 +444,13 @@ ADLMIDI_EXPORT void adl_setHVibrato(ADL_MIDIPlayer *device, int hvibro)
     MidiPlayer *play = GET_MIDI_PLAYER(device);
     assert(play);
     play->m_setup.deepVibratoMode = hvibro;
-    play->m_synth.m_deepVibratoMode     = play->m_setup.deepVibratoMode < 0 ?
-                                    play->m_synth.m_insBankSetup.deepVibrato :
-                                    (play->m_setup.deepVibratoMode != 0);
-    play->m_synth.commitDeepFlags();
+    if(!play->m_synth.setupLocked())
+    {
+        play->m_synth.m_deepVibratoMode     = play->m_setup.deepVibratoMode < 0 ?
+                                        play->m_synth.m_insBankSetup.deepVibrato :
+                                        (play->m_setup.deepVibratoMode != 0);
+        play->m_synth.commitDeepFlags();
+    }
 }
 
 ADLMIDI_EXPORT int adl_getHVibrato(struct ADL_MIDIPlayer *device)
@@ -424,10 +467,13 @@ ADLMIDI_EXPORT void adl_setHTremolo(ADL_MIDIPlayer *device, int htremo)
     MidiPlayer *play = GET_MIDI_PLAYER(device);
     assert(play);
     play->m_setup.deepTremoloMode = htremo;
-    play->m_synth.m_deepTremoloMode     = play->m_setup.deepTremoloMode < 0 ?
-                                    play->m_synth.m_insBankSetup.deepTremolo :
-                                    (play->m_setup.deepTremoloMode != 0);
-    play->m_synth.commitDeepFlags();
+    if(!play->m_synth.setupLocked())
+    {
+        play->m_synth.m_deepTremoloMode     = play->m_setup.deepTremoloMode < 0 ?
+                                        play->m_synth.m_insBankSetup.deepTremolo :
+                                        (play->m_setup.deepTremoloMode != 0);
+        play->m_synth.commitDeepFlags();
+    }
 }
 
 ADLMIDI_EXPORT int adl_getHTremolo(struct ADL_MIDIPlayer *device)
@@ -445,9 +491,12 @@ ADLMIDI_EXPORT void adl_setScaleModulators(ADL_MIDIPlayer *device, int smod)
     MidiPlayer *play = GET_MIDI_PLAYER(device);
     assert(play);
     play->m_setup.scaleModulators = smod;
-    play->m_synth.m_scaleModulators     = play->m_setup.scaleModulators < 0 ?
-                                    play->m_synth.m_insBankSetup.scaleModulators :
-                                    (play->m_setup.scaleModulators != 0);
+    if(!play->m_synth.setupLocked())
+    {
+        play->m_synth.m_scaleModulators     = play->m_setup.scaleModulators < 0 ?
+                                        play->m_synth.m_insBankSetup.scaleModulators :
+                                        (play->m_setup.scaleModulators != 0);
+    }
 }
 
 ADLMIDI_EXPORT void adl_setFullRangeBrightness(struct ADL_MIDIPlayer *device, int fr_brightness)
@@ -489,10 +538,13 @@ ADLMIDI_EXPORT void adl_setLogarithmicVolumes(struct ADL_MIDIPlayer *device, int
     MidiPlayer *play = GET_MIDI_PLAYER(device);
     assert(play);
     play->m_setup.logarithmicVolumes = (logvol != 0);
-    if(play->m_setup.logarithmicVolumes)
-        play->m_synth.setVolumeScaleModel(ADLMIDI_VolumeModel_NativeOPL3);
-    else
-        play->m_synth.setVolumeScaleModel(static_cast<ADLMIDI_VolumeModels>(play->m_synth.m_volumeScale));
+    if(!play->m_synth.setupLocked())
+    {
+        if(play->m_setup.logarithmicVolumes)
+            play->m_synth.setVolumeScaleModel(ADLMIDI_VolumeModel_NativeOPL3);
+        else
+            play->m_synth.setVolumeScaleModel(static_cast<ADLMIDI_VolumeModels>(play->m_synth.m_volumeScale));
+    }
 }
 
 ADLMIDI_EXPORT void adl_setVolumeRangeModel(struct ADL_MIDIPlayer *device, int volumeModel)
@@ -502,10 +554,13 @@ ADLMIDI_EXPORT void adl_setVolumeRangeModel(struct ADL_MIDIPlayer *device, int v
     MidiPlayer *play = GET_MIDI_PLAYER(device);
     assert(play);
     play->m_setup.volumeScaleModel = volumeModel;
-    if(play->m_setup.volumeScaleModel == ADLMIDI_VolumeModel_AUTO)//Use bank default volume model
-        play->m_synth.m_volumeScale = (OPL3::VolumesScale)play->m_synth.m_insBankSetup.volumeModel;
-    else
-        play->m_synth.setVolumeScaleModel(static_cast<ADLMIDI_VolumeModels>(volumeModel));
+    if(!play->m_synth.setupLocked())
+    {
+        if(play->m_setup.volumeScaleModel == ADLMIDI_VolumeModel_AUTO)//Use bank default volume model
+            play->m_synth.m_volumeScale = (OPL3::VolumesScale)play->m_synth.m_insBankSetup.volumeModel;
+        else
+            play->m_synth.setVolumeScaleModel(static_cast<ADLMIDI_VolumeModels>(volumeModel));
+    }
 }
 
 ADLMIDI_EXPORT int adl_getVolumeRangeModel(struct ADL_MIDIPlayer *device)
@@ -531,7 +586,8 @@ ADLMIDI_EXPORT int adl_openBankFile(struct ADL_MIDIPlayer *device, const char *f
                 play->setErrorString("ADL MIDI: Can't load file");
             return -1;
         }
-        else return adlRefreshNumCards(device);
+        else
+            return adlCalculateFourOpChannels(play, true);
     }
 
     ADLMIDI_ErrorString = "Can't load file: ADLMIDI is not initialized";
@@ -552,7 +608,8 @@ ADLMIDI_EXPORT int adl_openBankData(struct ADL_MIDIPlayer *device, const void *m
                 play->setErrorString("ADL MIDI: Can't load data from memory");
             return -1;
         }
-        else return adlRefreshNumCards(device);
+        else
+            return adlCalculateFourOpChannels(play, true);
     }
 
     ADLMIDI_ErrorString = "Can't load file: ADL MIDI is not initialized";