Some quick and dirty MIDI player optimizations, now it works on the X5 and M5 too

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13108 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 6 insertions, 7 deletions

diff --git a/apps/plugins/midi/guspat.c b/apps/plugins/midi/guspat.c
index 716c20d..983589f 100644
--- a/apps/plugins/midi/guspat.c
+++ b/apps/plugins/midi/guspat.c
@@ -29,9 +29,12 @@ unsigned int readDWord(int file)
     return (readChar(file)<<0) | (readChar(file)<<8) | (readChar(file)<<16) | (readChar(file)<<24);
 }
 
+int curr_waveform;
+struct GWaveform waveforms[32] IBSS_ATTR;
+
 struct GWaveform * loadWaveform(int file)
 {
-    struct GWaveform * wav = (struct GWaveform *)malloc(sizeof(struct GWaveform));
+    struct GWaveform * wav = &waveforms[curr_waveform++];
     rb->memset(wav, 0, sizeof(struct GWaveform));
 
     wav->name=readData(file, 7);
diff --git a/apps/plugins/midi/synth.c b/apps/plugins/midi/synth.c
index a3a3d60..5a7a02f 100644
--- a/apps/plugins/midi/synth.c
+++ b/apps/plugins/midi/synth.c
@@ -182,12 +182,7 @@ int initSynth(struct MIDIfile * mf, char * filename, char * drumConfig)
     return 0;
 }
 
-inline short getSample(int s,struct GWaveform * wf )
-{
-    /* Sign conversion moved to guspat.c */
-    /* 8bit conversion NOT YET IMPLEMENTED in guspat.c */
-    return ((short *) wf->data)[s];
-}
+#define getSample(s,wf) ((short *)(wf)->data)[s]
 
 void setPoint(struct SynthObject * so, int pt)
 {
@@ -254,6 +249,7 @@ inline void stopVoice(struct SynthObject * so)
     so->decay = 0;
 }
 
+signed short int synthVoice(struct SynthObject * so) ICODE_ATTR;
 signed short int synthVoice(struct SynthObject * so)
 {
     struct GWaveform * wf;