diff options
author | Jens Arnold <amiconn@rockbox.org> | 2006-09-18 12:41:12 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2006-09-18 12:41:12 +0000 |
commit | fa9dee01bc70a56cb602f66776a43939c8293f6f (patch) | |
tree | cde60a608aa0f16f51c28099f784d85b832dc862 /apps/sound_menu.c | |
parent | 7ef47ed87614d6100b491b2c0eb9f75d1fdc1f01 (diff) | |
download | rockbox-fa9dee01bc70a56cb602f66776a43939c8293f6f.tar.gz rockbox-fa9dee01bc70a56cb602f66776a43939c8293f6f.zip |
Reverted the recording timer commit, as it has at least 2 major problems. (1) It uses the user timer, which interferes e.g. with backlight fading on H1x0 (and potentially other targets). Using the user timer here is a waste, as the required timing lies in the range of seconds to days. A tick task would be sufficient. (2) It draws to the LCD from within an ISR. This must not be done unless there's a mechanism to ensure it doesn't interfere with the main thread's drawing, otherwise garbage might be displayed and LCD updates might stop working.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10991 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/sound_menu.c')
-rw-r--r-- | apps/sound_menu.c | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/apps/sound_menu.c b/apps/sound_menu.c index 6537b5b171..f220d26f8f 100644 --- a/apps/sound_menu.c +++ b/apps/sound_menu.c | |||
@@ -7,7 +7,7 @@ | |||
7 | * \/ \/ \/ \/ \/ | 7 | * \/ \/ \/ \/ \/ |
8 | * $Id$ | 8 | * $Id$ |
9 | * | 9 | * |
10 | * Copyright (C) 2002 Bj�n Stenberg | 10 | * Copyright (C) 2002 Björn Stenberg |
11 | * | 11 | * |
12 | * All files in this archive are subject to the GNU General Public License. | 12 | * All files in this archive are subject to the GNU General Public License. |
13 | * See the file COPYING in the source tree root for full license agreement. | 13 | * See the file COPYING in the source tree root for full license agreement. |
@@ -591,25 +591,6 @@ static bool agc_cliptime(void) | |||
591 | INT, names, 5, NULL ); | 591 | INT, names, 5, NULL ); |
592 | } | 592 | } |
593 | #endif /* HAVE_AGC */ | 593 | #endif /* HAVE_AGC */ |
594 | |||
595 | /* Displays a menu for changing the countdown timer settings */ | ||
596 | static bool countdown_timer(void) | ||
597 | { | ||
598 | static const struct opt_items names[] = { | ||
599 | { STR(LANG_TIMER_DAYS) }, | ||
600 | { STR(LANG_TIMER_HRS) }, | ||
601 | { STR(LANG_TIMER_MINS) } | ||
602 | }; | ||
603 | |||
604 | struct opt_settings settings[] = { | ||
605 | { &global_settings.ctdn_days, 6 }, | ||
606 | { &global_settings.ctdn_hrs, 23 }, | ||
607 | { &global_settings.ctdn_mins, 59 } | ||
608 | }; | ||
609 | |||
610 | return set_multi_int(str(LANG_TIMER_SET), names, settings, 3); | ||
611 | } | ||
612 | |||
613 | #endif /* HAVE_RECORDING */ | 594 | #endif /* HAVE_RECORDING */ |
614 | 595 | ||
615 | static bool chanconf(void) | 596 | static bool chanconf(void) |
@@ -1108,8 +1089,6 @@ bool recording_menu(bool no_source) | |||
1108 | items[i].desc = ID2P(LANG_RECORD_AGC_CLIPTIME); | 1089 | items[i].desc = ID2P(LANG_RECORD_AGC_CLIPTIME); |
1109 | items[i++].function = agc_cliptime; | 1090 | items[i++].function = agc_cliptime; |
1110 | #endif | 1091 | #endif |
1111 | items[i].desc = ID2P(LANG_TIMER_SET); | ||
1112 | items[i++].function = countdown_timer; | ||
1113 | 1092 | ||
1114 | m=menu_init( items, i, NULL, NULL, NULL, NULL); | 1093 | m=menu_init( items, i, NULL, NULL, NULL, NULL); |
1115 | result = menu_run(m); | 1094 | result = menu_run(m); |