diff options
-rw-r--r-- | apps/codecs/aiff_enc.c | 25 | ||||
-rw-r--r-- | apps/codecs/mp3_enc.c | 32 | ||||
-rw-r--r-- | apps/codecs/wav_enc.c | 25 | ||||
-rw-r--r-- | apps/codecs/wavpack_enc.c | 25 |
4 files changed, 63 insertions, 44 deletions
diff --git a/apps/codecs/aiff_enc.c b/apps/codecs/aiff_enc.c index 78c25b8711..094ea5a006 100644 --- a/apps/codecs/aiff_enc.c +++ b/apps/codecs/aiff_enc.c | |||
@@ -199,26 +199,31 @@ STATICIRAM void enc_events_callback(enum enc_events event, void *data) | |||
199 | ICODE_ATTR; | 199 | ICODE_ATTR; |
200 | STATICIRAM void enc_events_callback(enum enc_events event, void *data) | 200 | STATICIRAM void enc_events_callback(enum enc_events event, void *data) |
201 | { | 201 | { |
202 | if (event == ENC_WRITE_CHUNK) | 202 | switch (event) |
203 | { | 203 | { |
204 | case ENC_WRITE_CHUNK: | ||
204 | if (on_write_chunk((struct enc_file_event_data *)data)) | 205 | if (on_write_chunk((struct enc_file_event_data *)data)) |
205 | return; | 206 | return; |
206 | } | 207 | |
207 | else if (event == ENC_START_FILE) | 208 | break; |
208 | { | 209 | |
210 | case ENC_START_FILE: | ||
209 | if (on_start_file((struct enc_file_event_data *)data)) | 211 | if (on_start_file((struct enc_file_event_data *)data)) |
210 | return; | 212 | return; |
211 | } | 213 | |
212 | else if (event == ENC_END_FILE) | 214 | break; |
213 | { | 215 | |
216 | case ENC_END_FILE: | ||
214 | if (on_end_file((struct enc_file_event_data *)data)) | 217 | if (on_end_file((struct enc_file_event_data *)data)) |
215 | return; | 218 | return; |
216 | } | 219 | |
217 | else | 220 | break; |
218 | { | 221 | |
222 | default: | ||
219 | return; | 223 | return; |
220 | } | 224 | } |
221 | 225 | ||
226 | /* Something failed above. Signal error back to core. */ | ||
222 | ((struct enc_file_event_data *)data)->chunk->flags |= CHUNKF_ERROR; | 227 | ((struct enc_file_event_data *)data)->chunk->flags |= CHUNKF_ERROR; |
223 | } /* enc_events_callback */ | 228 | } /* enc_events_callback */ |
224 | 229 | ||
diff --git a/apps/codecs/mp3_enc.c b/apps/codecs/mp3_enc.c index 555e981a06..18aa1bfe1a 100644 --- a/apps/codecs/mp3_enc.c +++ b/apps/codecs/mp3_enc.c | |||
@@ -2469,7 +2469,7 @@ static void on_rec_new_stream(struct enc_buffer_event_data *data) | |||
2469 | else if (data->flags & CHUNKF_PRERECORD) | 2469 | else if (data->flags & CHUNKF_PRERECORD) |
2470 | { | 2470 | { |
2471 | /* nothing to add and we cannot change prerecorded data */ | 2471 | /* nothing to add and we cannot change prerecorded data */ |
2472 | } | 2472 | } |
2473 | else if (data->flags & CHUNKF_START_FILE) | 2473 | else if (data->flags & CHUNKF_START_FILE) |
2474 | { | 2474 | { |
2475 | /* starting fresh ... be sure to flush encoder first */ | 2475 | /* starting fresh ... be sure to flush encoder first */ |
@@ -2490,31 +2490,35 @@ STATICIRAM void enc_events_callback(enum enc_events event, void *data) | |||
2490 | ICODE_ATTR; | 2490 | ICODE_ATTR; |
2491 | STATICIRAM void enc_events_callback(enum enc_events event, void *data) | 2491 | STATICIRAM void enc_events_callback(enum enc_events event, void *data) |
2492 | { | 2492 | { |
2493 | if (event == ENC_WRITE_CHUNK) | 2493 | switch (event) |
2494 | { | 2494 | { |
2495 | case ENC_WRITE_CHUNK: | ||
2495 | if (on_write_chunk((struct enc_file_event_data *)data)) | 2496 | if (on_write_chunk((struct enc_file_event_data *)data)) |
2496 | return; | 2497 | return; |
2497 | } | 2498 | |
2498 | else if (event == ENC_START_FILE) | 2499 | break; |
2499 | { | 2500 | |
2501 | case ENC_START_FILE: | ||
2500 | if (on_start_file((struct enc_file_event_data *)data)) | 2502 | if (on_start_file((struct enc_file_event_data *)data)) |
2501 | return; | 2503 | return; |
2502 | } | 2504 | |
2503 | else if (event == ENC_END_FILE) | 2505 | break; |
2504 | { | 2506 | |
2507 | case ENC_END_FILE: | ||
2505 | if (on_end_file((struct enc_file_event_data *)data)) | 2508 | if (on_end_file((struct enc_file_event_data *)data)) |
2506 | return; | 2509 | return; |
2507 | } | 2510 | |
2508 | else if (event == ENC_REC_NEW_STREAM) | 2511 | break; |
2509 | { | 2512 | |
2513 | case ENC_REC_NEW_STREAM: | ||
2510 | on_rec_new_stream((struct enc_buffer_event_data *)data); | 2514 | on_rec_new_stream((struct enc_buffer_event_data *)data); |
2511 | return; | 2515 | return; |
2512 | } | 2516 | |
2513 | else | 2517 | default: |
2514 | { | ||
2515 | return; | 2518 | return; |
2516 | } | 2519 | } |
2517 | 2520 | ||
2521 | /* Something failed above. Signal error back to core. */ | ||
2518 | ((struct enc_file_event_data *)data)->chunk->flags |= CHUNKF_ERROR; | 2522 | ((struct enc_file_event_data *)data)->chunk->flags |= CHUNKF_ERROR; |
2519 | } /* enc_events_callback */ | 2523 | } /* enc_events_callback */ |
2520 | 2524 | ||
diff --git a/apps/codecs/wav_enc.c b/apps/codecs/wav_enc.c index 3627808271..75536d1b1d 100644 --- a/apps/codecs/wav_enc.c +++ b/apps/codecs/wav_enc.c | |||
@@ -188,26 +188,31 @@ STATICIRAM void enc_events_callback(enum enc_events event, void *data) | |||
188 | ICODE_ATTR; | 188 | ICODE_ATTR; |
189 | STATICIRAM void enc_events_callback(enum enc_events event, void *data) | 189 | STATICIRAM void enc_events_callback(enum enc_events event, void *data) |
190 | { | 190 | { |
191 | if (event == ENC_WRITE_CHUNK) | 191 | switch (event) |
192 | { | 192 | { |
193 | case ENC_WRITE_CHUNK: | ||
193 | if (on_write_chunk((struct enc_file_event_data *)data)) | 194 | if (on_write_chunk((struct enc_file_event_data *)data)) |
194 | return; | 195 | return; |
195 | } | 196 | |
196 | else if (event == ENC_START_FILE) | 197 | break; |
197 | { | 198 | |
199 | case ENC_START_FILE: | ||
198 | if (on_start_file((struct enc_file_event_data *)data)) | 200 | if (on_start_file((struct enc_file_event_data *)data)) |
199 | return; | 201 | return; |
200 | } | 202 | |
201 | else if (event == ENC_END_FILE) | 203 | break; |
202 | { | 204 | |
205 | case ENC_END_FILE: | ||
203 | if (on_end_file((struct enc_file_event_data *)data)) | 206 | if (on_end_file((struct enc_file_event_data *)data)) |
204 | return; | 207 | return; |
205 | } | 208 | |
206 | else | 209 | break; |
207 | { | 210 | |
211 | default: | ||
208 | return; | 212 | return; |
209 | } | 213 | } |
210 | 214 | ||
215 | /* Something failed above. Signal error back to core. */ | ||
211 | ((struct enc_file_event_data *)data)->chunk->flags |= CHUNKF_ERROR; | 216 | ((struct enc_file_event_data *)data)->chunk->flags |= CHUNKF_ERROR; |
212 | } /* enc_events_callback */ | 217 | } /* enc_events_callback */ |
213 | 218 | ||
diff --git a/apps/codecs/wavpack_enc.c b/apps/codecs/wavpack_enc.c index 56359e44a0..e7da6efa75 100644 --- a/apps/codecs/wavpack_enc.c +++ b/apps/codecs/wavpack_enc.c | |||
@@ -313,27 +313,32 @@ STATICIRAM void enc_events_callback(enum enc_events event, void *data) | |||
313 | ICODE_ATTR; | 313 | ICODE_ATTR; |
314 | STATICIRAM void enc_events_callback(enum enc_events event, void *data) | 314 | STATICIRAM void enc_events_callback(enum enc_events event, void *data) |
315 | { | 315 | { |
316 | if (event == ENC_WRITE_CHUNK) | 316 | switch (event) |
317 | { | 317 | { |
318 | case ENC_WRITE_CHUNK: | ||
318 | if (on_write_chunk((struct enc_file_event_data *)data)) | 319 | if (on_write_chunk((struct enc_file_event_data *)data)) |
319 | return; | 320 | return; |
320 | } | 321 | |
321 | else if (event == ENC_START_FILE) | 322 | break; |
322 | { | 323 | |
324 | case ENC_START_FILE: | ||
323 | /* write metadata header and RIFF header */ | 325 | /* write metadata header and RIFF header */ |
324 | if (on_start_file((struct enc_file_event_data *)data)) | 326 | if (on_start_file((struct enc_file_event_data *)data)) |
325 | return; | 327 | return; |
326 | } | 328 | |
327 | else if (event == ENC_END_FILE) | 329 | break; |
328 | { | 330 | |
331 | case ENC_END_FILE: | ||
329 | if (on_end_file((struct enc_file_event_data *)data)) | 332 | if (on_end_file((struct enc_file_event_data *)data)) |
330 | return; | 333 | return; |
331 | } | 334 | |
332 | else | 335 | break; |
333 | { | 336 | |
337 | default: | ||
334 | return; | 338 | return; |
335 | } | 339 | } |
336 | 340 | ||
341 | /* Something failed above. Signal error back to core. */ | ||
337 | ((struct enc_file_event_data *)data)->chunk->flags |= CHUNKF_ERROR; | 342 | ((struct enc_file_event_data *)data)->chunk->flags |= CHUNKF_ERROR; |
338 | } /* enc_events_callback */ | 343 | } /* enc_events_callback */ |
339 | 344 | ||