diff options
| author | Robert Hak <adiamas@rockbox.org> | 2002-10-16 07:25:33 +0000 |
|---|---|---|
| committer | Robert Hak <adiamas@rockbox.org> | 2002-10-16 07:25:33 +0000 |
| commit | c88751ffa58ec8a8cff2aa50225ec9baab705ab8 (patch) | |
| tree | 3c59b57a730fad6ecd438ec4c88ef62d0fe6f383 | |
| parent | a3e1648856b229138ec00d788c1c4b05cfef5fa2 (diff) | |
| download | rockbox-c88751ffa58ec8a8cff2aa50225ec9baab705ab8.zip rockbox-c88751ffa58ec8a8cff2aa50225ec9baab705ab8.tar.gz rockbox-c88751ffa58ec8a8cff2aa50225ec9baab705ab8.tar.bz2 rockbox-c88751ffa58ec8a8cff2aa50225ec9baab705ab8.tar.xz | |
resume ask once option added
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2672 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | apps/lang/english.lang | 11 | ||||
| -rw-r--r-- | apps/settings.h | 3 | ||||
| -rw-r--r-- | apps/settings_menu.c | 3 | ||||
| -rw-r--r-- | apps/tree.c | 6 |
4 files changed, 20 insertions, 3 deletions
diff --git a/apps/lang/english.lang b/apps/lang/english.lang index c22c4ba..baadc2e 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang @@ -237,7 +237,9 @@ eng: "Backlight" new: id: LANG_BACKLIGHT_ON -desc: in settings_menu, +desc: in settings_menu +eng: "" +new: id: LANG_SCROLL desc: in settings_menu @@ -1020,3 +1022,10 @@ id: LANG_OSCILLOGRAPH desc: the name of the oscillograph demo in the demo menu eng: "Oscillograph" new: + +id: LANG_RESUME_SETTING_ASK_ONCE +desc: in settings_menu +eng: "Ask Once" +new: + + diff --git a/apps/settings.h b/apps/settings.h index 39a7b7c..8644b56 100644 --- a/apps/settings.h +++ b/apps/settings.h @@ -31,7 +31,8 @@ #define RESUME_OFF 0 #define RESUME_ASK 1 -#define RESUME_ON 2 +#define RESUME_ASK_ONCE 2 +#define RESUME_ON 3 #define FF_REWIND_1000 0 #define FF_REWIND_2000 1 diff --git a/apps/settings_menu.c b/apps/settings_menu.c index 6fcd687..0aa8f3e 100644 --- a/apps/settings_menu.c +++ b/apps/settings_menu.c @@ -161,10 +161,11 @@ static bool resume(void) { char* names[] = { str(LANG_SET_BOOL_NO), str(LANG_RESUME_SETTING_ASK), + str(LANG_RESUME_SETTING_ASK_ONCE), str(LANG_SET_BOOL_YES) }; return set_option( str(LANG_RESUME), &global_settings.resume, - names, 3, NULL ); + names, 4, NULL ); } static bool backlight_on_when_charging(void) diff --git a/apps/tree.c b/apps/tree.c index 1b19b04..2b97ac6 100644 --- a/apps/tree.c +++ b/apps/tree.c @@ -454,6 +454,11 @@ bool ask_resume(void) if ( global_settings.resume == RESUME_ON ) return true; + if ( global_settings.resume == RESUME_ASK_ONCE) { + global_settings.resume_index = -1; + settings_save(); + } + lcd_clear_display(); lcd_puts(0,0,str(LANG_RESUME_ASK)); #ifdef HAVE_LCD_CHARCELLS @@ -463,6 +468,7 @@ bool ask_resume(void) lcd_puts(0,2,str(LANG_RESUME_CANCEL_RECORDER)); #endif lcd_update(); + if (button_get(true) == BUTTON_PLAY) return true; return false; |