1 files changed, 153 insertions, 174 deletions

diff --git a/apps/plugins/midi/guspat.c b/apps/plugins/midi/guspat.c
index 2172072eb1..23b6811542 100644
--- a/apps/plugins/midi/guspat.c
+++ b/apps/plugins/midi/guspat.c
@@ -21,197 +21,176 @@ extern struct plugin_api * rb;
 
 unsigned int readWord(int file)
 {
-        return (readChar(file)<<0) | (readChar(file)<<8); // | (readChar(file)<<8) | (readChar(file)<<0);
+    return (readChar(file)<<0) | (readChar(file)<<8); // | (readChar(file)<<8) | (readChar(file)<<0);
 }
 
 unsigned int readDWord(int file)
 {
-        return (readChar(file)<<0) | (readChar(file)<<8) | (readChar(file)<<16) | (readChar(file)<<24);
+    return (readChar(file)<<0) | (readChar(file)<<8) | (readChar(file)<<16) | (readChar(file)<<24);
 }
 
 struct GWaveform * loadWaveform(int file)
 {
-        struct GWaveform * wav = (struct GWaveform *)allocate(sizeof(struct GWaveform));
-        rb->memset(wav, 0, sizeof(struct GWaveform));
-
-        wav->name=readData(file, 7);
-        printf("\nWAVE NAME = [%s]", wav->name);
-        wav->fractions=readChar(file);
-        wav->wavSize=readDWord(file);
-        wav->startLoop=readDWord(file);
-        wav->endLoop=readDWord(file);
-        wav->sampRate=readWord(file);
-
-        wav->lowFreq=readDWord(file);
-        wav->highFreq=readDWord(file);
-        wav->rootFreq=readDWord(file);
-
-        wav->tune=readWord(file);
-
-        wav->balance=readChar(file);
-        wav->envRate=readData(file, 6);
-        wav->envOffset=readData(file, 6);
-
-        wav->tremSweep=readChar(file);
-        wav->tremRate==readChar(file);
-        wav->tremDepth=readChar(file);
-        wav->vibSweep=readChar(file);
-        wav->vibRate=readChar(file);
-        wav->vibDepth=readChar(file);
-        wav->mode=readChar(file);
-
-        wav->scaleFreq=readWord(file);
-        wav->scaleFactor=readWord(file);
-        printf("\nScaleFreq = %d   ScaleFactor = %d   RootFreq = %d", wav->scaleFreq, wav->scaleFactor, wav->rootFreq);
-        wav->res=readData(file, 36);
-        wav->data=readData(file, wav->wavSize);
-
-        wav->numSamples = wav->wavSize / 2;
-        int a=0;
-
-        return wav;
-        if(wav->mode & 1 == 0)  //Whoops, 8 bit
-        {
-                wav->numSamples = wav->wavSize;
-
-                //Allocate a block for the rest of it
-                //It should end up right after the previous one.
-                wav->wavSize = wav->wavSize * 2;
-                void * foo = allocate(wav->wavSize);
-
-
-                for(a=0; a<1000; a++)
-                        printf("\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
-
-
-                for(a=wav->wavSize-1; a>0; a-=2)
-                {
-
-                }
-        //      int b1=wf->data[s]+((wf->mode & 2) << 6);
-        //      return b1<<8;
-        }
-
-        /*
-//#if !defined(SIMULATOR)
-        for(a=0; a<wav->wavSize; a+=2)
-        {
-                unsigned char tmp;
-                tmp = wav->data[2*a];
-                wav->data[2*a] = wav->data[2*a+1];
-                wav->data[2*a+1] = tmp;
-        }
-//#endif
-
-        if(wav->mode & 2)
-        {
-                for(a=0; a<wav->wavSize/2; a++)
-                {
-                        ((short *) wav->data)[a] = ((short *) wav->data)[a] - 32767;
-                }
-        }
-*/
-
-
-
-        //If we have a 16 bit waveform
-/*      if(wav->mode & 1  && (wav->mode & 2))
-        {
-                for(a=0; a<wav->wavSize; a+=2)  //Convert it to
-                {
-                        wav->data[a]=wav->data[a]+(1 << 7);
-                        wav->data[a|1]=wav->data[(a)|1]+(1 << 7);
-                }
-        }
-*/
-        return wav;
+    struct GWaveform * wav = (struct GWaveform *)allocate(sizeof(struct GWaveform));
+    rb->memset(wav, 0, sizeof(struct GWaveform));
+
+    wav->name=readData(file, 7);
+    printf("\nWAVE NAME = [%s]", wav->name);
+    wav->fractions=readChar(file);
+    wav->wavSize=readDWord(file);
+    wav->startLoop=readDWord(file);
+    wav->endLoop=readDWord(file);
+    wav->sampRate=readWord(file);
+
+    wav->lowFreq=readDWord(file);
+    wav->highFreq=readDWord(file);
+    wav->rootFreq=readDWord(file);
+
+    wav->tune=readWord(file);
+
+    wav->balance=readChar(file);
+    wav->envRate=readData(file, 6);
+    wav->envOffset=readData(file, 6);
+
+    wav->tremSweep=readChar(file);
+    wav->tremRate==readChar(file);
+    wav->tremDepth=readChar(file);
+    wav->vibSweep=readChar(file);
+    wav->vibRate=readChar(file);
+    wav->vibDepth=readChar(file);
+    wav->mode=readChar(file);
+
+    wav->scaleFreq=readWord(file);
+    wav->scaleFactor=readWord(file);
+    printf("\nScaleFreq = %d   ScaleFactor = %d   RootFreq = %d", wav->scaleFreq, wav->scaleFactor, wav->rootFreq);
+    wav->res=readData(file, 36);
+    wav->data=readData(file, wav->wavSize);
+
+    wav->numSamples = wav->wavSize / 2;
+    wav->startLoop = wav->startLoop >> 1;
+    wav->endLoop = wav->endLoop >> 1;
+    unsigned int a=0;
+
+    /* half baked 8 bit conversion  UNFINISHED*/
+    /*
+    if(wav->mode & 1 == 0)  //Whoops, 8 bit
+    {
+        wav->numSamples = wav->wavSize;
+
+        //Allocate a block for the rest of it
+        //It should end up right after the previous one.
+        wav->wavSize = wav->wavSize * 2;
+        void * foo = allocate(wav->wavSize);
+
+
+        for(a=0; a<1000; a++)
+            printf("\n!!!!!!!!!!!!!!!!!!!!!!!!!!!");
+
+
+        for(a=wav->wavSize-1; a>0; a-=2)
+        {
+
+        }
+    //  int b1=wf->data[s]+((wf->mode & 2) << 6);
+    //  return b1<<8;
+    }
+    */
+
+
+    /* Iriver needs byteswapping.. big endian, go figure. Gus files are little endian */
+
+#if !defined(SIMULATOR)
+    for(a=0; a<wav->numSamples; a++)
+    {
+        ((unsigned short *) wav->data)[a] = SWAB16(((unsigned short *) wav->data)[a]);
+    }
+#endif
+
+    /*  Convert unsigned to signed by subtracting 32768 */
+    if(wav->mode & 2)
+    {
+        for(a=0; a<wav->numSamples; a++)
+            ((short *) wav->data)[a] = ((unsigned short *) wav->data)[a] - 32768;
+
+    }
+
+    return wav;
 }
 
 
 
 int selectWaveform(struct GPatch * pat, int midiNote)
 {
-        int tabFreq = gustable[midiNote]/100; //Comparison
-        int a=0;
-        for(a=0; a<pat->numWaveforms; a++)
-        {
-                if(pat->waveforms[a]->lowFreq/100 <= tabFreq &&
-                   pat->waveforms[a]->highFreq/100 >= tabFreq)
-                {
-                        return a;
-                }
-        }
-        return 0;
+    /* We divide by 100 here because everyone's freq formula is slightly different */
+    unsigned int tabFreq = gustable[midiNote]/100; /* Comparison */
+    unsigned int a=0;
+    for(a=0; a<pat->numWaveforms; a++)
+    {
+        if(pat->waveforms[a]->lowFreq/100 <= tabFreq &&
+           pat->waveforms[a]->highFreq/100 >= tabFreq)
+        {
+            return a;
+        }
+    }
+    return 0;
 }
 
 
 struct GPatch * gusload(char * filename)
 {
-        struct GPatch * gp = (struct GPatch *)allocate(sizeof(struct GPatch));
-        rb->memset(gp, 0, sizeof(struct GPatch));
-
-        int file = rb->open(filename, O_RDONLY);
-
-        if(file == -1)
-        {
-                char message[50];
-                rb->snprintf(message, 50, "Error opening %s", filename);
-                rb->splash(HZ*2, true, message);
-                return NULL;
-        }
-
-        gp->header=readData(file, 12);
-        gp->gravisid=readData(file, 10);
-        gp->desc=readData(file, 60);
-        gp->inst=readChar(file);
-        gp->voc=readChar(file);
-        gp->chan=readChar(file);
-        gp->numWaveforms=readWord(file); //readWord(file);
-        gp->vol=readWord(file);
-        gp->datSize=readDWord(file);
-        gp->res=readData(file, 36);
-
-        gp->instrID=readWord(file);
-        gp->instrName=readData(file,16);
-        gp->instrSize=readDWord(file);
-        gp->layers=readChar(file);
-        gp->instrRes=readData(file,40);
-
-
-        gp->layerDup=readChar(file);
-        gp->layerID=readChar(file);
-        gp->layerSize=readDWord(file);
-        gp->numWaves=readChar(file);
-        gp->layerRes=readData(file,40);
-
-/*      printf("\n%s\n%s\n%s", gp->header, gp->gravisid, gp->desc);
-        printf("\nInst = %d", gp->inst);
-        printf("\nVoc  = %d", gp->voc);
-        printf("\nChan = %d", gp->chan);
-        printf("\nWav  = %d", gp->numWaveforms);
-        printf("\nVol  = %d", gp->vol);
-        printf("\nSize = %d", gp->datSize);
-
-        printf("\n\ninstrID = %d", gp->instrID);
-        printf("\ninstrName = %s", gp->instrName);
-//      printf("\ninstrSize = %d", gp->instrSize);
-//      printf("\nlayers = %d", gp->layers);
-*/
-        printf("\nFILE: %s", filename);
-        printf("\nlayerSamples=%d", gp->numWaves);
-
-        int a=0;
-        for(a=0; a<gp->numWaves; a++)
-                gp->waveforms[a] = loadWaveform(file);
-
-
-        printf("\nPrecomputing note table");
-
-        for(a=0; a<128; a++)
-        {
-                gp->noteTable[a] = selectWaveform(gp, a);
-        }
-        rb->close(file);
-
-        return gp;
+    struct GPatch * gp = (struct GPatch *)allocate(sizeof(struct GPatch));
+    rb->memset(gp, 0, sizeof(struct GPatch));
+
+    int file = rb->open(filename, O_RDONLY);
+
+    if(file == -1)
+    {
+        char message[50];
+        rb->snprintf(message, 50, "Error opening %s", filename);
+        rb->splash(HZ*2, true, message);
+        return NULL;
+    }
+
+    gp->header=readData(file, 12);
+    gp->gravisid=readData(file, 10);
+    gp->desc=readData(file, 60);
+    gp->inst=readChar(file);
+    gp->voc=readChar(file);
+    gp->chan=readChar(file);
+    gp->numWaveforms=readWord(file);
+    gp->vol=readWord(file);
+    gp->datSize=readDWord(file);
+    gp->res=readData(file, 36);
+
+    gp->instrID=readWord(file);
+    gp->instrName=readData(file,16);
+    gp->instrSize=readDWord(file);
+    gp->layers=readChar(file);
+    gp->instrRes=readData(file,40);
+
+
+    gp->layerDup=readChar(file);
+    gp->layerID=readChar(file);
+    gp->layerSize=readDWord(file);
+    gp->numWaves=readChar(file);
+    gp->layerRes=readData(file,40);
+
+
+    printf("\nFILE: %s", filename);
+    printf("\nlayerSamples=%d", gp->numWaves);
+
+    int a=0;
+    for(a=0; a<gp->numWaves; a++)
+        gp->waveforms[a] = loadWaveform(file);
+
+
+    printf("\nPrecomputing note table");
+
+    for(a=0; a<128; a++)
+    {
+        gp->noteTable[a] = selectWaveform(gp, a);
+    }
+    rb->close(file);
+
+    return gp;
 }