Ticket #8404: mt32-mem.patch

sound/softsynth/mt32/partial.cpp

@@ -20 +20 @@
  */
 
 #include <stdlib.h>
+#include <assert.h>
 #include <math.h>
 #include <string.h>
 
@@ -138 +139 @@
         play = true;
         initKeyFollow(poly->freqnum); // Initialises noteVal, filtVal and realVal
 #if MT32EMU_ACCURATENOTES == 0
+        assert(noteLookups);
         noteLookup = &noteLookups[noteVal - LOWEST_NOTE];
 #else
         TableInitialiser::initNote(synth, &noteLookupStorage, noteVal, (float)synth->myProp.sampleRate, synth->masterTune, synth->PCMList, NULL);

sound/softsynth/mt32/synth.cpp

@@ -79 +79 @@
         isOpen = false;
         reverbModel = NULL;
         partialManager = NULL;
-        memset(noteLookups, 0, sizeof(noteLookups));
         memset(parts, 0, sizeof(parts));
 }
 

sound/softsynth/mt32/tables.cpp

@@ -68 +68 @@
 float ResonFactor[31];
 float ResonInv[31];
 
-NoteLookup noteLookups[NUM_NOTES];
+NoteLookup *noteLookups = 0;
+//NoteLookup noteLookups[NUM_NOTES];
 
 // Begin filter stuff
 
@@ -645 +646 @@
         }
 #endif
 
+        noteLookups = new NoteLookup[NUM_NOTES];
+        memset(noteLookups, 0, sizeof(NoteLookup) * NUM_NOTES);
+
         float progress = 0.0f;
         bool abort = false;
         synth->report(ReportType_progressInit, &progress);
@@ -700 +704 @@
                         }
                 }
         }
+        delete [] noteLookups;
         initialisedMasterTune = 0.0f;
 }
 

sound/softsynth/mt32/tables.h

@@ -84 +84 @@
         Bit32u waveformSize[3];
 };
 
-extern NoteLookup noteLookups[NUM_NOTES];
+extern NoteLookup *noteLookups;
+//extern NoteLookup noteLookups[NUM_NOTES];
 
 class TableInitialiser {
         static void initMT32ConstantTables(Synth *synth);