From f75d8ac6e7cf189b4ea281fa890ab090f42533a5 Mon Sep 17 00:00:00 2001 From: Dave Chapman Date: Sat, 23 Feb 2008 00:17:13 +0000 Subject: [PATCH] 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 --- apps/settings.h | 2 ++ apps/settings_list.c | 2 ++ 2 files changed, 4 insertions(+) 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 #if CONFIG_TUNER unsigned char fmr_file[MAX_FILENAME+1]; /* last fmr preset */ #endif +#ifdef HAVE_LCD_BITMAP unsigned char font_file[MAX_FILENAME+1]; /* last font */ +#endif unsigned char wps_file[MAX_FILENAME+1]; /* last wps */ unsigned char lang_file[MAX_FILENAME+1]; /* last language */ 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[] = { FILENAME_SETTING(0, fmr_file, "fmr", "", FMPRESET_PATH "/", ".fmr", MAX_FILENAME+1), #endif +#ifdef HAVE_LCD_BITMAP FILENAME_SETTING(F_THEMESETTING, font_file, "font", "", FONT_DIR "/", ".fnt", MAX_FILENAME+1), +#endif FILENAME_SETTING(F_THEMESETTING,wps_file, "wps", "", WPS_DIR "/", ".wps", MAX_FILENAME+1), FILENAME_SETTING(0,lang_file,"lang","",LANG_DIR "/",".lng",MAX_FILENAME+1),