forked from len0rd/rockbox
Expanded resume options: off/ask/on
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1797 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
c0ea4a7d1d
commit
f210606c8f
4 changed files with 11 additions and 6 deletions
|
|
@ -393,7 +393,7 @@ void settings_reset(void) {
|
|||
global_settings.loudness = mpeg_sound_default(SOUND_LOUDNESS);
|
||||
global_settings.bass_boost = mpeg_sound_default(SOUND_SUPERBASS);
|
||||
global_settings.avc = mpeg_sound_default(SOUND_AVC);
|
||||
global_settings.resume = true;
|
||||
global_settings.resume = RESUME_ASK;
|
||||
global_settings.contrast = DEFAULT_CONTRAST_SETTING;
|
||||
global_settings.poweroff = DEFAULT_POWEROFF_SETTING;
|
||||
global_settings.backlight = DEFAULT_BACKLIGHT_SETTING;
|
||||
|
|
|
|||
|
|
@ -25,9 +25,9 @@
|
|||
|
||||
/* data structures */
|
||||
|
||||
#define RESUME_NONE 0
|
||||
#define RESUME_SONG 1 /* resume song at startup */
|
||||
#define RESUME_PLAYLIST 2 /* resume playlist at startup */
|
||||
#define RESUME_OFF 0
|
||||
#define RESUME_ASK 1
|
||||
#define RESUME_ON 2
|
||||
|
||||
struct user_settings
|
||||
{
|
||||
|
|
@ -50,7 +50,7 @@ struct user_settings
|
|||
|
||||
/* resume settings */
|
||||
|
||||
bool resume; /* resume option on/off */
|
||||
int resume; /* resume option: 0=off, 1=ask, 2=on */
|
||||
int resume_index; /* index in playlist (-1 for no active resume) */
|
||||
int resume_offset; /* byte offset in mp3 file */
|
||||
int resume_seed; /* random seed for playlist shuffle */
|
||||
|
|
|
|||
|
|
@ -59,7 +59,8 @@ static void sort_case(void)
|
|||
|
||||
static void resume(void)
|
||||
{
|
||||
set_bool( "[Resume]", &global_settings.resume );
|
||||
char* names[] = { "off", "ask", "on " };
|
||||
set_option( "[Resume]", &global_settings.resume, names, 3 );
|
||||
}
|
||||
|
||||
static void backlight_timer(void)
|
||||
|
|
|
|||
|
|
@ -296,6 +296,10 @@ static int showdir(char *path, int start)
|
|||
|
||||
bool ask_resume(void)
|
||||
{
|
||||
/* always resume? */
|
||||
if ( global_settings.resume == RESUME_ON )
|
||||
return true;
|
||||
|
||||
#ifdef HAVE_NEW_CHARCELL_LCD
|
||||
lcd_double_height(false);
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue