The recording buffer should not try to use the voice buffer, so map our buffer after it. On swcodec targets, recording always uses this buffer so always notify the others that we did. Fixes bug 4754.

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

1 files changed, 8 insertions, 4 deletions

diff --git a/apps/recorder/recording.c b/apps/recorder/recording.c
index 172689372f..0d414292b2 100644
--- a/apps/recorder/recording.c
+++ b/apps/recorder/recording.c
@@ -320,11 +320,11 @@ static void trigger_listener(int trigger_status)
         case TRIG_GO:
             if((audio_status() & AUDIO_STATUS_RECORD) != AUDIO_STATUS_RECORD)
             {
-              talk_buffer_steal(); /* we use the mp3 buffer */
-              audio_record(rec_create_filename(path_buffer));
+                talk_buffer_steal(); /* we use the mp3 buffer */
+                audio_record(rec_create_filename(path_buffer));
 
-              /* give control to mpeg thread so that it can start recording */
-              yield(); yield(); yield();
+                /* give control to mpeg thread so that it can start recording*/
+                yield(); yield(); yield();
             }
 
             /* if we're already recording this is a retrigger */
@@ -567,7 +567,9 @@ bool recording_screen(void)
 #endif
     peak_meter_enabled = true;
 
+#if CONFIG_CODEC != SWCODEC
     if (global_settings.rec_prerecord_time)
+#endif
         talk_buffer_steal(); /* will use the mp3 buffer */
 
     audio_set_recording_options(global_settings.rec_frequency,
@@ -905,7 +907,9 @@ bool recording_screen(void)
                     }
                     settings_save();
 
+#if CONFIG_CODEC != SWCODEC
                     if (global_settings.rec_prerecord_time)
+#endif
                         talk_buffer_steal(); /* will use the mp3 buffer */
 
                     audio_set_recording_options(global_settings.rec_frequency,