summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
Diffstat (limited to 'apps')
-rw-r--r--apps/plugins/midi/midifile.c18
-rw-r--r--apps/plugins/midi/midiutil.c14
-rw-r--r--apps/plugins/midi/sequencer.c4
-rw-r--r--apps/plugins/midi/synth.c18
-rw-r--r--apps/plugins/midiplay.c8
5 files changed, 31 insertions, 31 deletions
diff --git a/apps/plugins/midi/midifile.c b/apps/plugins/midi/midifile.c
index 32eeeec92b..7161818421 100644
--- a/apps/plugins/midi/midifile.c
+++ b/apps/plugins/midi/midifile.c
@@ -30,7 +30,7 @@ struct MIDIfile * loadFile(char * filename)
30 30
31 if(file==-1) 31 if(file==-1)
32 { 32 {
33 printf("Could not open file\n"); 33 printf("Could not open file");
34 return NULL; 34 return NULL;
35 } 35 }
36 36
@@ -39,7 +39,7 @@ struct MIDIfile * loadFile(char * filename)
39 if(mfload==NULL) 39 if(mfload==NULL)
40 { 40 {
41 rb->close(file); 41 rb->close(file);
42 printf("Could not allocate memory for MIDIfile struct\n"); 42 printf("Could not allocate memory for MIDIfile struct");
43 return NULL; 43 return NULL;
44 } 44 }
45 45
@@ -50,8 +50,8 @@ struct MIDIfile * loadFile(char * filename)
50 { 50 {
51 if(fileID == ID_RIFF) 51 if(fileID == ID_RIFF)
52 { 52 {
53 printf("\nDetected RMID file"); 53 printf("Detected RMID file");
54 printf("\nLooking for MThd header"); 54 printf("Looking for MThd header");
55 char dummy[17]; 55 char dummy[17];
56 rb->read(file, &dummy, 16); 56 rb->read(file, &dummy, 16);
57 if(readID(file) != ID_MTHD) 57 if(readID(file) != ID_MTHD)
@@ -88,7 +88,7 @@ struct MIDIfile * loadFile(char * filename)
88 88
89 int track=0; 89 int track=0;
90 90
91 printf("\nFile has %d tracks.", mfload->numTracks); 91 printf("File has %d tracks.", mfload->numTracks);
92 92
93 while(! eof(file) && track < mfload->numTracks) 93 while(! eof(file) && track < mfload->numTracks)
94 { 94 {
@@ -99,7 +99,7 @@ struct MIDIfile * loadFile(char * filename)
99 { 99 {
100 if(mfload->numTracks != track) 100 if(mfload->numTracks != track)
101 { 101 {
102 printf("\nError: file claims to have %d tracks.\n I only see %d here.\n", mfload->numTracks, track); 102 printf("Error: file claims to have %d tracks. I only see %d here.", mfload->numTracks, track);
103 mfload->numTracks = track; 103 mfload->numTracks = track;
104 } 104 }
105 return mfload; 105 return mfload;
@@ -111,7 +111,7 @@ struct MIDIfile * loadFile(char * filename)
111 track++; 111 track++;
112 } else 112 } else
113 { 113 {
114 printf("\n SKIPPING TRACK"); 114 printf("SKIPPING TRACK");
115 int len = readFourBytes(file); 115 int len = readFourBytes(file);
116 while(--len) 116 while(--len)
117 readChar(file); 117 readChar(file);
@@ -223,7 +223,7 @@ struct Track * readTrack(int file)
223 { 223 {
224 if(trackSize < dataPtr-trk->dataBlock) 224 if(trackSize < dataPtr-trk->dataBlock)
225 { 225 {
226 printf("\nTrack parser memory out of bounds"); 226 printf("Track parser memory out of bounds");
227 exit(1); 227 exit(1);
228 } 228 }
229 dataPtr+=sizeof(struct Event); 229 dataPtr+=sizeof(struct Event);
@@ -245,7 +245,7 @@ int readID(int file)
245 id[a]=readChar(file); 245 id[a]=readChar(file);
246 if(eof(file)) 246 if(eof(file))
247 { 247 {
248 printf("\nEnd of file reached."); 248 printf("End of file reached.");
249 return ID_EOF; 249 return ID_EOF;
250 } 250 }
251 if(rb->strcmp(id, "MThd")==0) 251 if(rb->strcmp(id, "MThd")==0)
diff --git a/apps/plugins/midi/midiutil.c b/apps/plugins/midi/midiutil.c
index aa3a0cca28..5149104c14 100644
--- a/apps/plugins/midi/midiutil.c
+++ b/apps/plugins/midi/midiutil.c
@@ -160,13 +160,13 @@ void *alloc(int size)
160 160
161 if (size + 4 > totalSize) 161 if (size + 4 > totalSize)
162 { 162 {
163 printf("\nMALLOC BARF"); 163 printf("MALLOC BARF");
164 printf("\nMALLOC BARF"); 164 printf("MALLOC BARF");
165 printf("\nMALLOC BARF"); 165 printf("MALLOC BARF");
166 printf("\nMALLOC BARF"); 166 printf("MALLOC BARF");
167 printf("\nMALLOC BARF"); 167 printf("MALLOC BARF");
168 printf("\nMALLOC BARF"); 168 printf("MALLOC BARF");
169 printf("\nMALLOC BARF"); 169 printf("MALLOC BARF");
170 /* We've made our point. */ 170 /* We've made our point. */
171 171
172 return NULL; 172 return NULL;
diff --git a/apps/plugins/midi/sequencer.c b/apps/plugins/midi/sequencer.c
index d56bd26f5c..68c29f35ad 100644
--- a/apps/plugins/midi/sequencer.c
+++ b/apps/plugins/midi/sequencer.c
@@ -230,7 +230,7 @@ void pressNote(int ch, int note, int vol)
230 if(drumSet[note]!=NULL) 230 if(drumSet[note]!=NULL)
231 { 231 {
232 if(note<35) 232 if(note<35)
233 printf("\nNOTE LESS THAN 35, AND A DRUM PATCH EXISTS FOR THIS? WHAT THE HELL?"); 233 printf("NOTE LESS THAN 35, AND A DRUM PATCH EXISTS FOR THIS? WHAT THE HELL?");
234 234
235 struct GWaveform * wf = drumSet[note]->waveforms[0]; 235 struct GWaveform * wf = drumSet[note]->waveforms[0];
236 voices[a].wf=wf; 236 voices[a].wf=wf;
@@ -328,7 +328,7 @@ int tick(void)
328 struct Track * tr = mf->tracks[a]; 328 struct Track * tr = mf->tracks[a];
329 329
330 if(tr == NULL) 330 if(tr == NULL)
331 printf("\nNULL TRACK: %d", a); 331 printf("NULL TRACK: %d", a);
332 332
333 333
334 //BIG DEBUG STATEMENT 334 //BIG DEBUG STATEMENT
diff --git a/apps/plugins/midi/synth.c b/apps/plugins/midi/synth.c
index 5a7a02f0a1..6ec229b4bf 100644
--- a/apps/plugins/midi/synth.c
+++ b/apps/plugins/midi/synth.c
@@ -91,7 +91,7 @@ int initSynth(struct MIDIfile * mf, char * filename, char * drumConfig)
91 91
92 if(mf->tracks[a] == NULL) 92 if(mf->tracks[a] == NULL)
93 { 93 {
94 printf("\nNULL TRACK !!!"); 94 printf("NULL TRACK !!!");
95 rb->splash(HZ*2, "Null Track in loader."); 95 rb->splash(HZ*2, "Null Track in loader.");
96 return -1; 96 return -1;
97 } 97 }
@@ -110,10 +110,10 @@ int initSynth(struct MIDIfile * mf, char * filename, char * drumConfig)
110 int file = rb->open(filename, O_RDONLY); 110 int file = rb->open(filename, O_RDONLY);
111 if(file < 0) 111 if(file < 0)
112 { 112 {
113 printf("\n"); 113 printf("");
114 printf("\nNo MIDI patchset found."); 114 printf("No MIDI patchset found.");
115 printf("\nPlease install the instruments."); 115 printf("Please install the instruments.");
116 printf("\nSee Rockbox page for more info."); 116 printf("See Rockbox page for more info.");
117 117
118 rb->splash(HZ*2, "No Instruments"); 118 rb->splash(HZ*2, "No Instruments");
119 return -1; 119 return -1;
@@ -125,7 +125,7 @@ int initSynth(struct MIDIfile * mf, char * filename, char * drumConfig)
125 /* Scan our config file and load the right patches as needed */ 125 /* Scan our config file and load the right patches as needed */
126 int c = 0; 126 int c = 0;
127 name[0] = '\0'; 127 name[0] = '\0';
128 printf("\nLoading instruments"); 128 printf("Loading instruments");
129 for(a=0; a<128; a++) 129 for(a=0; a<128; a++)
130 { 130 {
131 while(readChar(file)!=' ' && !eof(file)); 131 while(readChar(file)!=' ' && !eof(file));
@@ -157,7 +157,7 @@ int initSynth(struct MIDIfile * mf, char * filename, char * drumConfig)
157 /* Scan our config file and load the drum data */ 157 /* Scan our config file and load the drum data */
158 int idx=0; 158 int idx=0;
159 char number[30]; 159 char number[30];
160 printf("\nLoading drums"); 160 printf("Loading drums");
161 while(!eof(file)) 161 while(!eof(file))
162 { 162 {
163 readTextBlock(file, number); 163 readTextBlock(file, number);
@@ -195,12 +195,12 @@ void setPoint(struct SynthObject * so, int pt)
195 195
196 if(so->wf==NULL) 196 if(so->wf==NULL)
197 { 197 {
198 printf("\nCrap... null waveform..."); 198 printf("Crap... null waveform...");
199 exit(1); 199 exit(1);
200 } 200 }
201 if(so->wf->envRate==NULL) 201 if(so->wf->envRate==NULL)
202 { 202 {
203 printf("\nWaveform has no envelope set"); 203 printf("Waveform has no envelope set");
204 exit(1); 204 exit(1);
205 } 205 }
206 206
diff --git a/apps/plugins/midiplay.c b/apps/plugins/midiplay.c
index 1e3a62b58a..8d8b7833af 100644
--- a/apps/plugins/midiplay.c
+++ b/apps/plugins/midiplay.c
@@ -133,7 +133,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
133 rb->cpu_boost(true); 133 rb->cpu_boost(true);
134#endif 134#endif
135 135
136 printf("\n%s", parameter); 136 printf("%s", parameter);
137 /* rb->splash(HZ, true, parameter); */ 137 /* rb->splash(HZ, true, parameter); */
138 138
139#ifdef RB_PROFILE 139#ifdef RB_PROFILE
@@ -218,12 +218,12 @@ int midimain(void * filename)
218{ 218{
219 int notesUsed = 0; 219 int notesUsed = 0;
220 int a=0; 220 int a=0;
221 printf("\nLoading file"); 221 printf("Loading file");
222 mf= loadFile(filename); 222 mf= loadFile(filename);
223 223
224 if(mf == NULL) 224 if(mf == NULL)
225 { 225 {
226 printf("\nError loading file."); 226 printf("Error loading file.");
227 return -1; 227 return -1;
228 } 228 }
229 229
@@ -245,7 +245,7 @@ int midimain(void * filename)
245 * This seems to work quite well. On a laptop, anyway. 245 * This seems to work quite well. On a laptop, anyway.
246 */ 246 */
247 247
248 printf("\nOkay, starting sequencing"); 248 printf("Okay, starting sequencing");
249 249
250 bpm=mf->div*1000000/tempo; 250 bpm=mf->div*1000000/tempo;
251 numberOfSamples=SAMPLE_RATE/bpm; 251 numberOfSamples=SAMPLE_RATE/bpm;