1 files changed, 18 insertions, 37 deletions

diff --git a/apps/recorder/pcm_record.c b/apps/recorder/pcm_record.c
index 9b0e779485..0f6e8469ec 100644
--- a/apps/recorder/pcm_record.c
+++ b/apps/recorder/pcm_record.c
@@ -878,53 +878,37 @@ copy_buffer_mono_lr(void *dst, const void *src, size_t src_size)
     ssize_t copy_size = src_size;
  
      /* mono = (L + R) / 2 */
-    do
-    {
-        *d++ = ((int32_t){s[0]} + s[1] + 1) >> 1;
-        s+=2;
+    while(copy_size > 0) {
+        *d++ = ((int32_t)s[0] + (int32_t)s[1] + 1) >> 1;
+        s += 2;
+        copy_size -= PCM_SAMP_SIZE;
     }
-    while ((copy_size -= PCM_SAMP_SIZE) > 0);
 
     return dst;
 }
 
-/* Copy with mono conversion - output 1/2 size of input */
 static void * ICODE_ATTR
-copy_buffer_mono_r(void *dst, const void *src, size_t src_size)
+copy_buffer_mono_l(void *dst, const void *src, size_t src_size)
 {
-    int16_t *d = (int16_t*)dst;
-    int16_t const *s = (int16_t const*)src - 1;
+    int16_t *d = (int16_t*) dst;
+    int16_t const *s = (int16_t const*) src;
     ssize_t copy_size = src_size;
-    /* mono = R */
-    do
-        *d++ = *(s += 2);
-    while ((copy_size -= PCM_SAMP_SIZE) > 0);
+
+    /* mono = L */
+    while(copy_size > 0) {
+        *d++ = *s;
+        s += 2;
+        copy_size -= PCM_SAMP_SIZE;
+    }
 
     return dst;
 }
 
-#if 1
-static void * ICODE_ATTR
-copy_buffer_mono_l(void *dst, const void *src, size_t src_size)
-{
-    return copy_buffer_mono_r(dst, src -1, src_size);
-}
-#else
-/* Copy with mono conversion - output 1/2 size of input */
 static void * ICODE_ATTR
-copy_buffer_mono_l(void *dst, const void *src, size_t src_size)
+copy_buffer_mono_r(void *dst, const void *src, size_t src_size)
 {
-    int16_t *d = (int16_t*)dst;
-    int16_t const *s = (int16_t const*)src - 2;
-    ssize_t copy_size = src_size;
-    /* mono = L */
-    do
-        *d++ = *(s += 2);
-    while ((copy_size -= PCM_SAMP_SIZE) > 0);
-
-    return dst;
+    return copy_buffer_mono_l(dst, src + 2, src_size);
 }
-#endif
 
 
 /** pcm_rec_* group **/
@@ -1422,12 +1406,9 @@ static int pcmrec_handle;
 static void on_init_recording(void)
 {
     send_event(RECORDING_EVENT_START, NULL);
-    /* dummy ops with no callbacks, needed because by
-     * default buflib buffers can be moved around which must be avoided
-     * FIXME: This buffer should play nicer and be shrinkable/movable */
-    static struct buflib_callbacks dummy_ops;
+    /* FIXME: This buffer should play nicer and be shrinkable/movable */
     talk_buffer_set_policy(TALK_BUFFER_LOOSE);
-    pcmrec_handle = core_alloc_maximum("pcmrec", &rec_buffer_size, &dummy_ops);
+    pcmrec_handle = core_alloc_maximum("pcmrec", &rec_buffer_size, &buflib_ops_locked);
     if (pcmrec_handle <= 0)
     /* someone is abusing core_alloc_maximum(). Fix this evil guy instead of
      * trying to handle OOM without hope */