diff options
Diffstat (limited to 'apps/settings.h')
-rw-r--r-- | apps/settings.h | 32 |
1 files changed, 20 insertions, 12 deletions
diff --git a/apps/settings.h b/apps/settings.h index 3ff3fe6244..8a495a0fee 100644 --- a/apps/settings.h +++ b/apps/settings.h | |||
@@ -128,7 +128,23 @@ extern unsigned char vp_dummy[VIRT_SIZE]; | |||
128 | #if !defined(HAVE_LCD_COLOR) | 128 | #if !defined(HAVE_LCD_COLOR) |
129 | #define HAVE_LCD_CONTRAST | 129 | #define HAVE_LCD_CONTRAST |
130 | #endif | 130 | #endif |
131 | 131 | struct system_status | |
132 | { | ||
133 | int resume_index; /* index in playlist (-1 for no active resume) */ | ||
134 | int resume_first_index; /* index of first track in playlist */ | ||
135 | uint32_t resume_offset; /* byte offset in mp3 file */ | ||
136 | int resume_seed; /* shuffle seed (-1=no resume shuffle 0=sorted | ||
137 | >0=shuffled) */ | ||
138 | int runtime; /* current runtime since last charge */ | ||
139 | int topruntime; /* top known runtime */ | ||
140 | #ifdef HAVE_DIRCACHE | ||
141 | int dircache_size; /* directory cache structure last size, 22 bits */ | ||
142 | #endif | ||
143 | #ifdef CONFIG_TUNER | ||
144 | int last_frequency; /* Last frequency for resuming, in FREQ_STEP units, | ||
145 | relative to MIN_FREQ */ | ||
146 | #endif | ||
147 | }; | ||
132 | struct user_settings | 148 | struct user_settings |
133 | { | 149 | { |
134 | /* audio settings */ | 150 | /* audio settings */ |
@@ -254,11 +270,6 @@ struct user_settings | |||
254 | /* resume settings */ | 270 | /* resume settings */ |
255 | 271 | ||
256 | bool resume; /* resume option: 0=off, 1=on */ | 272 | bool resume; /* resume option: 0=off, 1=on */ |
257 | int resume_index; /* index in playlist (-1 for no active resume) */ | ||
258 | int resume_first_index; /* index of first track in playlist */ | ||
259 | uint32_t resume_offset; /* byte offset in mp3 file */ | ||
260 | int resume_seed; /* shuffle seed (-1=no resume shuffle 0=sorted | ||
261 | >0=shuffled) */ | ||
262 | 273 | ||
263 | #ifdef CONFIG_TUNER | 274 | #ifdef CONFIG_TUNER |
264 | unsigned char fmr_file[MAX_FILENAME+1]; /* last fmr preset */ | 275 | unsigned char fmr_file[MAX_FILENAME+1]; /* last fmr preset */ |
@@ -304,8 +315,6 @@ struct user_settings | |||
304 | bool browse_current; /* 1=goto current song, | 315 | bool browse_current; /* 1=goto current song, |
305 | 0=goto previous location */ | 316 | 0=goto previous location */ |
306 | 317 | ||
307 | int runtime; /* current runtime since last charge */ | ||
308 | int topruntime; /* top known runtime */ | ||
309 | 318 | ||
310 | int scroll_speed; /* long texts scrolling speed: 1-30 */ | 319 | int scroll_speed; /* long texts scrolling speed: 1-30 */ |
311 | int bidir_limit; /* bidir scroll length limit */ | 320 | int bidir_limit; /* bidir scroll length limit */ |
@@ -339,8 +348,6 @@ struct user_settings | |||
339 | bool fm_force_mono; /* Forces Mono mode if true */ | 348 | bool fm_force_mono; /* Forces Mono mode if true */ |
340 | bool fm_full_range; /* Enables full 10MHz-160MHz range if true, else | 349 | bool fm_full_range; /* Enables full 10MHz-160MHz range if true, else |
341 | only 88MHz-108MHz */ | 350 | only 88MHz-108MHz */ |
342 | int last_frequency; /* Last frequency for resuming, in FREQ_STEP units, | ||
343 | relative to MIN_FREQ */ | ||
344 | #endif | 351 | #endif |
345 | 352 | ||
346 | int max_files_in_dir; /* Max entries in directory (file browser) */ | 353 | int max_files_in_dir; /* Max entries in directory (file browser) */ |
@@ -406,7 +413,6 @@ struct user_settings | |||
406 | #endif | 413 | #endif |
407 | #ifdef HAVE_DIRCACHE | 414 | #ifdef HAVE_DIRCACHE |
408 | bool dircache; /* enable directory cache */ | 415 | bool dircache; /* enable directory cache */ |
409 | int dircache_size; /* directory cache structure last size, 22 bits */ | ||
410 | #endif | 416 | #endif |
411 | #ifdef HAVE_TAGCACHE | 417 | #ifdef HAVE_TAGCACHE |
412 | #ifdef HAVE_TC_RAMCACHE | 418 | #ifdef HAVE_TC_RAMCACHE |
@@ -548,7 +554,7 @@ struct opt_items { | |||
548 | }; | 554 | }; |
549 | 555 | ||
550 | /* prototypes */ | 556 | /* prototypes */ |
551 | 557 | void status_save( void ); | |
552 | int settings_save(void); | 558 | int settings_save(void); |
553 | void settings_load(int which); | 559 | void settings_load(int which); |
554 | void settings_reset(void); | 560 | void settings_reset(void); |
@@ -581,6 +587,8 @@ void settings_apply_trigger(void); | |||
581 | 587 | ||
582 | /* global settings */ | 588 | /* global settings */ |
583 | extern struct user_settings global_settings; | 589 | extern struct user_settings global_settings; |
590 | /* global status */ | ||
591 | extern struct system_status global_status; | ||
584 | /* name of directory where configuration, fonts and other data | 592 | /* name of directory where configuration, fonts and other data |
585 | * files are stored */ | 593 | * files are stored */ |
586 | extern long lasttime; | 594 | extern long lasttime; |