From 22b12cafbb7aa4463170ad5752edcf2093b20c7b Mon Sep 17 00:00:00 2001 From: Jonathan Gordon Date: Mon, 31 May 2010 11:12:15 +0000 Subject: draw markers on the FM frequency bar for presets (like cuesheet markers in the WPS). seems nice but if it ends up looking crap we can revert.. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26429 a1c6a512-1295-4272-9138-f99709370657 --- apps/gui/skin_engine/skin_display.c | 23 ++++++++++++++++------- apps/gui/skin_engine/skin_parser.c | 1 + 2 files changed, 17 insertions(+), 7 deletions(-) (limited to 'apps/gui/skin_engine') diff --git a/apps/gui/skin_engine/skin_display.c b/apps/gui/skin_engine/skin_display.c index d0e94c7041..4b1c747706 100644 --- a/apps/gui/skin_engine/skin_display.c +++ b/apps/gui/skin_engine/skin_display.c @@ -185,17 +185,26 @@ static void draw_progressbar(struct gui_wps *gwps, gui_scrollbar_draw(display, pb->x, y, pb->width, height, length, 0, elapsed, HORIZONTAL); - if (pb->type == WPS_TOKEN_PROGRESSBAR && id3 && id3->length) + if (pb->type == WPS_TOKEN_PROGRESSBAR) { + if (id3 && id3->length) + { #ifdef AB_REPEAT_ENABLE - if (ab_repeat_mode_enabled()) - ab_draw_markers(display, id3->length, - pb->x, y, pb->width, height); + if (ab_repeat_mode_enabled()) + ab_draw_markers(display, id3->length, + pb->x, y, pb->width, height); #endif - if (id3->cuesheet) - cue_draw_markers(display, id3->cuesheet, id3->length, - pb->x, y+1, pb->width, height-2); + if (id3->cuesheet) + cue_draw_markers(display, id3->cuesheet, id3->length, + pb->x, y+1, pb->width, height-2); + } +#if CONFIG_TUNER + else if (in_radio_screen() || (get_radio_status() != FMRADIO_OFF)) + { + presets_draw_markers(display, pb->x, y, pb->width, height); + } +#endif } } diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c index 932c3baf6b..158f2eb7b7 100644 --- a/apps/gui/skin_engine/skin_parser.c +++ b/apps/gui/skin_engine/skin_parser.c @@ -1211,6 +1211,7 @@ static int parse_progressbar(const char *wps_bufptr, pb->y = -line_num - 1; /* Will be computed during the rendering */ if (token->type == WPS_TOKEN_VOLUME || token->type == WPS_TOKEN_BATTERY_PERCENT) return 0; /* dont add it, let the regular token handling do the work */ + pb->type = token->type; add_to_ll_chain(&wps_data->progressbars, item); return 0; } -- cgit v1.2.3