summaryrefslogtreecommitdiff
path: root/apps/plugins/midi
diff options
context:
space:
mode:
Diffstat (limited to 'apps/plugins/midi')
-rw-r--r--apps/plugins/midi/midifile.c2
-rw-r--r--apps/plugins/midi/synth.c17
2 files changed, 9 insertions, 10 deletions
diff --git a/apps/plugins/midi/midifile.c b/apps/plugins/midi/midifile.c
index 13887e4..11f81b1 100644
--- a/apps/plugins/midi/midifile.c
+++ b/apps/plugins/midi/midifile.c
@@ -68,8 +68,6 @@ struct MIDIfile * loadFile(char * filename)
int track=0;
printf("\nFile has %d tracks.", mfload->numTracks);
- printf("Time division=%d\n", mfload->div);
-
while(! eof(file) && track < mfload->numTracks)
{
diff --git a/apps/plugins/midi/synth.c b/apps/plugins/midi/synth.c
index 2b70074..2ec263d 100644
--- a/apps/plugins/midi/synth.c
+++ b/apps/plugins/midi/synth.c
@@ -103,19 +103,20 @@ int initSynth(struct MIDIfile * mf, char * filename, char * drumConfig)
drumUsed[getEvent(mf->tracks[a], ts)->d1]=1;
if( (getEvent(mf->tracks[a], ts)->status & 0xF0) == MIDI_PRGM)
- {
-/* if(patchUsed[getEvent(mf->tracks[a], ts)->d1]==0)
- printf("\nI need to load patch %d.", getEvent(mf->tracks[a], ts)->d1);
-*/
patchUsed[getEvent(mf->tracks[a], ts)->d1]=1;
- }
}
}
int file = rb->open(filename, O_RDONLY);
- if(file == -1)
+ if(file < 0)
{
- rb->splash(HZ*2, true, "Bad patch config.\nDid you install the patchset?");
+ printf("\n");
+ printf("\nNo MIDI patchset found.");
+ printf("\nPlease install the instruments.");
+ printf("\nSee Rockbox page for more info.");
+
+ rb->splash(HZ*2, true, "No Instruments");
+ rb->splash(HZ*2, true, "No Instruments");
return -1;
}
@@ -148,7 +149,7 @@ int initSynth(struct MIDIfile * mf, char * filename, char * drumConfig)
rb->close(file);
file = rb->open(drumConfig, O_RDONLY);
- if(file == -1)
+ if(file < 0)
{
rb->splash(HZ*2, true, "Bad drum config.\nDid you install the patchset?");
return -1;