diff options
author | Björn Stenberg <bjorn@haxx.se> | 2002-10-09 23:13:25 +0000 |
---|---|---|
committer | Björn Stenberg <bjorn@haxx.se> | 2002-10-09 23:13:25 +0000 |
commit | 227253cfe4ab16c9758473194271ed48bf2e28b1 (patch) | |
tree | 8ebd8cbaa4cc11e08888277148633c480f9329ab | |
parent | d4b884e7e0568d33e4f1bfad51886f6a87373d53 (diff) | |
download | rockbox-227253cfe4ab16c9758473194271ed48bf2e28b1.tar.gz rockbox-227253cfe4ab16c9758473194271ed48bf2e28b1.zip |
'Reset settings' now also resets wps, font and language (although you have to reboot to get back to the old language).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2552 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/settings.c | 9 | ||||
-rw-r--r-- | apps/wps-display.c | 6 | ||||
-rw-r--r-- | apps/wps-display.h | 1 | ||||
-rw-r--r-- | firmware/font.c | 7 | ||||
-rw-r--r-- | firmware/font.h | 1 |
5 files changed, 23 insertions, 1 deletions
diff --git a/apps/settings.c b/apps/settings.c index eb4409c805..0a3cd67d67 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -383,6 +383,9 @@ void settings_apply(void) | |||
383 | global_settings.wps_file); | 383 | global_settings.wps_file); |
384 | wps_load(buf, false); | 384 | wps_load(buf, false); |
385 | } | 385 | } |
386 | else | ||
387 | wps_reset(); | ||
388 | |||
386 | #ifdef HAVE_LCD_BITMAP | 389 | #ifdef HAVE_LCD_BITMAP |
387 | if ( global_settings.font_file[0] && | 390 | if ( global_settings.font_file[0] && |
388 | global_settings.font_file[0] != 0xff ) { | 391 | global_settings.font_file[0] != 0xff ) { |
@@ -390,7 +393,10 @@ void settings_apply(void) | |||
390 | global_settings.font_file); | 393 | global_settings.font_file); |
391 | font_load(buf); | 394 | font_load(buf); |
392 | } | 395 | } |
396 | else | ||
397 | font_reset(); | ||
393 | #endif | 398 | #endif |
399 | |||
394 | if ( global_settings.lang_file[0] && | 400 | if ( global_settings.lang_file[0] && |
395 | global_settings.lang_file[0] != 0xff ) { | 401 | global_settings.lang_file[0] != 0xff ) { |
396 | snprintf(buf, sizeof buf, ROCKBOX_DIR "/%s.lng", | 402 | snprintf(buf, sizeof buf, ROCKBOX_DIR "/%s.lng", |
@@ -673,6 +679,9 @@ void settings_reset(void) { | |||
673 | global_settings.peak_meter_release = 8; | 679 | global_settings.peak_meter_release = 8; |
674 | global_settings.peak_meter_hold = 1; | 680 | global_settings.peak_meter_hold = 1; |
675 | global_settings.peak_meter_clip_hold = 16; | 681 | global_settings.peak_meter_clip_hold = 16; |
682 | global_settings.wps_file[0] = 0; | ||
683 | global_settings.font_file[0] = 0; | ||
684 | global_settings.lang_file[0] = 0; | ||
676 | } | 685 | } |
677 | 686 | ||
678 | 687 | ||
diff --git a/apps/wps-display.c b/apps/wps-display.c index 3dda50842f..0e31be3ffa 100644 --- a/apps/wps-display.c +++ b/apps/wps-display.c | |||
@@ -111,6 +111,12 @@ static void wps_format(char* fmt) | |||
111 | } | 111 | } |
112 | } | 112 | } |
113 | 113 | ||
114 | void wps_reset(void) | ||
115 | { | ||
116 | wps_loaded = false; | ||
117 | memset(&format_buffer, 0, sizeof format_buffer); | ||
118 | } | ||
119 | |||
114 | bool wps_load(char* file, bool display) | 120 | bool wps_load(char* file, bool display) |
115 | { | 121 | { |
116 | char buffer[FORMAT_BUFFER_SIZE]; | 122 | char buffer[FORMAT_BUFFER_SIZE]; |
diff --git a/apps/wps-display.h b/apps/wps-display.h index 970bca1842..fc40e19136 100644 --- a/apps/wps-display.h +++ b/apps/wps-display.h | |||
@@ -25,6 +25,7 @@ | |||
25 | bool wps_refresh(struct mp3entry* id3, int ffwd_offset, bool refresh_scroll); | 25 | bool wps_refresh(struct mp3entry* id3, int ffwd_offset, bool refresh_scroll); |
26 | bool wps_display(struct mp3entry* id3); | 26 | bool wps_display(struct mp3entry* id3); |
27 | bool wps_load(char* file, bool display); | 27 | bool wps_load(char* file, bool display); |
28 | void wps_reset(void); | ||
28 | 29 | ||
29 | #ifdef HAVE_LCD_CHARCELLS | 30 | #ifdef HAVE_LCD_CHARCELLS |
30 | bool draw_player_progress(struct mp3entry* id3, int ff_rewind_count); | 31 | bool draw_player_progress(struct mp3entry* id3, int ff_rewind_count); |
diff --git a/firmware/font.c b/firmware/font.c index 6f5156cc73..2fe43b5fd3 100644 --- a/firmware/font.c +++ b/firmware/font.c | |||
@@ -114,6 +114,11 @@ static int readstrpad(char *buf, int totlen) | |||
114 | return totlen; | 114 | return totlen; |
115 | } | 115 | } |
116 | 116 | ||
117 | void font_reset(void) | ||
118 | { | ||
119 | memset(&font_ui, 0, sizeof(struct font)); | ||
120 | } | ||
121 | |||
117 | /* read and load font into incore font structure*/ | 122 | /* read and load font into incore font structure*/ |
118 | struct font* font_load(char *path) | 123 | struct font* font_load(char *path) |
119 | { | 124 | { |
@@ -132,7 +137,7 @@ struct font* font_load(char *path) | |||
132 | return NULL; | 137 | return NULL; |
133 | } | 138 | } |
134 | 139 | ||
135 | memset(pf, 0, sizeof(struct font)); | 140 | font_reset(); |
136 | 141 | ||
137 | /* currently, font loading replaces earlier font allocation*/ | 142 | /* currently, font loading replaces earlier font allocation*/ |
138 | freeptr = (unsigned char *)(((int)mbuf + 3) & ~3); | 143 | freeptr = (unsigned char *)(((int)mbuf + 3) & ~3); |
diff --git a/firmware/font.h b/firmware/font.h index 44b975bb78..8e0bb9ce90 100644 --- a/firmware/font.h +++ b/firmware/font.h | |||
@@ -102,6 +102,7 @@ struct font { | |||
102 | void font_init(void); | 102 | void font_init(void); |
103 | struct font* font_load(char *path); | 103 | struct font* font_load(char *path); |
104 | struct font* font_get(int font); | 104 | struct font* font_get(int font); |
105 | void font_reset(void); | ||
105 | 106 | ||
106 | #else /* HAVE_LCD_BITMAP */ | 107 | #else /* HAVE_LCD_BITMAP */ |
107 | 108 | ||