devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Oops, revert unrelated changes

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18139 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Nils Wallménius 2008-07-27 20:40:20 +00:00
parent 2d337dab7f
commit 8df332c062
4 changed files with 14 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
apps/plugins/SUBDIRS
View file

@ -33,14 +33,14 @@ pacbox
/* For all the color targets */ /* For all the color targets */
#if defined(HAVE_LCD_COLOR) || defined(MROBE_100) || \ #if defined(HAVE_LCD_COLOR) || defined(MROBE_100) || \
(LCD_DEPTH == 2) && !defined(ARCHOS_AV300) (LCD_DEPTH == 2) && !defined(ARCHOS_AV300)
//doom doom
#endif #endif
/* For all the swcodec targets */ /* For all the swcodec targets */
#if CONFIG_CODEC == SWCODEC #if CONFIG_CODEC == SWCODEC
midi midi
/* beatbox */ /* beatbox */
//mpegplayer mpegplayer
#endif #endif
#endif /* IRIVER_IFP7XX_SERIES */ #endif /* IRIVER_IFP7XX_SERIES */

2
apps/plugins/battery_bench.c
View file

@ -26,7 +26,7 @@ PLUGIN_HEADER
#define BATTERY_LOG "/battery_bench.txt" #define BATTERY_LOG "/battery_bench.txt"
#define BUF_SIZE 16000 #define BUF_SIZE 16000
#define DISK_SPINDOWN_TIMEOUT 1800 #define DISK_SPINDOWN_TIMEOUT 3600
#define EV_EXIT 1337 #define EV_EXIT 1337

12
apps/plugins/midi/guspat.c
View file

@ -162,12 +162,10 @@ struct GPatch * gusload(char * filename)
int file = rb->open(filename, O_RDONLY); int file = rb->open(filename, O_RDONLY);
DEBUGF("filename: %s\n", filename);
if(file == -1) if(file == -1)
{ {
char message[MAX_PATH]; char message[50];
rb->snprintf(message, MAX_PATH, "Error opening %s", filename); rb->snprintf(message, 50, "Error opening %s", filename);
rb->splash(HZ*2, message); rb->splash(HZ*2, message);
return NULL; return NULL;
} }
@ -199,12 +197,12 @@ struct GPatch * gusload(char * filename)
/* printf("\nFILE: %s", filename); */ /* printf("\nFILE: %s", filename); */
/* printf("\nlayerSamples=%d", gp->numWaves); */ /* printf("\nlayerSamples=%d", gp->numWaves); */
DEBUGF("hej\n");
int a=0; int a=0;
for(a=0; a<gp->numWaves; a++) for(a=0; a<gp->numWaves; a++)
gp->waveforms[a] = loadWaveform(file); gp->waveforms[a] = loadWaveform(file);
DEBUGF("hej2\n");
/* printf("\nPrecomputing note table"); */ /* printf("\nPrecomputing note table"); */
for(a=0; a<128; a++) for(a=0; a<128; a++)
@ -212,7 +210,7 @@ DEBUGF("hej2\n");
gp->noteTable[a] = selectWaveform(gp, a); gp->noteTable[a] = selectWaveform(gp, a);
} }
rb->close(file); rb->close(file);
DEBUGF("hej3\n");
return gp; return gp;
} }

17
apps/plugins/midi/synth.c
View file

@ -140,11 +140,10 @@ int initSynth(struct MIDIfile * mf, char * filename, char * drumConfig)
return -1; return -1;
} }
char name[MAX_PATH]; char name[40];
char fn[MAX_PATH]; char fn[40];
/* Scan our config file and load the right patches as needed */ /* Scan our config file and load the right patches as needed */
char *p;
int c = 0; int c = 0;
name[0] = '\0'; name[0] = '\0';
printf("Loading instruments"); printf("Loading instruments");
@ -152,12 +151,8 @@ int initSynth(struct MIDIfile * mf, char * filename, char * drumConfig)
{ {
while(readChar(file)!=' ' && !eof(file)); while(readChar(file)!=' ' && !eof(file));
readTextBlock(file, name); readTextBlock(file, name);
DEBUGF("name: %s\n", name);
p = rb->strrchr(name, '.'); rb->snprintf(fn, 40, ROCKBOX_DIR "/patchset/%s.pat", 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);
/* printf("\nLOADING: <%s> ", fn); */ /* printf("\nLOADING: <%s> ", fn); */
if(patchUsed[a]==1) if(patchUsed[a]==1)
@ -172,7 +167,7 @@ int initSynth(struct MIDIfile * mf, char * filename, char * drumConfig)
c = readChar(file); c = readChar(file);
} }
rb->close(file); rb->close(file);
DEBUGF("drums!!\n");
file = rb->open(drumConfig, O_RDONLY); file = rb->open(drumConfig, O_RDONLY);
if(file < 0) if(file < 0)
{ {
@ -188,7 +183,7 @@ DEBUGF("drums!!\n");
{ {
readTextBlock(file, number); readTextBlock(file, number);
readTextBlock(file, name); 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); idx = rb->atoi(number);
if(idx == 0) if(idx == 0)