diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2010-05-31 11:12:15 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2010-05-31 11:12:15 +0000 |
commit | 22b12cafbb7aa4463170ad5752edcf2093b20c7b (patch) | |
tree | 88bcc32aa322c39b30aec5f8a949f55690105952 /apps/gui | |
parent | 5b4a9b5e35594eafea7e0981a9fab9cd266debb1 (diff) | |
download | rockbox-22b12cafbb7aa4463170ad5752edcf2093b20c7b.tar.gz rockbox-22b12cafbb7aa4463170ad5752edcf2093b20c7b.zip |
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
Diffstat (limited to 'apps/gui')
-rw-r--r-- | apps/gui/skin_engine/skin_display.c | 23 | ||||
-rw-r--r-- | apps/gui/skin_engine/skin_parser.c | 1 |
2 files changed, 17 insertions, 7 deletions
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, | |||
185 | gui_scrollbar_draw(display, pb->x, y, pb->width, height, | 185 | gui_scrollbar_draw(display, pb->x, y, pb->width, height, |
186 | length, 0, elapsed, HORIZONTAL); | 186 | length, 0, elapsed, HORIZONTAL); |
187 | 187 | ||
188 | if (pb->type == WPS_TOKEN_PROGRESSBAR && id3 && id3->length) | 188 | if (pb->type == WPS_TOKEN_PROGRESSBAR) |
189 | { | 189 | { |
190 | if (id3 && id3->length) | ||
191 | { | ||
190 | #ifdef AB_REPEAT_ENABLE | 192 | #ifdef AB_REPEAT_ENABLE |
191 | if (ab_repeat_mode_enabled()) | 193 | if (ab_repeat_mode_enabled()) |
192 | ab_draw_markers(display, id3->length, | 194 | ab_draw_markers(display, id3->length, |
193 | pb->x, y, pb->width, height); | 195 | pb->x, y, pb->width, height); |
194 | #endif | 196 | #endif |
195 | 197 | ||
196 | if (id3->cuesheet) | 198 | if (id3->cuesheet) |
197 | cue_draw_markers(display, id3->cuesheet, id3->length, | 199 | cue_draw_markers(display, id3->cuesheet, id3->length, |
198 | pb->x, y+1, pb->width, height-2); | 200 | pb->x, y+1, pb->width, height-2); |
201 | } | ||
202 | #if CONFIG_TUNER | ||
203 | else if (in_radio_screen() || (get_radio_status() != FMRADIO_OFF)) | ||
204 | { | ||
205 | presets_draw_markers(display, pb->x, y, pb->width, height); | ||
206 | } | ||
207 | #endif | ||
199 | } | 208 | } |
200 | } | 209 | } |
201 | 210 | ||
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, | |||
1211 | pb->y = -line_num - 1; /* Will be computed during the rendering */ | 1211 | pb->y = -line_num - 1; /* Will be computed during the rendering */ |
1212 | if (token->type == WPS_TOKEN_VOLUME || token->type == WPS_TOKEN_BATTERY_PERCENT) | 1212 | if (token->type == WPS_TOKEN_VOLUME || token->type == WPS_TOKEN_BATTERY_PERCENT) |
1213 | return 0; /* dont add it, let the regular token handling do the work */ | 1213 | return 0; /* dont add it, let the regular token handling do the work */ |
1214 | pb->type = token->type; | ||
1214 | add_to_ll_chain(&wps_data->progressbars, item); | 1215 | add_to_ll_chain(&wps_data->progressbars, item); |
1215 | return 0; | 1216 | return 0; |
1216 | } | 1217 | } |