forked from len0rd/rockbox
Moved the volume_type and battery_type settings in RTC, since they interfered with the scroll speed
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2757 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
c225790e26
commit
18a7c78d60
1 changed files with 7 additions and 7 deletions
|
@ -82,7 +82,7 @@ offset abs
|
|||
0x0d 0x21 <resume settings byte>
|
||||
0x0e 0x22 <shuffle,dirfilter,sort_case,discharge,statusbar,show_hidden,
|
||||
scroll bar>
|
||||
0x0f 0x23 <timeformat, scroll speed. volume type, battery type>
|
||||
0x0f 0x23 <volume type, battery type, timeformat, scroll speed>
|
||||
0x10 0x24 <ff/rewind min step, acceleration rate>
|
||||
0x11 0x25 <AVC, channel config>
|
||||
0x12 0x26 <(int) Resume playlist index, or -1 if no playlist resume>
|
||||
|
@ -296,10 +296,10 @@ int settings_save( void )
|
|||
((global_settings.scrollbar & 1) << 6));
|
||||
|
||||
config_block[0xf] = (unsigned char)
|
||||
(((global_settings.timeformat & 1) << 2) |
|
||||
( global_settings.scroll_speed << 3) |
|
||||
((global_settings.volume_type & 1) << 4) |
|
||||
((global_settings.battery_type & 1) << 5));
|
||||
((global_settings.volume_type & 1) |
|
||||
((global_settings.battery_type & 1) << 1) |
|
||||
((global_settings.timeformat & 1) << 2) |
|
||||
( global_settings.scroll_speed << 3));
|
||||
|
||||
config_block[0x10] = (unsigned char)
|
||||
((global_settings.ff_rewind_min_step & 15) << 4 |
|
||||
|
@ -466,10 +466,10 @@ void settings_load(void)
|
|||
}
|
||||
|
||||
if (config_block[0xf] != 0xFF) {
|
||||
global_settings.volume_type = config_block[0xf] & 1;
|
||||
global_settings.battery_type = (config_block[0xf] >> 1) & 1;
|
||||
global_settings.timeformat = (config_block[0xf] >> 2) & 1;
|
||||
global_settings.scroll_speed = config_block[0xf] >> 3;
|
||||
global_settings.volume_type = (config_block[0xf] >> 4) & 1;
|
||||
global_settings.battery_type = (config_block[0xf] >> 5) & 1;
|
||||
}
|
||||
|
||||
if (config_block[0x10] != 0xFF) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue