diff options
-rw-r--r-- | apps/lang/english.lang | 14 | ||||
-rw-r--r-- | apps/menus/exported_menus.h | 1 | ||||
-rw-r--r-- | apps/menus/main_menu.c | 88 | ||||
-rw-r--r-- | apps/menus/settings_menu.c | 109 | ||||
-rw-r--r-- | apps/menus/time_menu.c | 8 | ||||
-rw-r--r-- | manual/configure_rockbox/main.tex | 16 | ||||
-rw-r--r-- | manual/configure_rockbox/sleep_timer.tex | 13 | ||||
-rw-r--r-- | manual/configure_rockbox/startup_shutdown_options.tex | 57 | ||||
-rw-r--r-- | manual/configure_rockbox/system_options.tex | 34 | ||||
-rw-r--r-- | manual/configure_rockbox/time_and_date.tex | 1 | ||||
-rw-r--r-- | manual/main_menu/main.tex | 7 |
11 files changed, 179 insertions, 169 deletions
diff --git a/apps/lang/english.lang b/apps/lang/english.lang index d955c46324..c2db1e6fb2 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang | |||
@@ -12965,3 +12965,17 @@ | |||
12965 | *: "Glyphs To Cache" | 12965 | *: "Glyphs To Cache" |
12966 | </voice> | 12966 | </voice> |
12967 | </phrase> | 12967 | </phrase> |
12968 | <phrase> | ||
12969 | id: LANG_STARTUP_SHUTDOWN | ||
12970 | desc: in the general settings menu | ||
12971 | user: core | ||
12972 | <source> | ||
12973 | *: "Startup/Shutdown" | ||
12974 | </source> | ||
12975 | <dest> | ||
12976 | *: "Startup/Shutdown" | ||
12977 | </dest> | ||
12978 | <voice> | ||
12979 | *: "Startup/Shutdown" | ||
12980 | </voice> | ||
12981 | </phrase> | ||
diff --git a/apps/menus/exported_menus.h b/apps/menus/exported_menus.h index c439af1479..568791b1f0 100644 --- a/apps/menus/exported_menus.h +++ b/apps/menus/exported_menus.h | |||
@@ -38,7 +38,6 @@ extern const struct menu_item_ex | |||
38 | sound_settings, /* sound_menu.c */ | 38 | sound_settings, /* sound_menu.c */ |
39 | settings_menu_item, /* settings_menu.c */ | 39 | settings_menu_item, /* settings_menu.c */ |
40 | bookmark_settings_menu, | 40 | bookmark_settings_menu, |
41 | sleep_timer_call, /* main_menu.c */ | ||
42 | playlist_settings, /* playlist_menu.c */ | 41 | playlist_settings, /* playlist_menu.c */ |
43 | equalizer_menu, /* eq_menu.c */ | 42 | equalizer_menu, /* eq_menu.c */ |
44 | #ifdef AUDIOHW_HAVE_EQ | 43 | #ifdef AUDIOHW_HAVE_EQ |
diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c index 130d0bc2d5..cefc395b3d 100644 --- a/apps/menus/main_menu.c +++ b/apps/menus/main_menu.c | |||
@@ -374,97 +374,11 @@ static bool show_info(void) | |||
374 | MENUITEM_FUNCTION(show_info_item, 0, ID2P(LANG_ROCKBOX_INFO), | 374 | MENUITEM_FUNCTION(show_info_item, 0, ID2P(LANG_ROCKBOX_INFO), |
375 | (menu_function)show_info, NULL, NULL, Icon_NOICON); | 375 | (menu_function)show_info, NULL, NULL, Icon_NOICON); |
376 | 376 | ||
377 | |||
378 | /* sleep Menu */ | ||
379 | const char* sleep_timer_formatter(char* buffer, size_t buffer_size, | ||
380 | int value, const char* unit) | ||
381 | { | ||
382 | (void) unit; | ||
383 | int minutes, hours; | ||
384 | |||
385 | if (value) { | ||
386 | hours = value / 60; | ||
387 | minutes = value - (hours * 60); | ||
388 | snprintf(buffer, buffer_size, "%d:%02d", hours, minutes); | ||
389 | return buffer; | ||
390 | } else { | ||
391 | return str(LANG_OFF); | ||
392 | } | ||
393 | } | ||
394 | |||
395 | static void sleep_timer_set(int minutes) | ||
396 | { | ||
397 | if (minutes) | ||
398 | global_settings.sleeptimer_duration = minutes; | ||
399 | set_sleep_timer(minutes * 60); | ||
400 | } | ||
401 | |||
402 | static int sleep_timer(void) | ||
403 | { | ||
404 | int minutes = global_settings.sleeptimer_duration; | ||
405 | if (get_sleep_timer()) | ||
406 | sleep_timer_set(0); | ||
407 | else | ||
408 | set_int(str(LANG_SLEEP_TIMER), "", UNIT_MIN, &minutes, | ||
409 | &sleep_timer_set, 5, 0, 300, sleep_timer_formatter); | ||
410 | return 0; | ||
411 | } | ||
412 | |||
413 | static int seconds_to_min(int secs) | ||
414 | { | ||
415 | return (secs + 10) / 60; /* round up for 50+ seconds */ | ||
416 | } | ||
417 | |||
418 | static char* sleep_timer_getname(int selected_item, void * data, char *buffer) | ||
419 | { | ||
420 | (void)selected_item; | ||
421 | (void)data; | ||
422 | int sec = get_sleep_timer(); | ||
423 | char timer_buf[10]; | ||
424 | /* we have no sprintf, so MAX_PATH is a guess */ | ||
425 | if (sec > 0) | ||
426 | { /* show cancel and countdown if running */ | ||
427 | snprintf(buffer, MAX_PATH, "%s (%s)", str(LANG_SLEEP_TIMER_CANCEL_CURRENT), | ||
428 | sleep_timer_formatter(timer_buf, sizeof(timer_buf), seconds_to_min(sec), NULL)); | ||
429 | } | ||
430 | else | ||
431 | snprintf(buffer, MAX_PATH, "%s", str(LANG_SLEEP_TIMER)); | ||
432 | |||
433 | return buffer; | ||
434 | } | ||
435 | |||
436 | static int sleep_timer_voice(int selected_item, void*data) | ||
437 | { | ||
438 | (void)selected_item; | ||
439 | (void)data; | ||
440 | int seconds = get_sleep_timer(); | ||
441 | if (seconds > 0) | ||
442 | { | ||
443 | long talk_ids[] = { | ||
444 | LANG_SLEEP_TIMER_CANCEL_CURRENT, | ||
445 | VOICE_PAUSE, | ||
446 | seconds_to_min(seconds) | UNIT_MIN << UNIT_SHIFT, | ||
447 | TALK_FINAL_ID | ||
448 | }; | ||
449 | talk_idarray(talk_ids, true); | ||
450 | } | ||
451 | else | ||
452 | talk_id(LANG_SLEEP_TIMER, true); | ||
453 | return 0; | ||
454 | } | ||
455 | |||
456 | #if CONFIG_RTC | 377 | #if CONFIG_RTC |
457 | int time_screen(void* ignored); | 378 | int time_screen(void* ignored); |
458 | MENUITEM_FUNCTION(timedate_item, MENU_FUNC_CHECK_RETVAL, ID2P(LANG_TIME_MENU), | 379 | MENUITEM_FUNCTION(timedate_item, MENU_FUNC_CHECK_RETVAL, ID2P(LANG_TIME_MENU), |
459 | time_screen, NULL, NULL, Icon_Menu_setting ); | 380 | time_screen, NULL, NULL, Icon_Menu_setting ); |
460 | #endif | 381 | #endif |
461 | MENUITEM_FUNCTION_DYNTEXT(sleep_timer_call, 0, sleep_timer, NULL, sleep_timer_getname, | ||
462 | sleep_timer_voice, NULL, NULL, Icon_Menu_setting); | ||
463 | /* make it look like a setting to the user */ | ||
464 | #if CONFIG_RTC == 0 | ||
465 | MENUITEM_SETTING(sleeptimer_on_startup, | ||
466 | &global_settings.sleeptimer_on_startup, NULL); | ||
467 | #endif | ||
468 | 382 | ||
469 | MENUITEM_FUNCTION(show_credits_item, 0, ID2P(LANG_CREDITS), | 383 | MENUITEM_FUNCTION(show_credits_item, 0, ID2P(LANG_CREDITS), |
470 | (menu_function)show_credits, NULL, NULL, Icon_NOICON); | 384 | (menu_function)show_credits, NULL, NULL, Icon_NOICON); |
@@ -511,8 +425,6 @@ MAKE_MENU(main_menu_, ID2P(LANG_SETTINGS), mainmenu_callback, | |||
511 | #endif | 425 | #endif |
512 | #if CONFIG_RTC | 426 | #if CONFIG_RTC |
513 | &timedate_item, | 427 | &timedate_item, |
514 | #else | ||
515 | &sleep_timer_call, &sleeptimer_on_startup, | ||
516 | #endif | 428 | #endif |
517 | &manage_settings, | 429 | &manage_settings, |
518 | ); | 430 | ); |
diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c index bcb182ebca..cce5dd751d 100644 --- a/apps/menus/settings_menu.c +++ b/apps/menus/settings_menu.c | |||
@@ -215,9 +215,6 @@ MAKE_MENU(disk_menu, ID2P(LANG_DISK_MENU), 0, Icon_NOICON, | |||
215 | ); | 215 | ); |
216 | #endif | 216 | #endif |
217 | 217 | ||
218 | /* System menu */ | ||
219 | MENUITEM_SETTING(poweroff, &global_settings.poweroff, NULL); | ||
220 | |||
221 | /* Limits menu */ | 218 | /* Limits menu */ |
222 | MENUITEM_SETTING(max_files_in_dir, &global_settings.max_files_in_dir, NULL); | 219 | MENUITEM_SETTING(max_files_in_dir, &global_settings.max_files_in_dir, NULL); |
223 | MENUITEM_SETTING(max_files_in_playlist, &global_settings.max_files_in_playlist, NULL); | 220 | MENUITEM_SETTING(max_files_in_playlist, &global_settings.max_files_in_playlist, NULL); |
@@ -276,7 +273,6 @@ MENUITEM_SETTING(accessory_supply, &global_settings.accessory_supply, NULL); | |||
276 | #ifdef HAVE_LINEOUT_POWEROFF | 273 | #ifdef HAVE_LINEOUT_POWEROFF |
277 | MENUITEM_SETTING(lineout_onoff, &global_settings.lineout_active, NULL); | 274 | MENUITEM_SETTING(lineout_onoff, &global_settings.lineout_active, NULL); |
278 | #endif | 275 | #endif |
279 | MENUITEM_SETTING(start_screen, &global_settings.start_in_screen, NULL); | ||
280 | #ifdef USB_ENABLE_HID | 276 | #ifdef USB_ENABLE_HID |
281 | MENUITEM_SETTING(usb_hid, &global_settings.usb_hid, NULL); | 277 | MENUITEM_SETTING(usb_hid, &global_settings.usb_hid, NULL); |
282 | MENUITEM_SETTING(usb_keypad_mode, &global_settings.usb_keypad_mode, NULL); | 278 | MENUITEM_SETTING(usb_keypad_mode, &global_settings.usb_keypad_mode, NULL); |
@@ -303,14 +299,12 @@ MENUITEM_SETTING(touchpad_sensitivity, &global_settings.touchpad_sensitivity, NU | |||
303 | 299 | ||
304 | MAKE_MENU(system_menu, ID2P(LANG_SYSTEM), | 300 | MAKE_MENU(system_menu, ID2P(LANG_SYSTEM), |
305 | 0, Icon_System_menu, | 301 | 0, Icon_System_menu, |
306 | &start_screen, | ||
307 | #if (BATTERY_CAPACITY_INC > 0) || (BATTERY_TYPES_COUNT > 1) | 302 | #if (BATTERY_CAPACITY_INC > 0) || (BATTERY_TYPES_COUNT > 1) |
308 | &battery_menu, | 303 | &battery_menu, |
309 | #endif | 304 | #endif |
310 | #if defined(HAVE_DIRCACHE) || defined(HAVE_DISK_STORAGE) | 305 | #if defined(HAVE_DIRCACHE) || defined(HAVE_DISK_STORAGE) |
311 | &disk_menu, | 306 | &disk_menu, |
312 | #endif | 307 | #endif |
313 | &poweroff, | ||
314 | &limits_menu, | 308 | &limits_menu, |
315 | #ifdef HAVE_MORSE_INPUT | 309 | #ifdef HAVE_MORSE_INPUT |
316 | &morse_input, | 310 | &morse_input, |
@@ -354,6 +348,108 @@ MAKE_MENU(system_menu, ID2P(LANG_SYSTEM), | |||
354 | /* SYSTEM MENU */ | 348 | /* SYSTEM MENU */ |
355 | /***********************************/ | 349 | /***********************************/ |
356 | 350 | ||
351 | /***********************************/ | ||
352 | /* STARTUP/SHUTDOWN MENU */ | ||
353 | |||
354 | /* sleep timer option */ | ||
355 | const char* sleep_timer_formatter(char* buffer, size_t buffer_size, | ||
356 | int value, const char* unit) | ||
357 | { | ||
358 | (void) unit; | ||
359 | int minutes, hours; | ||
360 | |||
361 | if (value) { | ||
362 | hours = value / 60; | ||
363 | minutes = value - (hours * 60); | ||
364 | snprintf(buffer, buffer_size, "%d:%02d", hours, minutes); | ||
365 | return buffer; | ||
366 | } else { | ||
367 | return str(LANG_OFF); | ||
368 | } | ||
369 | } | ||
370 | |||
371 | static void sleep_timer_set(int minutes) | ||
372 | { | ||
373 | if (minutes) | ||
374 | global_settings.sleeptimer_duration = minutes; | ||
375 | set_sleep_timer(minutes * 60); | ||
376 | } | ||
377 | |||
378 | static int sleep_timer(void) | ||
379 | { | ||
380 | int minutes = global_settings.sleeptimer_duration; | ||
381 | if (get_sleep_timer()) | ||
382 | sleep_timer_set(0); | ||
383 | else | ||
384 | set_int(str(LANG_SLEEP_TIMER), "", UNIT_MIN, &minutes, | ||
385 | &sleep_timer_set, 5, 0, 300, sleep_timer_formatter); | ||
386 | return 0; | ||
387 | } | ||
388 | |||
389 | static int seconds_to_min(int secs) | ||
390 | { | ||
391 | return (secs + 10) / 60; /* round up for 50+ seconds */ | ||
392 | } | ||
393 | |||
394 | static char* sleep_timer_getname(int selected_item, void * data, char *buffer) | ||
395 | { | ||
396 | (void)selected_item; | ||
397 | (void)data; | ||
398 | int sec = get_sleep_timer(); | ||
399 | char timer_buf[10]; | ||
400 | /* we have no sprintf, so MAX_PATH is a guess */ | ||
401 | if (sec > 0) | ||
402 | { /* show cancel and countdown if running */ | ||
403 | snprintf(buffer, MAX_PATH, "%s (%s)", | ||
404 | str(LANG_SLEEP_TIMER_CANCEL_CURRENT), | ||
405 | sleep_timer_formatter(timer_buf, sizeof(timer_buf), | ||
406 | seconds_to_min(sec), NULL)); | ||
407 | } | ||
408 | else | ||
409 | snprintf(buffer, MAX_PATH, "%s", str(LANG_SLEEP_TIMER)); | ||
410 | |||
411 | return buffer; | ||
412 | } | ||
413 | |||
414 | static int sleep_timer_voice(int selected_item, void*data) | ||
415 | { | ||
416 | (void)selected_item; | ||
417 | (void)data; | ||
418 | int seconds = get_sleep_timer(); | ||
419 | if (seconds > 0) | ||
420 | { | ||
421 | long talk_ids[] = { | ||
422 | LANG_SLEEP_TIMER_CANCEL_CURRENT, | ||
423 | VOICE_PAUSE, | ||
424 | seconds_to_min(seconds) | UNIT_MIN << UNIT_SHIFT, | ||
425 | TALK_FINAL_ID | ||
426 | }; | ||
427 | talk_idarray(talk_ids, true); | ||
428 | } | ||
429 | else | ||
430 | talk_id(LANG_SLEEP_TIMER, true); | ||
431 | return 0; | ||
432 | } | ||
433 | |||
434 | MENUITEM_SETTING(start_screen, &global_settings.start_in_screen, NULL); | ||
435 | MENUITEM_SETTING(poweroff, &global_settings.poweroff, NULL); | ||
436 | MENUITEM_FUNCTION_DYNTEXT(sleep_timer_call, 0, sleep_timer, NULL, | ||
437 | sleep_timer_getname, sleep_timer_voice, NULL, NULL, | ||
438 | Icon_Menu_setting); | ||
439 | /* make it look like a setting to the user */ | ||
440 | MENUITEM_SETTING(sleeptimer_on_startup, | ||
441 | &global_settings.sleeptimer_on_startup, NULL); | ||
442 | |||
443 | MAKE_MENU(startup_shutdown_menu, ID2P(LANG_STARTUP_SHUTDOWN), | ||
444 | 0, Icon_System_menu, | ||
445 | &start_screen, | ||
446 | &poweroff, | ||
447 | &sleep_timer_call, | ||
448 | &sleeptimer_on_startup | ||
449 | ); | ||
450 | |||
451 | /* STARTUP/SHUTDOWN MENU */ | ||
452 | /***********************************/ | ||
357 | 453 | ||
358 | /***********************************/ | 454 | /***********************************/ |
359 | /* BOOKMARK MENU */ | 455 | /* BOOKMARK MENU */ |
@@ -513,6 +609,7 @@ MAKE_MENU(settings_menu_item, ID2P(LANG_GENERAL_SETTINGS), 0, | |||
513 | &tagcache_menu, | 609 | &tagcache_menu, |
514 | #endif | 610 | #endif |
515 | &display_menu, &system_menu, | 611 | &display_menu, &system_menu, |
612 | &startup_shutdown_menu, | ||
516 | &bookmark_settings_menu, | 613 | &bookmark_settings_menu, |
517 | #ifdef HAVE_TAGCACHE | 614 | #ifdef HAVE_TAGCACHE |
518 | #if CONFIG_CODEC == SWCODEC | 615 | #if CONFIG_CODEC == SWCODEC |
diff --git a/apps/menus/time_menu.c b/apps/menus/time_menu.c index a793809800..1eb4bd68cc 100644 --- a/apps/menus/time_menu.c +++ b/apps/menus/time_menu.c | |||
@@ -28,10 +28,8 @@ | |||
28 | #include "lang.h" | 28 | #include "lang.h" |
29 | #include "action.h" | 29 | #include "action.h" |
30 | #include "settings.h" | 30 | #include "settings.h" |
31 | #include "powermgmt.h" | ||
32 | #include "menu.h" | 31 | #include "menu.h" |
33 | #include "misc.h" | 32 | #include "misc.h" |
34 | #include "exported_menus.h" | ||
35 | #include "keyboard.h" | 33 | #include "keyboard.h" |
36 | #include "talk.h" | 34 | #include "talk.h" |
37 | #include "time.h" | 35 | #include "time.h" |
@@ -136,8 +134,6 @@ MENUITEM_FUNCTION(alarm_wake_up_screen, 0, ID2P(LANG_ALARM_WAKEUP_SCREEN), | |||
136 | #endif /* CONFIG_TUNER || defined(HAVE_RECORDING) */ | 134 | #endif /* CONFIG_TUNER || defined(HAVE_RECORDING) */ |
137 | 135 | ||
138 | #endif /* HAVE_RTC_ALARM */ | 136 | #endif /* HAVE_RTC_ALARM */ |
139 | MENUITEM_SETTING(sleeptimer_on_startup, | ||
140 | &global_settings.sleeptimer_on_startup, NULL); | ||
141 | 137 | ||
142 | void talk_timedate(void) | 138 | void talk_timedate(void) |
143 | { | 139 | { |
@@ -237,14 +233,14 @@ static int time_menu_callback(int action, | |||
237 | 233 | ||
238 | 234 | ||
239 | MAKE_MENU(time_menu, ID2P(LANG_TIME_MENU), time_menu_callback, Icon_NOICON, | 235 | MAKE_MENU(time_menu, ID2P(LANG_TIME_MENU), time_menu_callback, Icon_NOICON, |
240 | &time_set, &sleep_timer_call, | 236 | &time_set, |
241 | #ifdef HAVE_RTC_ALARM | 237 | #ifdef HAVE_RTC_ALARM |
242 | &alarm_screen_call, | 238 | &alarm_screen_call, |
243 | #if defined(HAVE_RECORDING) || CONFIG_TUNER | 239 | #if defined(HAVE_RECORDING) || CONFIG_TUNER |
244 | &alarm_wake_up_screen, | 240 | &alarm_wake_up_screen, |
245 | #endif | 241 | #endif |
246 | #endif | 242 | #endif |
247 | &sleeptimer_on_startup, &timeformat); | 243 | &timeformat); |
248 | 244 | ||
249 | int time_screen(void* ignored) | 245 | int time_screen(void* ignored) |
250 | { | 246 | { |
diff --git a/manual/configure_rockbox/main.tex b/manual/configure_rockbox/main.tex index 60054f4912..0eeea4e256 100644 --- a/manual/configure_rockbox/main.tex +++ b/manual/configure_rockbox/main.tex | |||
@@ -14,6 +14,7 @@ | |||
14 | \input{configure_rockbox/database.tex} | 14 | \input{configure_rockbox/database.tex} |
15 | \input{configure_rockbox/display_options.tex} | 15 | \input{configure_rockbox/display_options.tex} |
16 | \input{configure_rockbox/system_options.tex} | 16 | \input{configure_rockbox/system_options.tex} |
17 | \input{configure_rockbox/startup_shutdown_options.tex} | ||
17 | \input{configure_rockbox/bookmarking.tex} | 18 | \input{configure_rockbox/bookmarking.tex} |
18 | \opt{tagcache}{\opt{swcodec}{ | 19 | \opt{tagcache}{\opt{swcodec}{ |
19 | \input{configure_rockbox/autoresume.tex} | 20 | \input{configure_rockbox/autoresume.tex} |
@@ -21,12 +22,6 @@ | |||
21 | \input{configure_rockbox/language.tex} | 22 | \input{configure_rockbox/language.tex} |
22 | \input{configure_rockbox/voice.tex} | 23 | \input{configure_rockbox/voice.tex} |
23 | \input{configure_rockbox/hotkey_settings.tex} | 24 | \input{configure_rockbox/hotkey_settings.tex} |
24 | \nopt{rtc}{ | ||
25 | \section{\label{ref:sleep_timer}Sleep Timer} | ||
26 | \begin{description} | ||
27 | \input{configure_rockbox/sleep_timer.tex} | ||
28 | \end{description} | ||
29 | } | ||
30 | 25 | ||
31 | \chapter{Theme Settings} | 26 | \chapter{Theme Settings} |
32 | \label{ref:configure_rockbox_themes} | 27 | \label{ref:configure_rockbox_themes} |
@@ -38,15 +33,6 @@ | |||
38 | \input{configure_rockbox/recording_settings.tex} | 33 | \input{configure_rockbox/recording_settings.tex} |
39 | } | 34 | } |
40 | 35 | ||
41 | \nopt{rtc}{ | ||
42 | \chapter{Sleep Timer related settings} | ||
43 | \label{ref:SleepTimerRelatedSettings} | ||
44 | These settings control the behaviour of the sleep timer. | ||
45 | \begin{description} | ||
46 | \input{configure_rockbox/sleep_timer.tex} | ||
47 | \end{description} | ||
48 | } | ||
49 | |||
50 | \opt{rtc}{ | 36 | \opt{rtc}{ |
51 | \chapter{Time and Date} | 37 | \chapter{Time and Date} |
52 | \input{configure_rockbox/time_and_date.tex} | 38 | \input{configure_rockbox/time_and_date.tex} |
diff --git a/manual/configure_rockbox/sleep_timer.tex b/manual/configure_rockbox/sleep_timer.tex deleted file mode 100644 index f9cb76a603..0000000000 --- a/manual/configure_rockbox/sleep_timer.tex +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | % $Id:$ % | ||
2 | \item[Sleep Timer:] | ||
3 | The \setting{Sleep Timer} powers off your \dap{} after playing for a given | ||
4 | time. | ||
5 | Shown when the \setting{Sleep Timer} is inactive, it can be set from | ||
6 | \setting{Off} to 5 hours in 5 minute steps. | ||
7 | While the \setting{Sleep Timer} is reset on boot, the value selected is | ||
8 | retained and will be used as the default from then on. | ||
9 | \item[Cancel Sleep Timer (h:mm):] | ||
10 | Shown when the \setting{Sleep Timer} is active, this option disables the | ||
11 | current \setting{Sleep Timer}. | ||
12 | \item[Start Sleep Timer On Boot:] | ||
13 | If set, a \setting{Sleep Timer} will be initiated when the device starts. | ||
diff --git a/manual/configure_rockbox/startup_shutdown_options.tex b/manual/configure_rockbox/startup_shutdown_options.tex new file mode 100644 index 0000000000..2fb4c4881a --- /dev/null +++ b/manual/configure_rockbox/startup_shutdown_options.tex | |||
@@ -0,0 +1,57 @@ | |||
1 | % $Id$ % | ||
2 | |||
3 | \section{\label{ref:StartupShutdownOptions}Startup/Shutdown} | ||
4 | |||
5 | The \setting{Startup/Shutdown} sub menu allows you to configure items which | ||
6 | are run at startup, or initiate a shutdown when conditions are met. | ||
7 | |||
8 | \subsection{Start Screen} | ||
9 | Set the screen that Rockbox will start in. The default is the main menu but | ||
10 | the following options are available: | ||
11 | % almost all items in the main menu with a few exceptions | ||
12 | \begin{description} | ||
13 | \item[Previous Screen.] Start Rockbox in the same screen as when it was | ||
14 | shut off. | ||
15 | \item[Main Menu.] Show the main menu. | ||
16 | \item[Files.] Display the file browser, starting in the root directory of | ||
17 | your \dap. | ||
18 | \item[Database.] Show the default database view. | ||
19 | \item[Resume Playback.] Go to the WPS and and resume playback from where | ||
20 | it was before turning off (if there is a playlist to resume). | ||
21 | \item[Settings.] Display the main settings menu. | ||
22 | \opt{recording}{ | ||
23 | \item[Recording.] Start the \dap{} in the recording screen | ||
24 | (recording does not start automatically). | ||
25 | } | ||
26 | \opt{radio}{ | ||
27 | \item[FM Radio.] Go to the radio screen and start playing. | ||
28 | } | ||
29 | \item[Recent Bookmarks.] Show the list of recent bookmarks as | ||
30 | described in \reference{ref:Bookmarkconfigactual}. Bookmarking needs | ||
31 | to be enabled. | ||
32 | \end{description} | ||
33 | |||
34 | \subsection{\label{ref:IdlePoweroffSetting}Idle Poweroff} | ||
35 | Rockbox can be configured to turn off power after the unit has been idle for | ||
36 | a defined number of minutes. The \dap{} is idle when playback is stopped or | ||
37 | paused. It is not idle while the USB or charger is connected | ||
38 | \opt{recording}{, or while recording}. | ||
39 | Settings are either \setting{Off} or 1 to 10 minutes in 1 minute steps. Then | ||
40 | 15, 30, 45 or 60 minutes are available. | ||
41 | |||
42 | \subsection{Sleep Timer} | ||
43 | The \setting{Sleep Timer} powers off your \dap{} after a given time, whether | ||
44 | playing or not. | ||
45 | \begin{description} | ||
46 | \item[Sleep Timer:] | ||
47 | Shown when the \setting{Sleep Timer} is inactive, it can be set from | ||
48 | \setting{Off} to 5 hours in 5 minute steps. | ||
49 | While the \setting{Sleep Timer} is reset on boot, the value selected is | ||
50 | retained and will be used as the default from then on. | ||
51 | \item[Cancel Sleep Timer (h:mm):] | ||
52 | Shown when the \setting{Sleep Timer} is active, this option disables the | ||
53 | current \setting{Sleep Timer}. | ||
54 | \item[Start Sleep Timer On Boot:] | ||
55 | If set, a \setting{Sleep Timer} will be initiated when the device | ||
56 | starts. | ||
57 | \end{description} | ||
diff --git a/manual/configure_rockbox/system_options.tex b/manual/configure_rockbox/system_options.tex index b61c55a5f2..6db37d9fe7 100644 --- a/manual/configure_rockbox/system_options.tex +++ b/manual/configure_rockbox/system_options.tex | |||
@@ -1,27 +1,5 @@ | |||
1 | % $Id$ % | 1 | % $Id$ % |
2 | \section{\label{ref:SystemOptions}System} | 2 | \section{\label{ref:SystemOptions}System} |
3 | \subsection{Start Screen} | ||
4 | Set the screen that Rockbox will start in. The default is the main menu but | ||
5 | the following options are available: % almost all items in the main menu with a few exceptions | ||
6 | \begin{description} | ||
7 | \item[Previous Screen.] Start Rockbox in the same screen as when it was shut off. | ||
8 | \item[Main Menu.] Show the main menu. | ||
9 | \item[Files.] Display the file browser, starting in the root directory of your \dap. | ||
10 | \item[Database.] Show the default database view. | ||
11 | \item[Resume Playback.] Go to the WPS and and resume playback from where it was | ||
12 | before turning off (if there is a playlist to resume). | ||
13 | \item[Settings.] Display the main settings menu. | ||
14 | \opt{recording}{% | ||
15 | \item[Recording.] Start the \dap{} in the recording screen | ||
16 | (recording does not start automatically). | ||
17 | } | ||
18 | \opt{radio}{% | ||
19 | \item[FM Radio.] Go to the radio screen and start playing. | ||
20 | } | ||
21 | \item[Recent Bookmarks.] Show the list of recent bookmarks as | ||
22 | described in \reference{ref:Bookmarkconfigactual}. Bookmarking needs | ||
23 | to be enabled. | ||
24 | \end{description} | ||
25 | 3 | ||
26 | \nopt{sansa}%will probably be there on Sansas one day - exclude it the simple way without specific option | 4 | \nopt{sansa}%will probably be there on Sansas one day - exclude it the simple way without specific option |
27 | {\nopt{sansaAMS}{ | 5 | {\nopt{sansaAMS}{ |
@@ -112,15 +90,6 @@ | |||
112 | \end{description} | 90 | \end{description} |
113 | } % \opt{dircache,HAVE_DISK_STORAGE} | 91 | } % \opt{dircache,HAVE_DISK_STORAGE} |
114 | 92 | ||
115 | \subsection{Idle Poweroff} | ||
116 | Rockbox can be configured to turn off power after the unit has been idle for a | ||
117 | defined number of minutes. The \dap{} is idle when playback is stopped or | ||
118 | paused. It is not idle while the USB or charger is connected | ||
119 | \opt{recording}{, or while recording}. | ||
120 | Settings are either \setting{Off} or 1 to 10 minutes in 1 minute steps. Then | ||
121 | 15, 30, 45 or 60 minutes are available. | ||
122 | |||
123 | |||
124 | \subsection{Limits} | 93 | \subsection{Limits} |
125 | This sub menu relates to limits in the Rockbox operating system. | 94 | This sub menu relates to limits in the Rockbox operating system. |
126 | \begin{description} | 95 | \begin{description} |
@@ -167,7 +136,8 @@ This sub menu relates to limits in the Rockbox operating system. | |||
167 | is turned off. If the \setting{Car Adapter Mode} is set to \setting{On}, | 136 | is turned off. If the \setting{Car Adapter Mode} is set to \setting{On}, |
168 | Rockbox will pause playback when the external power off condition is | 137 | Rockbox will pause playback when the external power off condition is |
169 | detected. Rockbox will then shutdown the \dap{} after the length of time set | 138 | detected. Rockbox will then shutdown the \dap{} after the length of time set |
170 | in the \setting{Idle Poweroff} setting (see above). | 139 | in the \setting{Idle Poweroff} setting |
140 | (see \reference{ref:IdlePoweroffSetting}). | ||
171 | If power to the DC in jack is turned back on before the \emph{Idle Poweroff} | 141 | If power to the DC in jack is turned back on before the \emph{Idle Poweroff} |
172 | function has shut the \dap{} off, playback will be resumed 5 seconds after | 142 | function has shut the \dap{} off, playback will be resumed 5 seconds after |
173 | the power is applied. This delay is to allow for the time while the car | 143 | the power is applied. This delay is to allow for the time while the car |
diff --git a/manual/configure_rockbox/time_and_date.tex b/manual/configure_rockbox/time_and_date.tex index 9f1223ecfe..fe1624211b 100644 --- a/manual/configure_rockbox/time_and_date.tex +++ b/manual/configure_rockbox/time_and_date.tex | |||
@@ -18,6 +18,5 @@ if voice support is enabled. | |||
18 | This option controls what the \dap{} does when it is woken up by the alarm. | 18 | This option controls what the \dap{} does when it is woken up by the alarm. |
19 | }%\opt{recording,radio} | 19 | }%\opt{recording,radio} |
20 | }%\opt{alarm} | 20 | }%\opt{alarm} |
21 | \input{configure_rockbox/sleep_timer.tex} | ||
22 | \item[Time Format:] Choose 12 or 24 hour clock. | 21 | \item[Time Format:] Choose 12 or 24 hour clock. |
23 | \end{description} | 22 | \end{description} |
diff --git a/manual/main_menu/main.tex b/manual/main_menu/main.tex index 16f0189160..33e64c12fe 100644 --- a/manual/main_menu/main.tex +++ b/manual/main_menu/main.tex | |||
@@ -144,13 +144,6 @@ to recording. The details of this menu are covered in detail in | |||
144 | \reference{ref:Recordingsettings}. | 144 | \reference{ref:Recordingsettings}. |
145 | } | 145 | } |
146 | 146 | ||
147 | \nopt{rtc}{ | ||
148 | \subsection{Sleep Timer related Settings} | ||
149 | The \setting{Sleep Timer} related settings allow you to configure the sleep timer | ||
150 | which powers off your \dap{} after playing for a given time. | ||
151 | The details of this menu are covered in detail in \reference{ref:SleepTimerRelatedSettings}. | ||
152 | } | ||
153 | |||
154 | \subsection{Manage Settings} | 147 | \subsection{Manage Settings} |
155 | The \setting{Manage Settings} option allows the saving and re-loading of user | 148 | The \setting{Manage Settings} option allows the saving and re-loading of user |
156 | configuration settings, browsing the hard drive for alternate firmwares, and finally | 149 | configuration settings, browsing the hard drive for alternate firmwares, and finally |