Recording: Change some encoder code the operation of which was apparantly unclear. It seems clearer now anyway. No functional changes.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19255 a1c6a512-1295-4272-9138-f99709370657

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)
                                     ICODE_ATTR;
 STATICIRAM void enc_events_callback(enum enc_events event, void *data)
 {
-    if (event == ENC_WRITE_CHUNK)
+    switch (event)
     {
+    case ENC_WRITE_CHUNK:
         if (on_write_chunk((struct enc_file_event_data *)data))
             return;
-    }
-    else if (event == ENC_START_FILE)
-    {
+
+        break;
+
+    case ENC_START_FILE:
         if (on_start_file((struct enc_file_event_data *)data))
             return;
-    }
-    else if (event == ENC_END_FILE)
-    {
+
+        break;
+
+    case ENC_END_FILE:
         if (on_end_file((struct enc_file_event_data *)data))
             return;
-    }
-    else
-    {
+
+        break;
+
+    default:
         return;
     }
 
+    /* Something failed above. Signal error back to core. */
     ((struct enc_file_event_data *)data)->chunk->flags |= CHUNKF_ERROR;
 } /* enc_events_callback */
 
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)
     else if (data->flags & CHUNKF_PRERECORD)
     {
         /* nothing to add and we cannot change prerecorded data */
-        }
+    }
     else if (data->flags & CHUNKF_START_FILE)
     {
         /* starting fresh ... be sure to flush encoder first */
@@ -2490,31 +2490,35 @@ STATICIRAM void enc_events_callback(enum enc_events event, void *data)
                                     ICODE_ATTR;
 STATICIRAM void enc_events_callback(enum enc_events event, void *data)
 {
-    if (event == ENC_WRITE_CHUNK)
+    switch (event)
     {
+    case ENC_WRITE_CHUNK:
         if (on_write_chunk((struct enc_file_event_data *)data))
             return;
-    }
-    else if (event == ENC_START_FILE)
-    {
+
+        break;
+
+    case ENC_START_FILE:
         if (on_start_file((struct enc_file_event_data *)data))
             return;
-    }
-    else if (event == ENC_END_FILE)
-    {
+
+        break;
+ 
+    case ENC_END_FILE:
          if (on_end_file((struct enc_file_event_data *)data))
             return;
-    }
-    else if (event == ENC_REC_NEW_STREAM)
-        {
+
+         break;
+
+    case ENC_REC_NEW_STREAM:
         on_rec_new_stream((struct enc_buffer_event_data *)data);
         return;
-    }
-    else
-    {
+
+    default:
         return;
     }
 
+    /* Something failed above. Signal error back to core. */
     ((struct enc_file_event_data *)data)->chunk->flags |= CHUNKF_ERROR;
 } /* enc_events_callback */
 
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)
                                     ICODE_ATTR;
 STATICIRAM void enc_events_callback(enum enc_events event, void *data)
 {
-    if (event == ENC_WRITE_CHUNK)
+    switch (event)
     {
+    case ENC_WRITE_CHUNK:
         if (on_write_chunk((struct enc_file_event_data *)data))
             return;
-    }
-    else if (event == ENC_START_FILE)
-    {
+
+        break;
+
+    case ENC_START_FILE:
         if (on_start_file((struct enc_file_event_data *)data))
             return;
-    }
-    else if (event == ENC_END_FILE)
-    {
+
+        break;
+
+    case ENC_END_FILE:
         if (on_end_file((struct enc_file_event_data *)data))
             return;
-    }
-    else
-    {
+
+        break;
+
+    default:
         return;
     }
 
+    /* Something failed above. Signal error back to core. */
     ((struct enc_file_event_data *)data)->chunk->flags |= CHUNKF_ERROR;
 } /* enc_events_callback */
 
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)
                                     ICODE_ATTR;
 STATICIRAM void enc_events_callback(enum enc_events event, void *data)
 {
-    if (event == ENC_WRITE_CHUNK)
+    switch (event)
     {
+    case ENC_WRITE_CHUNK:
         if (on_write_chunk((struct enc_file_event_data *)data))
             return;
-    }
-    else if (event == ENC_START_FILE)
-    {
+
+        break;
+
+    case ENC_START_FILE:
         /* write metadata header and RIFF header */
         if (on_start_file((struct enc_file_event_data *)data))
             return;
-    }
-    else if (event == ENC_END_FILE)
-    {
+
+        break;
+
+    case ENC_END_FILE:
         if (on_end_file((struct enc_file_event_data *)data))
             return;
-    }
-    else
-    {
+
+        break;
+
+    default:
         return;
     }
 
+    /* Something failed above. Signal error back to core. */
     ((struct enc_file_event_data *)data)->chunk->flags |= CHUNKF_ERROR;
 } /* enc_events_callback */