diff options
author | Markus Braun <markus.braun@krawel.de> | 2002-10-14 12:50:20 +0000 |
---|---|---|
committer | Markus Braun <markus.braun@krawel.de> | 2002-10-14 12:50:20 +0000 |
commit | 22a7a2d7d34698db41bc08f76f794ca8efb3de1e (patch) | |
tree | f0d5e998a789786c873ee4b8a7054ab314bd90cb /apps/settings.c | |
parent | c7e0bea57ad383593ebf8c106a4cccf8bcd46ba1 (diff) | |
download | rockbox-22a7a2d7d34698db41bc08f76f794ca8efb3de1e.tar.gz rockbox-22a7a2d7d34698db41bc08f76f794ca8efb3de1e.zip |
Added 12 hour clock to status bar on recorders.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2621 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/settings.c')
-rw-r--r-- | apps/settings.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/apps/settings.c b/apps/settings.c index e9e171250f..3dafebc368 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -295,7 +295,9 @@ int settings_save( void ) | |||
295 | ((global_settings.dirfilter & 2) << 4) | | 295 | ((global_settings.dirfilter & 2) << 4) | |
296 | ((global_settings.scrollbar & 1) << 6)); | 296 | ((global_settings.scrollbar & 1) << 6)); |
297 | 297 | ||
298 | config_block[0xf] = (unsigned char)(global_settings.scroll_speed << 3); | 298 | config_block[0xf] = (unsigned char) |
299 | ((global_settings.timeformat & 1) << 2) | | ||
300 | ((global_settings.scroll_speed << 3)); | ||
299 | 301 | ||
300 | config_block[0x10] = (unsigned char) | 302 | config_block[0x10] = (unsigned char) |
301 | ((global_settings.ff_rewind_min_step & 15) << 4 | | 303 | ((global_settings.ff_rewind_min_step & 15) << 4 | |
@@ -410,7 +412,6 @@ void settings_apply(void) | |||
410 | */ | 412 | */ |
411 | void settings_load(void) | 413 | void settings_load(void) |
412 | { | 414 | { |
413 | unsigned char c; | ||
414 | 415 | ||
415 | DEBUGF( "reload_all_settings()\n" ); | 416 | DEBUGF( "reload_all_settings()\n" ); |
416 | 417 | ||
@@ -462,9 +463,10 @@ void settings_load(void) | |||
462 | an uninitialized entry */ | 463 | an uninitialized entry */ |
463 | } | 464 | } |
464 | 465 | ||
465 | c = config_block[0xf] >> 3; | 466 | if (config_block[0xf] != 0xFF) { |
466 | if (c != 31) | 467 | global_settings.timeformat = (config_block[0xf] >> 2) & 1; |
467 | global_settings.scroll_speed = c; | 468 | global_settings.scroll_speed = config_block[0xf] >> 3; |
469 | } | ||
468 | 470 | ||
469 | if (config_block[0x10] != 0xFF) { | 471 | if (config_block[0x10] != 0xFF) { |
470 | global_settings.ff_rewind_min_step = (config_block[0x10] >> 4) & 15; | 472 | global_settings.ff_rewind_min_step = (config_block[0x10] >> 4) & 15; |
@@ -667,6 +669,7 @@ void settings_reset(void) { | |||
667 | global_settings.playlist_shuffle = false; | 669 | global_settings.playlist_shuffle = false; |
668 | global_settings.discharge = 0; | 670 | global_settings.discharge = 0; |
669 | global_settings.total_uptime = 0; | 671 | global_settings.total_uptime = 0; |
672 | global_settings.timeformat = 0; | ||
670 | global_settings.scroll_speed = 8; | 673 | global_settings.scroll_speed = 8; |
671 | global_settings.ff_rewind_min_step = DEFAULT_FF_REWIND_MIN_STEP; | 674 | global_settings.ff_rewind_min_step = DEFAULT_FF_REWIND_MIN_STEP; |
672 | global_settings.ff_rewind_accel = DEFAULT_FF_REWIND_ACCEL_SETTING; | 675 | global_settings.ff_rewind_accel = DEFAULT_FF_REWIND_ACCEL_SETTING; |