summaryrefslogtreecommitdiff
path: root/apps/settings.c
diff options
context:
space:
mode:
Diffstat (limited to 'apps/settings.c')
-rw-r--r--apps/settings.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/apps/settings.c b/apps/settings.c
index bb64886efd..10ebcbb63e 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -65,12 +65,11 @@ offset abs
650x0d 0x21 <resume settings byte> 650x0d 0x21 <resume settings byte>
660x0e 0x22 <shuffle,mp3filter,sort_case,discharge,statusbar,show_hidden> 660x0e 0x22 <shuffle,mp3filter,sort_case,discharge,statusbar,show_hidden>
670x0f 0x23 <scroll speed & WPS display byte> 670x0f 0x23 <scroll speed & WPS display byte>
680x10 0x24 <ff/rewind step size> 680x10 0x24 <ff/rewind accleration rate>
690x11 0x25 <AVC byte> 690x11 0x25 <AVC byte>
700x12 0x26 <(int) Resume playlist index, or -1 if no playlist resume> 700x12 0x26 <(int) Resume playlist index, or -1 if no playlist resume>
710x16 0x2a <(int) Byte offset into resume file> 710x16 0x2a <(int) Byte offset into resume file>
720x1a 0x2e <time until disk spindown> 720x1a 0x2e <time until disk spindown>
730x1b 0x2f <ff/rewind acceleration rate>
74 73
75 <all unused space filled with 0xff> 74 <all unused space filled with 0xff>
76 75
@@ -268,10 +267,9 @@ int settings_save( void )
268 ((global_settings.scroll_speed << 3) | 267 ((global_settings.scroll_speed << 3) |
269 (global_settings.wps_display & 7)); 268 (global_settings.wps_display & 7));
270 269
271 config_block[0x10] = (unsigned char)global_settings.ff_rewind; 270 config_block[0x10] = (unsigned char)global_settings.ff_rewind_accel;
272 config_block[0x11] = (unsigned char)global_settings.avc; 271 config_block[0x11] = (unsigned char)global_settings.avc;
273 config_block[0x1a] = (unsigned char)global_settings.disk_spindown; 272 config_block[0x1a] = (unsigned char)global_settings.disk_spindown;
274 config_block[0x1b] = (unsigned char)global_settings.ff_rewind_accel;
275 273
276 memcpy(&config_block[0x12], &global_settings.resume_index, 4); 274 memcpy(&config_block[0x12], &global_settings.resume_index, 4);
277 memcpy(&config_block[0x16], &global_settings.resume_offset, 4); 275 memcpy(&config_block[0x16], &global_settings.resume_offset, 4);
@@ -362,7 +360,7 @@ void settings_load(void)
362 global_settings.wps_display = c; 360 global_settings.wps_display = c;
363 361
364 if (config_block[0x10] != 0xFF) 362 if (config_block[0x10] != 0xFF)
365 global_settings.ff_rewind = config_block[0x10]; 363 global_settings.ff_rewind_accel = config_block[0x10];
366 364
367 if (config_block[0x11] != 0xFF) 365 if (config_block[0x11] != 0xFF)
368 global_settings.avc = config_block[0x11]; 366 global_settings.avc = config_block[0x11];
@@ -376,9 +374,6 @@ void settings_load(void)
376 if (config_block[0x1a] != 0xFF) 374 if (config_block[0x1a] != 0xFF)
377 global_settings.disk_spindown = config_block[0x1a]; 375 global_settings.disk_spindown = config_block[0x1a];
378 376
379 if (config_block[0x1b] != 0xFF)
380 global_settings.ff_rewind_accel = config_block[0x1b];
381
382 memcpy(&global_settings.resume_seed, &config_block[0xF8], 4); 377 memcpy(&global_settings.resume_seed, &config_block[0xF8], 4);
383 378
384 if (config_block[0x24] != 0xFF) 379 if (config_block[0x24] != 0xFF)
@@ -424,7 +419,6 @@ void settings_reset(void) {
424 global_settings.total_uptime = 0; 419 global_settings.total_uptime = 0;
425 global_settings.scroll_speed = 8; 420 global_settings.scroll_speed = 8;
426 global_settings.show_hidden_files = false; 421 global_settings.show_hidden_files = false;
427 global_settings.ff_rewind = DEFAULT_FF_REWIND_SETTING;
428 global_settings.ff_rewind_accel = DEFAULT_FF_REWIND_ACCEL_SETTING; 422 global_settings.ff_rewind_accel = DEFAULT_FF_REWIND_ACCEL_SETTING;
429 global_settings.resume_index = -1; 423 global_settings.resume_index = -1;
430 global_settings.resume_offset = -1; 424 global_settings.resume_offset = -1;