diff options
author | Linus Nielsen Feltzing <linus@haxx.se> | 2007-02-16 10:20:30 +0000 |
---|---|---|
committer | Linus Nielsen Feltzing <linus@haxx.se> | 2007-02-16 10:20:30 +0000 |
commit | 750fa4a1a0eb3671b7bd73ba3cb7629b437f8fe5 (patch) | |
tree | f0dab2559775848b633a863a29f5b3fc3b599e75 | |
parent | 12a1e108a8d9fde2c0e2d52aab496b8dec0f26a0 (diff) | |
download | rockbox-750fa4a1a0eb3671b7bd73ba3cb7629b437f8fe5.tar.gz rockbox-750fa4a1a0eb3671b7bd73ba3cb7629b437f8fe5.zip |
Minor code policing and cleanup
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12334 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/settings.c | 93 |
1 files changed, 46 insertions, 47 deletions
diff --git a/apps/settings.c b/apps/settings.c index f424b44d43..1da552816f 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -409,36 +409,36 @@ bool cfg_int_to_string(int setting_id, int val, char* buf, int buf_len) | |||
409 | } | 409 | } |
410 | static bool is_changed(int setting_id) | 410 | static bool is_changed(int setting_id) |
411 | { | 411 | { |
412 | const struct settings_list *setting = &settings[setting_id]; | 412 | const struct settings_list *setting = &settings[setting_id]; |
413 | switch (setting->flags&F_T_MASK) | 413 | switch (setting->flags&F_T_MASK) |
414 | { | 414 | { |
415 | case F_T_INT: | 415 | case F_T_INT: |
416 | case F_T_UINT: | 416 | case F_T_UINT: |
417 | if (setting->flags&F_DEF_ISFUNC) | 417 | if (setting->flags&F_DEF_ISFUNC) |
418 | { | 418 | { |
419 | if (*(int*)setting->setting == setting->default_val.func()) | 419 | if (*(int*)setting->setting == setting->default_val.func()) |
420 | return false; | 420 | return false; |
421 | } | 421 | } |
422 | else if (setting->flags&F_T_SOUND) | 422 | else if (setting->flags&F_T_SOUND) |
423 | { | 423 | { |
424 | if (*(int*)setting->setting == | 424 | if (*(int*)setting->setting == |
425 | sound_default(setting->sound_setting->setting)) | 425 | sound_default(setting->sound_setting->setting)) |
426 | return false; | 426 | return false; |
427 | } | 427 | } |
428 | else if (*(int*)setting->setting == setting->default_val.int_) | 428 | else if (*(int*)setting->setting == setting->default_val.int_) |
429 | return false; | 429 | return false; |
430 | break; | 430 | break; |
431 | case F_T_BOOL: | 431 | case F_T_BOOL: |
432 | if (*(bool*)setting->setting == setting->default_val.bool_) | 432 | if (*(bool*)setting->setting == setting->default_val.bool_) |
433 | return false; | 433 | return false; |
434 | break; | 434 | break; |
435 | case F_T_CHARPTR: | 435 | case F_T_CHARPTR: |
436 | case F_T_UCHARPTR: | 436 | case F_T_UCHARPTR: |
437 | if (!strcmp((char*)setting->setting, setting->default_val.charptr)) | 437 | if (!strcmp((char*)setting->setting, setting->default_val.charptr)) |
438 | return false; | 438 | return false; |
439 | break; | 439 | break; |
440 | } | 440 | } |
441 | return true; | 441 | return true; |
442 | } | 442 | } |
443 | 443 | ||
444 | static bool settings_write_config(char* filename, int options) | 444 | static bool settings_write_config(char* filename, int options) |
@@ -456,14 +456,14 @@ static bool settings_write_config(char* filename, int options) | |||
456 | if (settings[i].cfg_name == NULL) | 456 | if (settings[i].cfg_name == NULL) |
457 | continue; | 457 | continue; |
458 | value[0] = '\0'; | 458 | value[0] = '\0'; |
459 | 459 | ||
460 | if ((options == SETTINGS_SAVE_CHANGED) && | 460 | if ((options == SETTINGS_SAVE_CHANGED) && |
461 | !is_changed(i)) | 461 | !is_changed(i)) |
462 | continue; | 462 | continue; |
463 | else if ((options == SETTINGS_SAVE_THEME) && | 463 | else if ((options == SETTINGS_SAVE_THEME) && |
464 | ((settings[i].flags&F_THEMESETTING) == 0)) | 464 | ((settings[i].flags&F_THEMESETTING) == 0)) |
465 | continue; | 465 | continue; |
466 | 466 | ||
467 | switch (settings[i].flags&F_T_MASK) | 467 | switch (settings[i].flags&F_T_MASK) |
468 | { | 468 | { |
469 | case F_T_INT: | 469 | case F_T_INT: |
@@ -603,7 +603,8 @@ bool settings_save_config(int options) | |||
603 | 603 | ||
604 | if (settings_write_config(filename, options)) | 604 | if (settings_write_config(filename, options)) |
605 | gui_syncsplash(HZ, true, str(LANG_SETTINGS_SAVED)); | 605 | gui_syncsplash(HZ, true, str(LANG_SETTINGS_SAVED)); |
606 | else gui_syncsplash(HZ, true, str(LANG_FAILED)); | 606 | else |
607 | gui_syncsplash(HZ, true, str(LANG_FAILED)); | ||
607 | return true; | 608 | return true; |
608 | } | 609 | } |
609 | 610 | ||
@@ -774,8 +775,7 @@ void settings_apply(void) | |||
774 | #endif | 775 | #endif |
775 | 776 | ||
776 | #if defined(HAVE_REMOTE_LCD) && (NB_SCREENS > 1) | 777 | #if defined(HAVE_REMOTE_LCD) && (NB_SCREENS > 1) |
777 | if ( global_settings.rwps_file[0] && | 778 | if ( global_settings.rwps_file[0]) { |
778 | global_settings.rwps_file[0] != 0xff ) { | ||
779 | snprintf(buf, sizeof buf, WPS_DIR "/%s.rwps", | 779 | snprintf(buf, sizeof buf, WPS_DIR "/%s.rwps", |
780 | global_settings.rwps_file); | 780 | global_settings.rwps_file); |
781 | wps_data_load(gui_wps[1].data, buf, true); | 781 | wps_data_load(gui_wps[1].data, buf, true); |
@@ -785,8 +785,7 @@ void settings_apply(void) | |||
785 | #endif | 785 | #endif |
786 | 786 | ||
787 | #ifdef HAVE_LCD_BITMAP | 787 | #ifdef HAVE_LCD_BITMAP |
788 | if ( global_settings.font_file[0] && | 788 | if ( global_settings.font_file[0]) { |
789 | global_settings.font_file[0] != 0xff ) { | ||
790 | snprintf(buf, sizeof buf, FONT_DIR "/%s.fnt", | 789 | snprintf(buf, sizeof buf, FONT_DIR "/%s.fnt", |
791 | global_settings.font_file); | 790 | global_settings.font_file); |
792 | font_load(buf); | 791 | font_load(buf); |
@@ -794,8 +793,7 @@ void settings_apply(void) | |||
794 | else | 793 | else |
795 | font_reset(); | 794 | font_reset(); |
796 | 795 | ||
797 | if ( global_settings.kbd_file[0] && | 796 | if ( global_settings.kbd_file[0]) { |
798 | global_settings.kbd_file[0] != 0xff ) { | ||
799 | snprintf(buf, sizeof buf, ROCKBOX_DIR "/%s.kbd", | 797 | snprintf(buf, sizeof buf, ROCKBOX_DIR "/%s.kbd", |
800 | global_settings.kbd_file); | 798 | global_settings.kbd_file); |
801 | load_kbd(buf); | 799 | load_kbd(buf); |
@@ -813,8 +811,7 @@ void settings_apply(void) | |||
813 | lcd_bidir_scroll(global_settings.bidir_limit); | 811 | lcd_bidir_scroll(global_settings.bidir_limit); |
814 | lcd_scroll_delay(global_settings.scroll_delay * (HZ/10)); | 812 | lcd_scroll_delay(global_settings.scroll_delay * (HZ/10)); |
815 | 813 | ||
816 | if ( global_settings.lang_file[0] && | 814 | if ( global_settings.lang_file[0]) { |
817 | global_settings.lang_file[0] != 0xff ) { | ||
818 | snprintf(buf, sizeof buf, LANG_DIR "/%s.lng", | 815 | snprintf(buf, sizeof buf, LANG_DIR "/%s.lng", |
819 | global_settings.lang_file); | 816 | global_settings.lang_file); |
820 | lang_load(buf); | 817 | lang_load(buf); |
@@ -936,7 +933,9 @@ void talk_setting(void *global_settings_variable) | |||
936 | if (setting->lang_id) | 933 | if (setting->lang_id) |
937 | talk_id(setting->lang_id,false); | 934 | talk_id(setting->lang_id,false); |
938 | } | 935 | } |
936 | |||
939 | static int selected_setting; /* Used by the callback */ | 937 | static int selected_setting; /* Used by the callback */ |
938 | |||
940 | static void dec_sound_formatter(char *buffer, int buffer_size, | 939 | static void dec_sound_formatter(char *buffer, int buffer_size, |
941 | int val, const char *unit) | 940 | int val, const char *unit) |
942 | { | 941 | { |