summaryrefslogtreecommitdiff
path: root/apps/settings.c
diff options
context:
space:
mode:
authorEric Linenberg <elinenbe@umich.edu>2002-08-28 19:34:07 +0000
committerEric Linenberg <elinenbe@umich.edu>2002-08-28 19:34:07 +0000
commit65240761fbcee1274836b74295c10247ca3d8ceb (patch)
tree34e5d0021c17042f151e75acd99761ed79ede73a /apps/settings.c
parent7d808a83e41156c99081d8df54fd6c2067bec8d0 (diff)
downloadrockbox-65240761fbcee1274836b74295c10247ca3d8ceb.tar.gz
rockbox-65240761fbcee1274836b74295c10247ca3d8ceb.zip
Nate Nystrom's ff/rw acceleration patch
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2044 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/settings.c')
-rw-r--r--apps/settings.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/apps/settings.c b/apps/settings.c
index ef74a5bb92..bb64886efd 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -65,10 +65,12 @@ 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 <playlist options byte> 680x10 0x24 <ff/rewind step size>
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>
730x1b 0x2f <ff/rewind acceleration rate>
72 74
73 <all unused space filled with 0xff> 75 <all unused space filled with 0xff>
74 76
@@ -269,6 +271,7 @@ int settings_save( void )
269 config_block[0x10] = (unsigned char)global_settings.ff_rewind; 271 config_block[0x10] = (unsigned char)global_settings.ff_rewind;
270 config_block[0x11] = (unsigned char)global_settings.avc; 272 config_block[0x11] = (unsigned char)global_settings.avc;
271 config_block[0x1a] = (unsigned char)global_settings.disk_spindown; 273 config_block[0x1a] = (unsigned char)global_settings.disk_spindown;
274 config_block[0x1b] = (unsigned char)global_settings.ff_rewind_accel;
272 275
273 memcpy(&config_block[0x12], &global_settings.resume_index, 4); 276 memcpy(&config_block[0x12], &global_settings.resume_index, 4);
274 memcpy(&config_block[0x16], &global_settings.resume_offset, 4); 277 memcpy(&config_block[0x16], &global_settings.resume_offset, 4);
@@ -373,6 +376,9 @@ void settings_load(void)
373 if (config_block[0x1a] != 0xFF) 376 if (config_block[0x1a] != 0xFF)
374 global_settings.disk_spindown = config_block[0x1a]; 377 global_settings.disk_spindown = config_block[0x1a];
375 378
379 if (config_block[0x1b] != 0xFF)
380 global_settings.ff_rewind_accel = config_block[0x1b];
381
376 memcpy(&global_settings.resume_seed, &config_block[0xF8], 4); 382 memcpy(&global_settings.resume_seed, &config_block[0xF8], 4);
377 383
378 if (config_block[0x24] != 0xFF) 384 if (config_block[0x24] != 0xFF)
@@ -419,6 +425,7 @@ void settings_reset(void) {
419 global_settings.scroll_speed = 8; 425 global_settings.scroll_speed = 8;
420 global_settings.show_hidden_files = false; 426 global_settings.show_hidden_files = false;
421 global_settings.ff_rewind = DEFAULT_FF_REWIND_SETTING; 427 global_settings.ff_rewind = DEFAULT_FF_REWIND_SETTING;
428 global_settings.ff_rewind_accel = DEFAULT_FF_REWIND_ACCEL_SETTING;
422 global_settings.resume_index = -1; 429 global_settings.resume_index = -1;
423 global_settings.resume_offset = -1; 430 global_settings.resume_offset = -1;
424 global_settings.disk_spindown = 5; 431 global_settings.disk_spindown = 5;