summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorDave Chapman <dave@dchapman.com>2008-02-23 00:17:13 +0000
committerDave Chapman <dave@dchapman.com>2008-02-23 00:17:13 +0000
commitf75d8ac6e7cf189b4ea281fa890ab090f42533a5 (patch)
treec49c01bc70f4e17a78819a7f299cd988180dfc8b /apps
parent6431cd327cfeb3c734e3d80d1e4642eab5abc0ee (diff)
downloadrockbox-f75d8ac6e7cf189b4ea281fa890ab090f42533a5.tar.gz
rockbox-f75d8ac6e7cf189b4ea281fa890ab090f42533a5.zip
Remove font_file from the settings struct on the Archos Player - it isn't used.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16375 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/settings.h2
-rw-r--r--apps/settings_list.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/apps/settings.h b/apps/settings.h
index bdbe8d922e..06c9c8ba73 100644
--- a/apps/settings.h
+++ b/apps/settings.h
@@ -417,7 +417,9 @@ struct user_settings
417#if CONFIG_TUNER 417#if CONFIG_TUNER
418 unsigned char fmr_file[MAX_FILENAME+1]; /* last fmr preset */ 418 unsigned char fmr_file[MAX_FILENAME+1]; /* last fmr preset */
419#endif 419#endif
420#ifdef HAVE_LCD_BITMAP
420 unsigned char font_file[MAX_FILENAME+1]; /* last font */ 421 unsigned char font_file[MAX_FILENAME+1]; /* last font */
422#endif
421 unsigned char wps_file[MAX_FILENAME+1]; /* last wps */ 423 unsigned char wps_file[MAX_FILENAME+1]; /* last wps */
422 unsigned char lang_file[MAX_FILENAME+1]; /* last language */ 424 unsigned char lang_file[MAX_FILENAME+1]; /* last language */
423 425
diff --git a/apps/settings_list.c b/apps/settings_list.c
index 5dc3b9ec60..8a0b0e1d50 100644
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@@ -1083,8 +1083,10 @@ const struct settings_list settings[] = {
1083 FILENAME_SETTING(0, fmr_file, "fmr", 1083 FILENAME_SETTING(0, fmr_file, "fmr",
1084 "", FMPRESET_PATH "/", ".fmr", MAX_FILENAME+1), 1084 "", FMPRESET_PATH "/", ".fmr", MAX_FILENAME+1),
1085#endif 1085#endif
1086#ifdef HAVE_LCD_BITMAP
1086 FILENAME_SETTING(F_THEMESETTING, font_file, "font", 1087 FILENAME_SETTING(F_THEMESETTING, font_file, "font",
1087 "", FONT_DIR "/", ".fnt", MAX_FILENAME+1), 1088 "", FONT_DIR "/", ".fnt", MAX_FILENAME+1),
1089#endif
1088 FILENAME_SETTING(F_THEMESETTING,wps_file, "wps", 1090 FILENAME_SETTING(F_THEMESETTING,wps_file, "wps",
1089 "", WPS_DIR "/", ".wps", MAX_FILENAME+1), 1091 "", WPS_DIR "/", ".wps", MAX_FILENAME+1),
1090 FILENAME_SETTING(0,lang_file,"lang","",LANG_DIR "/",".lng",MAX_FILENAME+1), 1092 FILENAME_SETTING(0,lang_file,"lang","",LANG_DIR "/",".lng",MAX_FILENAME+1),