Oops, revert unrelated changes

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

4 files changed, 14 insertions, 21 deletions

diff --git a/apps/plugins/SUBDIRS b/apps/plugins/SUBDIRS
index 5ecb22e..94614e2 100644
--- a/apps/plugins/SUBDIRS
+++ b/apps/plugins/SUBDIRS
@@ -33,14 +33,14 @@ pacbox
 /* For all the color targets */
 #if defined(HAVE_LCD_COLOR) || defined(MROBE_100) || \
     (LCD_DEPTH == 2) && !defined(ARCHOS_AV300)
-//doom
+doom
 #endif
 
 /* For all the swcodec targets */
 #if CONFIG_CODEC == SWCODEC
 midi
 /* beatbox */
-//mpegplayer
+mpegplayer
 #endif
 
 #endif /* IRIVER_IFP7XX_SERIES */
diff --git a/apps/plugins/battery_bench.c b/apps/plugins/battery_bench.c
index 116781e..0cc028e 100644
--- a/apps/plugins/battery_bench.c
+++ b/apps/plugins/battery_bench.c
@@ -26,7 +26,7 @@ PLUGIN_HEADER
 
 #define BATTERY_LOG "/battery_bench.txt"
 #define BUF_SIZE 16000
-#define DISK_SPINDOWN_TIMEOUT 1800
+#define DISK_SPINDOWN_TIMEOUT 3600
 
 #define EV_EXIT 1337
 
diff --git a/apps/plugins/midi/guspat.c b/apps/plugins/midi/guspat.c
index 1b310d2..419cfa3 100644
--- a/apps/plugins/midi/guspat.c
+++ b/apps/plugins/midi/guspat.c
@@ -162,12 +162,10 @@ struct GPatch * gusload(char * filename)
 
     int file = rb->open(filename, O_RDONLY);
 
-    DEBUGF("filename: %s\n", filename);
-
     if(file == -1)
     {
-        char message[MAX_PATH];
-        rb->snprintf(message, MAX_PATH, "Error opening %s", filename);
+        char message[50];
+        rb->snprintf(message, 50, "Error opening %s", filename);
         rb->splash(HZ*2, message);
         return NULL;
     }
@@ -199,12 +197,12 @@ struct GPatch * gusload(char * filename)
 
 /*    printf("\nFILE: %s", filename); */
 /*    printf("\nlayerSamples=%d", gp->numWaves); */
-DEBUGF("hej\n");
+
     int a=0;
     for(a=0; a<gp->numWaves; a++)
         gp->waveforms[a] = loadWaveform(file);
 
-DEBUGF("hej2\n");
+
 /*    printf("\nPrecomputing note table"); */
 
     for(a=0; a<128; a++)
@@ -212,7 +210,7 @@ DEBUGF("hej2\n");
         gp->noteTable[a] = selectWaveform(gp, a);
     }
     rb->close(file);
-DEBUGF("hej3\n");
+
     return gp;
 }
 
diff --git a/apps/plugins/midi/synth.c b/apps/plugins/midi/synth.c
index 09ea1c6..0819722 100644
--- a/apps/plugins/midi/synth.c
+++ b/apps/plugins/midi/synth.c
@@ -140,11 +140,10 @@ int initSynth(struct MIDIfile * mf, char * filename, char * drumConfig)
         return -1;
     }
 
-    char name[MAX_PATH];
-    char fn[MAX_PATH];
+    char name[40];
+    char fn[40];
 
     /* Scan our config file and load the right patches as needed    */
-    char *p;
     int c = 0;
     name[0] = '\0';
     printf("Loading instruments");
@@ -152,12 +151,8 @@ int initSynth(struct MIDIfile * mf, char * filename, char * drumConfig)
     {
         while(readChar(file)!=' ' && !eof(file));
         readTextBlock(file, name);
-        DEBUGF("name: %s\n", name);
-        p = rb->strrchr(name, '.');
-        if (!p || rb->strncmp(p, ".pat", 4))
-            rb->snprintf(fn, MAX_PATH, ROCKBOX_DIR "/patchset/%s.pat", name);
-        else
-            rb->snprintf(fn, MAX_PATH, ROCKBOX_DIR "/patchset/%s", name);
+
+        rb->snprintf(fn, 40, ROCKBOX_DIR "/patchset/%s.pat", name);
 /*        printf("\nLOADING: <%s> ", fn); */
 
         if(patchUsed[a]==1)
@@ -172,7 +167,7 @@ int initSynth(struct MIDIfile * mf, char * filename, char * drumConfig)
             c = readChar(file);
     }
     rb->close(file);
-DEBUGF("drums!!\n");
+
     file = rb->open(drumConfig, O_RDONLY);
     if(file < 0)
     {
@@ -188,7 +183,7 @@ DEBUGF("drums!!\n");
     {
         readTextBlock(file, number);
         readTextBlock(file, name);
-        rb->snprintf(fn, MAX_PATH, ROCKBOX_DIR "/patchset/%s.pat", name);
+        rb->snprintf(fn, 40, ROCKBOX_DIR "/patchset/%s.pat", name);
 
         idx = rb->atoi(number);
         if(idx == 0)