@@ -20,7 +20,8 @@ typedef struct uFMT_STRUCT {
20
20
short sig_bps;
21
21
} FMT_STRUCT;
22
22
23
- void wav_play_rl (FILE *wavefile, AdvancedDAC &dac_out, bool verbosity){
23
+ void wav_play_rl (FILE * wavefile, AdvancedDAC & dac_out, bool const verbosity)
24
+ {
24
25
unsigned chunk_id,chunk_size,channel;
25
26
unsigned data,samp_int,i;
26
27
short unsigned dac_data;
@@ -46,11 +47,12 @@ void wav_play_rl(FILE *wavefile, AdvancedDAC &dac_out, bool verbosity){
46
47
fread (&chunk_size,4 ,1 ,wavefile);
47
48
48
49
while (!feof (wavefile)) {
49
- if (verbosity)
50
+ if (verbosity) {
50
51
Serial.print (F (" Read chunk ID =" ));
51
52
Serial.println (chunk_id);
52
53
Serial.print (F (" Read chunk size =" ));
53
54
Serial.println (chunk_size);
55
+ }
54
56
55
57
switch (chunk_id) {
56
58
case 0x46464952 :
@@ -131,27 +133,30 @@ void wav_play_rl(FILE *wavefile, AdvancedDAC &dac_out, bool verbosity){
131
133
for (channel=0 ;channel<wav_format.num_channels ;channel++) {
132
134
switch (wav_format.sig_bps ) {
133
135
case 16 :
134
- if (verbosity)
136
+ if (verbosity) {
135
137
Serial.print (F (" 16 bit channel =" ));
136
138
Serial.println (channel);
137
139
Serial.print (F (" data = " ));
138
140
Serial.println (data_sptr[channel]);
141
+ }
139
142
slice_value+=data_sptr[channel];
140
143
break ;
141
144
case 32 :
142
- if (verbosity)
145
+ if (verbosity) {
143
146
Serial.print (F (" 32 bit channel =" ));
144
147
Serial.println (channel);
145
148
Serial.print (F (" data = " ));
146
149
Serial.println (data_wptr[channel]);
150
+ }
147
151
slice_value+=data_wptr[channel];
148
152
break ;
149
153
case 8 :
150
- if (verbosity)
154
+ if (verbosity) {
151
155
Serial.print (F (" 8 bit channel =" ));
152
156
Serial.println (channel);
153
157
Serial.print (F (" data = " ));
154
158
Serial.println ((int )data_bptr[channel]);
159
+ }
155
160
slice_value+=data_bptr[channel];
156
161
break ;
157
162
}
@@ -171,7 +176,7 @@ void wav_play_rl(FILE *wavefile, AdvancedDAC &dac_out, bool verbosity){
171
176
break ;
172
177
}
173
178
dac_data=(short unsigned )slice_value;
174
- if (verbosity)
179
+ if (verbosity) {
175
180
Serial.print (F (" DAC-Data >>>>>>>>>>>>>>" ));
176
181
Serial.print (F (" sample =" ));
177
182
Serial.println (slice);
@@ -181,6 +186,7 @@ void wav_play_rl(FILE *wavefile, AdvancedDAC &dac_out, bool verbosity){
181
186
Serial.println ((int )slice_value);
182
187
Serial.print (F (" dac_data =" ));
183
188
Serial.println (dac_data);
189
+ }
184
190
DAC_fifo[DAC_wptr]=dac_data;
185
191
186
192
// Custom_mode begin
@@ -189,8 +195,8 @@ void wav_play_rl(FILE *wavefile, AdvancedDAC &dac_out, bool verbosity){
189
195
// Conditional addition to switch between channels - FOR STEREO
190
196
if (DAC_wptr >= 255 ){
191
197
static size_t lut_offs = 0 ;
192
-
193
- Serial.println (F (" Proceeding DAC ..." ));
198
+ if (verbosity)
199
+ Serial.println (F (" Proceeding DAC ..." ));
194
200
// Get a free buffer for writing.
195
201
SampleBuffer buf = dac_out.dequeue ();
196
202
// Write data to buffer.
@@ -199,12 +205,14 @@ void wav_play_rl(FILE *wavefile, AdvancedDAC &dac_out, bool verbosity){
199
205
}
200
206
201
207
// Writethe buffer to DAC.
202
- Serial.println (F (" Writing to DAC ..." ));
208
+ if (verbosity)
209
+ Serial.println (F (" Writing to DAC ..." ));
203
210
dac_out.write (buf);
204
211
205
212
DAC_wptr = 0 ;
206
213
} else {
207
- Serial.println (F (" Slicing" ));
214
+ if (verbosity)
215
+ Serial.println (F (" Slicing" ));
208
216
}
209
217
// Custom_mode end
210
218
}
@@ -213,16 +221,19 @@ void wav_play_rl(FILE *wavefile, AdvancedDAC &dac_out, bool verbosity){
213
221
free (slice_buf);
214
222
break ;
215
223
case 0x5453494c :
216
- if (verbosity)
224
+ if (verbosity) {
217
225
Serial.print (F (" INFO chunk, size" ));
218
226
Serial.println (chunk_size);
227
+ }
219
228
fseek (wavefile,chunk_size,SEEK_CUR);
220
229
break ;
221
230
default :
222
- Serial.print (F (" unknown chunk type =" ));
223
- Serial.println (chunk_id);
224
- Serial.print (F (" chunk size =" ));
225
- Serial.println (chunk_size);
231
+ if (verbosity) {
232
+ Serial.print (F (" unknown chunk type =" ));
233
+ Serial.println (chunk_id);
234
+ Serial.print (F (" chunk size =" ));
235
+ Serial.println (chunk_size);
236
+ }
226
237
data=fseek (wavefile,chunk_size,SEEK_CUR);
227
238
break ;
228
239
}
0 commit comments