diff options
author | Stepan Moskovchenko <stevenm@rockbox.org> | 2006-05-07 07:12:07 +0000 |
---|---|---|
committer | Stepan Moskovchenko <stevenm@rockbox.org> | 2006-05-07 07:12:07 +0000 |
commit | 68af7bae87b0fa4f0da080752a73e638f2ecdf21 (patch) | |
tree | 2c76e67d62458c9406a2764eef91cc5bc14fd0a8 /apps/plugins/midi/synth.c | |
parent | a95068cf39a8ee4c6972502d924b35b73bfabbfd (diff) | |
download | rockbox-68af7bae87b0fa4f0da080752a73e638f2ecdf21.tar.gz rockbox-68af7bae87b0fa4f0da080752a73e638f2ecdf21.zip |
Added ability to adjust the volume during playback.
Gracefully fail if no soundset installed.
Yet more messing with the ramping code. I swear, that will be the end of
me.
Basic skipping support- skip foreward a bit if Right is pressed.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9883 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/midi/synth.c')
-rw-r--r-- | apps/plugins/midi/synth.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/apps/plugins/midi/synth.c b/apps/plugins/midi/synth.c index 2b70074158..2ec263da60 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) | |||
103 | drumUsed[getEvent(mf->tracks[a], ts)->d1]=1; | 103 | drumUsed[getEvent(mf->tracks[a], ts)->d1]=1; |
104 | 104 | ||
105 | if( (getEvent(mf->tracks[a], ts)->status & 0xF0) == MIDI_PRGM) | 105 | if( (getEvent(mf->tracks[a], ts)->status & 0xF0) == MIDI_PRGM) |
106 | { | ||
107 | /* if(patchUsed[getEvent(mf->tracks[a], ts)->d1]==0) | ||
108 | printf("\nI need to load patch %d.", getEvent(mf->tracks[a], ts)->d1); | ||
109 | */ | ||
110 | patchUsed[getEvent(mf->tracks[a], ts)->d1]=1; | 106 | patchUsed[getEvent(mf->tracks[a], ts)->d1]=1; |
111 | } | ||
112 | } | 107 | } |
113 | } | 108 | } |
114 | 109 | ||
115 | int file = rb->open(filename, O_RDONLY); | 110 | int file = rb->open(filename, O_RDONLY); |
116 | if(file == -1) | 111 | if(file < 0) |
117 | { | 112 | { |
118 | rb->splash(HZ*2, true, "Bad patch config.\nDid you install the patchset?"); | 113 | printf("\n"); |
114 | printf("\nNo MIDI patchset found."); | ||
115 | printf("\nPlease install the instruments."); | ||
116 | printf("\nSee Rockbox page for more info."); | ||
117 | |||
118 | rb->splash(HZ*2, true, "No Instruments"); | ||
119 | rb->splash(HZ*2, true, "No Instruments"); | ||
119 | return -1; | 120 | return -1; |
120 | } | 121 | } |
121 | 122 | ||
@@ -148,7 +149,7 @@ int initSynth(struct MIDIfile * mf, char * filename, char * drumConfig) | |||
148 | rb->close(file); | 149 | rb->close(file); |
149 | 150 | ||
150 | file = rb->open(drumConfig, O_RDONLY); | 151 | file = rb->open(drumConfig, O_RDONLY); |
151 | if(file == -1) | 152 | if(file < 0) |
152 | { | 153 | { |
153 | rb->splash(HZ*2, true, "Bad drum config.\nDid you install the patchset?"); | 154 | rb->splash(HZ*2, true, "Bad drum config.\nDid you install the patchset?"); |
154 | return -1; | 155 | return -1; |