diff options
author | Jens Arnold <amiconn@rockbox.org> | 2004-10-24 22:30:55 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2004-10-24 22:30:55 +0000 |
commit | 0e8169c12a2c803de595dd8a6d02923a54ae8268 (patch) | |
tree | a7d55127fdabf1eb71eba85cc65fd306d01b15bf /apps/recorder/recording.c | |
parent | 4dab0d24329a01d46505f8648dffd4501c796463 (diff) | |
download | rockbox-0e8169c12a2c803de595dd8a6d02923a54ae8268.tar.gz rockbox-0e8169c12a2c803de595dd8a6d02923a54ae8268.zip |
Fixes: (1) Menu now disabled while recording, to prevent settings change. (2) Red led is switched off before entering menu.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5339 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/recorder/recording.c')
-rw-r--r-- | apps/recorder/recording.c | 38 |
1 files changed, 21 insertions, 17 deletions
diff --git a/apps/recorder/recording.c b/apps/recorder/recording.c index cdffeffc82..bf25c877b5 100644 --- a/apps/recorder/recording.c +++ b/apps/recorder/recording.c | |||
@@ -444,26 +444,30 @@ bool recording_screen(void) | |||
444 | 444 | ||
445 | #ifdef REC_SETTINGS | 445 | #ifdef REC_SETTINGS |
446 | case REC_SETTINGS: | 446 | case REC_SETTINGS: |
447 | if (recording_menu(false)) | 447 | if(mpeg_status() != MPEG_STATUS_RECORD) |
448 | return SYS_USB_CONNECTED; | 448 | { |
449 | settings_save(); | 449 | invert_led(false); |
450 | 450 | if (recording_menu(false)) | |
451 | if (global_settings.rec_prerecord_time) | 451 | return SYS_USB_CONNECTED; |
452 | talk_buffer_steal(); /* will use the mp3 buffer */ | 452 | settings_save(); |
453 | 453 | ||
454 | mpeg_set_recording_options(global_settings.rec_frequency, | 454 | if (global_settings.rec_prerecord_time) |
455 | global_settings.rec_quality, | 455 | talk_buffer_steal(); /* will use the mp3 buffer */ |
456 | global_settings.rec_source, | 456 | |
457 | global_settings.rec_channels, | 457 | mpeg_set_recording_options(global_settings.rec_frequency, |
458 | global_settings.rec_editable, | 458 | global_settings.rec_quality, |
459 | global_settings.rec_prerecord_time); | 459 | global_settings.rec_source, |
460 | global_settings.rec_channels, | ||
461 | global_settings.rec_editable, | ||
462 | global_settings.rec_prerecord_time); | ||
460 | 463 | ||
461 | set_gain(); | 464 | set_gain(); |
462 | 465 | ||
463 | update_countdown = 1; /* Update immediately */ | 466 | update_countdown = 1; /* Update immediately */ |
464 | 467 | ||
465 | lcd_setfont(FONT_SYSFIXED); | 468 | lcd_setfont(FONT_SYSFIXED); |
466 | lcd_setmargins(global_settings.invert_cursor ? 0 : w, 8); | 469 | lcd_setmargins(global_settings.invert_cursor ? 0 : w, 8); |
470 | } | ||
467 | break; | 471 | break; |
468 | #endif | 472 | #endif |
469 | 473 | ||