diff options
| author | Linus Nielsen Feltzing <linus@haxx.se> | 2002-10-28 10:37:10 +0000 |
|---|---|---|
| committer | Linus Nielsen Feltzing <linus@haxx.se> | 2002-10-28 10:37:10 +0000 |
| commit | 18a7c78d60b0f0bc9da23a029c173aab80357e2d (patch) | |
| tree | 83b2194209b03b4c67340183cec4a394bd5b0501 | |
| parent | c225790e26d907593565b316dd946b6d2054f7a3 (diff) | |
| download | rockbox-18a7c78d60b0f0bc9da23a029c173aab80357e2d.zip rockbox-18a7c78d60b0f0bc9da23a029c173aab80357e2d.tar.gz rockbox-18a7c78d60b0f0bc9da23a029c173aab80357e2d.tar.bz2 rockbox-18a7c78d60b0f0bc9da23a029c173aab80357e2d.tar.xz | |
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
| -rw-r--r-- | apps/settings.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/apps/settings.c b/apps/settings.c index b0da64f..cee7a28 100644 --- a/apps/settings.c +++ b/apps/settings.c @@ -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) { |