diff options
| author | Jonathan Gordon <rockbox@jdgordon.info> | 2010-05-12 11:44:09 +0000 |
|---|---|---|
| committer | Jonathan Gordon <rockbox@jdgordon.info> | 2010-05-12 11:44:09 +0000 |
| commit | a5d8d215964b31c3257083846dab71af51eb1af2 (patch) | |
| tree | 37adcb974089c139638dc8c86c4c78f36284372f /apps/gui | |
| parent | 7b931f0a5a7dc90bc488c9f521ed5aeae42f8d73 (diff) | |
| download | rockbox-a5d8d215964b31c3257083846dab71af51eb1af2.zip rockbox-a5d8d215964b31c3257083846dab71af51eb1af2.tar.gz rockbox-a5d8d215964b31c3257083846dab71af51eb1af2.tar.bz2 rockbox-a5d8d215964b31c3257083846dab71af51eb1af2.tar.xz | |
fix the last of the reds, and make RDS tags actually work (and add them to the hardcoded radio skin)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25966 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui')
| -rw-r--r-- | apps/gui/skin_engine/skin_display.c | 6 | ||||
| -rw-r--r-- | apps/gui/skin_engine/skin_parser.c | 5 | ||||
| -rw-r--r-- | apps/gui/skin_engine/skin_tokens.c | 2 |
3 files changed, 11 insertions, 2 deletions
diff --git a/apps/gui/skin_engine/skin_display.c b/apps/gui/skin_engine/skin_display.c index 16b2dc1..7710d58 100644 --- a/apps/gui/skin_engine/skin_display.c +++ b/apps/gui/skin_engine/skin_display.c @@ -58,8 +58,10 @@ #endif #include "backdrop.h" #include "viewport.h" +#if CONFIG_TUNER #include "radio.h" #include "tuner.h" +#endif #include "root_menu.h" @@ -1349,6 +1351,7 @@ static bool skin_redraw(struct gui_wps *gwps, unsigned refresh_mode) bool skin_has_sbs(enum screen_type screen, struct wps_data *data) { (void)screen; + (void)data; bool draw = false; #ifdef HAVE_LCD_BITMAP if (data->wps_sb_tag) @@ -1365,9 +1368,10 @@ bool skin_has_sbs(enum screen_type screen, struct wps_data *data) */ int skin_wait_for_action(struct gui_wps *gwps, int context, int timeout) { + (void)gwps; /* silence charcell warning */ + int button = ACTION_NONE; #ifdef HAVE_LCD_BITMAP int i; - int button = ACTION_NONE; /* when the peak meter is enabled we want to have a few extra updates to make it look smooth. On the other hand we don't want to waste energy if it diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c index 93df300..bb8f8c5 100644 --- a/apps/gui/skin_engine/skin_parser.c +++ b/apps/gui/skin_engine/skin_parser.c @@ -52,7 +52,10 @@ #include "skin_engine.h" #include "settings.h" #include "settings_list.h" +#if CONFIG_TUNER #include "radio.h" +#include "tuner.h" +#endif #include "skin_fonts.h" #ifdef HAVE_LCD_BITMAP @@ -362,7 +365,7 @@ static const struct wps_tag all_tags[] = { { WPS_TOKEN_PRESET_FREQ, "Tf", WPS_REFRESH_STATIC, NULL }, { WPS_TOKEN_PRESET_COUNT, "Tc", WPS_REFRESH_STATIC, NULL }, { WPS_TOKEN_HAVE_RDS, "tx", WPS_REFRESH_STATIC, NULL }, -#ifdef HAVE_RDS_CAPS +#ifdef HAVE_RDS_CAP { WPS_TOKEN_RDS_NAME, "ty", WPS_REFRESH_DYNAMIC, NULL }, { WPS_TOKEN_RDS_TEXT, "tz", WPS_REFRESH_DYNAMIC, NULL }, #endif diff --git a/apps/gui/skin_engine/skin_tokens.c b/apps/gui/skin_engine/skin_tokens.c index 4acf7ea..e5a34c4 100644 --- a/apps/gui/skin_engine/skin_tokens.c +++ b/apps/gui/skin_engine/skin_tokens.c @@ -61,8 +61,10 @@ #endif #include "language.h" #include "usb.h" +#if CONFIG_TUNER #include "radio.h" #include "tuner.h" +#endif extern struct wps_state wps_state; |