diff options
-rw-r--r-- | apps/settings.c | 2 | ||||
-rw-r--r-- | apps/settings.h | 8 | ||||
-rw-r--r-- | apps/settings_menu.c | 3 | ||||
-rw-r--r-- | apps/tree.c | 4 |
4 files changed, 11 insertions, 6 deletions
diff --git a/apps/settings.c b/apps/settings.c index 41d04c2819..00510a9204 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -393,7 +393,7 @@ void settings_reset(void) { | |||
393 | global_settings.loudness = mpeg_sound_default(SOUND_LOUDNESS); | 393 | global_settings.loudness = mpeg_sound_default(SOUND_LOUDNESS); |
394 | global_settings.bass_boost = mpeg_sound_default(SOUND_SUPERBASS); | 394 | global_settings.bass_boost = mpeg_sound_default(SOUND_SUPERBASS); |
395 | global_settings.avc = mpeg_sound_default(SOUND_AVC); | 395 | global_settings.avc = mpeg_sound_default(SOUND_AVC); |
396 | global_settings.resume = true; | 396 | global_settings.resume = RESUME_ASK; |
397 | global_settings.contrast = DEFAULT_CONTRAST_SETTING; | 397 | global_settings.contrast = DEFAULT_CONTRAST_SETTING; |
398 | global_settings.poweroff = DEFAULT_POWEROFF_SETTING; | 398 | global_settings.poweroff = DEFAULT_POWEROFF_SETTING; |
399 | global_settings.backlight = DEFAULT_BACKLIGHT_SETTING; | 399 | global_settings.backlight = DEFAULT_BACKLIGHT_SETTING; |
diff --git a/apps/settings.h b/apps/settings.h index f3f6d84327..16ab41f8d5 100644 --- a/apps/settings.h +++ b/apps/settings.h | |||
@@ -25,9 +25,9 @@ | |||
25 | 25 | ||
26 | /* data structures */ | 26 | /* data structures */ |
27 | 27 | ||
28 | #define RESUME_NONE 0 | 28 | #define RESUME_OFF 0 |
29 | #define RESUME_SONG 1 /* resume song at startup */ | 29 | #define RESUME_ASK 1 |
30 | #define RESUME_PLAYLIST 2 /* resume playlist at startup */ | 30 | #define RESUME_ON 2 |
31 | 31 | ||
32 | struct user_settings | 32 | struct user_settings |
33 | { | 33 | { |
@@ -50,7 +50,7 @@ struct user_settings | |||
50 | 50 | ||
51 | /* resume settings */ | 51 | /* resume settings */ |
52 | 52 | ||
53 | bool resume; /* resume option on/off */ | 53 | int resume; /* resume option: 0=off, 1=ask, 2=on */ |
54 | int resume_index; /* index in playlist (-1 for no active resume) */ | 54 | int resume_index; /* index in playlist (-1 for no active resume) */ |
55 | int resume_offset; /* byte offset in mp3 file */ | 55 | int resume_offset; /* byte offset in mp3 file */ |
56 | int resume_seed; /* random seed for playlist shuffle */ | 56 | int resume_seed; /* random seed for playlist shuffle */ |
diff --git a/apps/settings_menu.c b/apps/settings_menu.c index 08b1782850..334d55dabf 100644 --- a/apps/settings_menu.c +++ b/apps/settings_menu.c | |||
@@ -59,7 +59,8 @@ static void sort_case(void) | |||
59 | 59 | ||
60 | static void resume(void) | 60 | static void resume(void) |
61 | { | 61 | { |
62 | set_bool( "[Resume]", &global_settings.resume ); | 62 | char* names[] = { "off", "ask", "on " }; |
63 | set_option( "[Resume]", &global_settings.resume, names, 3 ); | ||
63 | } | 64 | } |
64 | 65 | ||
65 | static void backlight_timer(void) | 66 | static void backlight_timer(void) |
diff --git a/apps/tree.c b/apps/tree.c index cea092164b..1f1c924ef6 100644 --- a/apps/tree.c +++ b/apps/tree.c | |||
@@ -296,6 +296,10 @@ static int showdir(char *path, int start) | |||
296 | 296 | ||
297 | bool ask_resume(void) | 297 | bool ask_resume(void) |
298 | { | 298 | { |
299 | /* always resume? */ | ||
300 | if ( global_settings.resume == RESUME_ON ) | ||
301 | return true; | ||
302 | |||
299 | #ifdef HAVE_NEW_CHARCELL_LCD | 303 | #ifdef HAVE_NEW_CHARCELL_LCD |
300 | lcd_double_height(false); | 304 | lcd_double_height(false); |
301 | #endif | 305 | #endif |