Accept FS#6918 - Remove Nested Functions by Tim Ross. Adjust some names. Hunt down and remove the remaining ones in the recording system as well.

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

1 files changed, 24 insertions, 24 deletions

diff --git a/apps/codecs/wav_enc.c b/apps/codecs/wav_enc.c
index e14b04d..ff77f13 100644
--- a/apps/codecs/wav_enc.c
+++ b/apps/codecs/wav_enc.c
@@ -209,6 +209,22 @@ STATICIRAM void enc_events_callback(enum enc_events event, void *data)
 } /* enc_events_callback */
 
 /* convert native pcm samples to wav format samples */
+static inline void sample_to_mono(uint32_t **src, uint32_t **dst)
+{
+    int32_t lr1, lr2;
+
+    lr1 = *(*src)++;
+    lr1 = (int16_t)lr1 + (lr1 >> 16) + err;
+    err = lr1 & 1;
+    lr1 >>= 1;
+
+    lr2 = *(*src)++;
+    lr2 = (int16_t)lr2 + (lr2 >> 16) + err;
+    err = lr2 & 1;
+    lr2 >>= 1; 
+    *(*dst)++ = swap_odd_even_be32((lr1 << 16) | (uint16_t)lr2);
+} /* sample_to_mono */
+
 STATICIRAM void chunk_to_wav_format(uint32_t *src, uint32_t *dst) ICODE_ATTR;
 STATICIRAM void chunk_to_wav_format(uint32_t *src, uint32_t *dst)
 {
@@ -226,32 +242,16 @@ STATICIRAM void chunk_to_wav_format(uint32_t *src, uint32_t *dst)
          */
         uint32_t *src_end = src + PCM_SAMP_PER_CHUNK;
 
-        inline void to_mono(uint32_t **src, uint32_t **dst)
-        {
-            int32_t lr1, lr2;
-
-            lr1 = *(*src)++;
-            lr1 = (int16_t)lr1 + (lr1 >> 16) + err;
-            err = lr1 & 1;
-            lr1 >>= 1;
-
-            lr2 = *(*src)++;
-            lr2 = (int16_t)lr2 + (lr2 >> 16) + err;
-            err = lr2 & 1;
-            lr2 >>= 1; 
-            *(*dst)++ = swap_odd_even_be32((lr1 << 16) | (uint16_t)lr2);
-        } /* to_mono */
-
         do
         {
-            to_mono(&src, &dst);
-            to_mono(&src, &dst);
-            to_mono(&src, &dst);
-            to_mono(&src, &dst);
-            to_mono(&src, &dst);
-            to_mono(&src, &dst);
-            to_mono(&src, &dst);
-            to_mono(&src, &dst);
+            sample_to_mono(&src, &dst);
+            sample_to_mono(&src, &dst);
+            sample_to_mono(&src, &dst);
+            sample_to_mono(&src, &dst);
+            sample_to_mono(&src, &dst);
+            sample_to_mono(&src, &dst);
+            sample_to_mono(&src, &dst);
+            sample_to_mono(&src, &dst);
         }
         while (src < src_end);
     }