diff options
Diffstat (limited to 'apps/recorder')
-rw-r--r-- | apps/recorder/radio.c | 8 | ||||
-rw-r--r-- | apps/recorder/recording.c | 14 |
2 files changed, 22 insertions, 0 deletions
diff --git a/apps/recorder/radio.c b/apps/recorder/radio.c index 5430279f85..f8da238c6f 100644 --- a/apps/recorder/radio.c +++ b/apps/recorder/radio.c | |||
@@ -46,6 +46,7 @@ | |||
46 | #include "font.h" | 46 | #include "font.h" |
47 | #include "sound_menu.h" | 47 | #include "sound_menu.h" |
48 | #include "recording.h" | 48 | #include "recording.h" |
49 | #include "talk.h" | ||
49 | 50 | ||
50 | #ifdef HAVE_FMRADIO | 51 | #ifdef HAVE_FMRADIO |
51 | 52 | ||
@@ -174,6 +175,9 @@ bool radio_screen(void) | |||
174 | 175 | ||
175 | peak_meter_enabled = true; | 176 | peak_meter_enabled = true; |
176 | 177 | ||
178 | if (global_settings.rec_prerecord_time) | ||
179 | talk_buffer_steal(); /* will use the mp3 buffer */ | ||
180 | |||
177 | mpeg_set_recording_options(global_settings.rec_frequency, | 181 | mpeg_set_recording_options(global_settings.rec_frequency, |
178 | global_settings.rec_quality, | 182 | global_settings.rec_quality, |
179 | 1, /* Line In */ | 183 | 1, /* Line In */ |
@@ -257,6 +261,7 @@ bool radio_screen(void) | |||
257 | else | 261 | else |
258 | { | 262 | { |
259 | have_recorded = true; | 263 | have_recorded = true; |
264 | talk_buffer_steal(); /* we use the mp3 buffer */ | ||
260 | mpeg_record(rec_create_filename(buf)); | 265 | mpeg_record(rec_create_filename(buf)); |
261 | status_set_playmode(STATUS_RECORD); | 266 | status_set_playmode(STATUS_RECORD); |
262 | update_screen = true; | 267 | update_screen = true; |
@@ -704,6 +709,9 @@ static bool fm_recording_settings(void) | |||
704 | ret = recording_menu(true); | 709 | ret = recording_menu(true); |
705 | if(!ret) | 710 | if(!ret) |
706 | { | 711 | { |
712 | if (global_settings.rec_prerecord_time) | ||
713 | talk_buffer_steal(); /* will use the mp3 buffer */ | ||
714 | |||
707 | mpeg_set_recording_options(global_settings.rec_frequency, | 715 | mpeg_set_recording_options(global_settings.rec_frequency, |
708 | global_settings.rec_quality, | 716 | global_settings.rec_quality, |
709 | 1, /* Line In */ | 717 | 1, /* Line In */ |
diff --git a/apps/recorder/recording.c b/apps/recorder/recording.c index c7d4b803d2..c2f2462a5c 100644 --- a/apps/recorder/recording.c +++ b/apps/recorder/recording.c | |||
@@ -46,6 +46,7 @@ | |||
46 | #include "string.h" | 46 | #include "string.h" |
47 | #include "dir.h" | 47 | #include "dir.h" |
48 | #include "errno.h" | 48 | #include "errno.h" |
49 | #include "talk.h" | ||
49 | 50 | ||
50 | bool f2_rec_screen(void); | 51 | bool f2_rec_screen(void); |
51 | bool f3_rec_screen(void); | 52 | bool f3_rec_screen(void); |
@@ -166,6 +167,9 @@ bool recording_screen(void) | |||
166 | 167 | ||
167 | peak_meter_enabled = true; | 168 | peak_meter_enabled = true; |
168 | 169 | ||
170 | if (global_settings.rec_prerecord_time) | ||
171 | talk_buffer_steal(); /* will use the mp3 buffer */ | ||
172 | |||
169 | mpeg_set_recording_options(global_settings.rec_frequency, | 173 | mpeg_set_recording_options(global_settings.rec_frequency, |
170 | global_settings.rec_quality, | 174 | global_settings.rec_quality, |
171 | global_settings.rec_source, | 175 | global_settings.rec_source, |
@@ -223,6 +227,7 @@ bool recording_screen(void) | |||
223 | if(!(mpeg_status() & MPEG_STATUS_RECORD)) | 227 | if(!(mpeg_status() & MPEG_STATUS_RECORD)) |
224 | { | 228 | { |
225 | have_recorded = true; | 229 | have_recorded = true; |
230 | talk_buffer_steal(); /* we use the mp3 buffer */ | ||
226 | mpeg_record(rec_create_filename(path_buffer)); | 231 | mpeg_record(rec_create_filename(path_buffer)); |
227 | status_set_playmode(STATUS_RECORD); | 232 | status_set_playmode(STATUS_RECORD); |
228 | update_countdown = 1; /* Update immediately */ | 233 | update_countdown = 1; /* Update immediately */ |
@@ -336,6 +341,9 @@ bool recording_screen(void) | |||
336 | return SYS_USB_CONNECTED; | 341 | return SYS_USB_CONNECTED; |
337 | settings_save(); | 342 | settings_save(); |
338 | 343 | ||
344 | if (global_settings.rec_prerecord_time) | ||
345 | talk_buffer_steal(); /* will use the mp3 buffer */ | ||
346 | |||
339 | mpeg_set_recording_options(global_settings.rec_frequency, | 347 | mpeg_set_recording_options(global_settings.rec_frequency, |
340 | global_settings.rec_quality, | 348 | global_settings.rec_quality, |
341 | global_settings.rec_source, | 349 | global_settings.rec_source, |
@@ -660,6 +668,9 @@ bool f2_rec_screen(void) | |||
660 | } | 668 | } |
661 | } | 669 | } |
662 | 670 | ||
671 | if (global_settings.rec_prerecord_time) | ||
672 | talk_buffer_steal(); /* will use the mp3 buffer */ | ||
673 | |||
663 | mpeg_set_recording_options(global_settings.rec_frequency, | 674 | mpeg_set_recording_options(global_settings.rec_frequency, |
664 | global_settings.rec_quality, | 675 | global_settings.rec_quality, |
665 | global_settings.rec_source, | 676 | global_settings.rec_source, |
@@ -730,6 +741,9 @@ bool f3_rec_screen(void) | |||
730 | } | 741 | } |
731 | } | 742 | } |
732 | 743 | ||
744 | if (global_settings.rec_prerecord_time) | ||
745 | talk_buffer_steal(); /* will use the mp3 buffer */ | ||
746 | |||
733 | mpeg_set_recording_options(global_settings.rec_frequency, | 747 | mpeg_set_recording_options(global_settings.rec_frequency, |
734 | global_settings.rec_quality, | 748 | global_settings.rec_quality, |
735 | global_settings.rec_source, | 749 | global_settings.rec_source, |