summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Nielsen Feltzing <linus@haxx.se>2002-11-11 08:16:18 +0000
committerLinus Nielsen Feltzing <linus@haxx.se>2002-11-11 08:16:18 +0000
commit1bee8d5117c00825a4dc6d8204d1acee375e337f (patch)
tree1bb704a8e7fcabc26e4d83536e716a06c691bb79
parentafe0da9e1677c5164291150286531ccd46ebef10 (diff)
downloadrockbox-1bee8d5117c00825a4dc6d8204d1acee375e337f.zip
rockbox-1bee8d5117c00825a4dc6d8204d1acee375e337f.tar.gz
rockbox-1bee8d5117c00825a4dc6d8204d1acee375e337f.tar.bz2
rockbox-1bee8d5117c00825a4dc6d8204d1acee375e337f.tar.xz
Now applies the selected options properly when exiting the setup menu
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2819 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/recorder/recording.c16
1 files changed, 13 insertions, 3 deletions
diff --git a/apps/recorder/recording.c b/apps/recorder/recording.c
index 70aa125..96d8fca 100644
--- a/apps/recorder/recording.c
+++ b/apps/recorder/recording.c
@@ -165,9 +165,13 @@ bool recording_screen(void)
break;
case BUTTON_PLAY:
- mpeg_record("");
- status_set_playmode(STATUS_RECORD);
- update_countdown = 1; /* Update immediately */
+ /* Only act if the mpeg is stopped */
+ if(!mpeg_status())
+ {
+ mpeg_record("");
+ status_set_playmode(STATUS_RECORD);
+ update_countdown = 1; /* Update immediately */
+ }
break;
case BUTTON_UP:
@@ -268,6 +272,12 @@ bool recording_screen(void)
if (recording_menu())
return SYS_USB_CONNECTED;
settings_save();
+ mpeg_set_recording_options(global_settings.rec_frequency,
+ global_settings.rec_quality,
+ global_settings.rec_source,
+ global_settings.rec_channels);
+
+ set_gain();
update_countdown = 1; /* Update immediately */
break;