Fix charcell %pb and %pf tags, FS#11592

This also moves draw_player_fullbar() and draw_player_progress() from skin_display.c to skin_tokens.c. Charcell is a bit different from bitmap here because drawing a progress bar is a combination of setting up the LCD controller (custom characters) and providing a format string. The custom character definition might fit in skin_display.c, but the format strings are needed in skin_tokens.c. Putting these functions in skin_tokens.c seemed to fit better.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28241 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 6 insertions, 10 deletions

diff --git a/apps/gui/skin_engine/skin_render.c b/apps/gui/skin_engine/skin_render.c
index bd86c0bdf8..9b86380ade 100644
--- a/apps/gui/skin_engine/skin_render.c
+++ b/apps/gui/skin_engine/skin_render.c
@@ -83,10 +83,14 @@ static bool do_non_text_tags(struct gui_wps *gwps, struct skin_draw_info *info,
 {
 #ifndef HAVE_LCD_BITMAP
     (void)vp; /* silence warnings */
+    (void)info;
 #endif    
     struct wps_token *token = (struct wps_token *)element->data;
+
+#ifdef HAVE_LCD_BITMAP
     struct wps_data *data = gwps->data;
     bool do_refresh = (element->tag->flags & info->refresh_type) > 0;
+#endif
     switch (token->type)
     {   
 #if (LCD_DEPTH > 1) || (defined(HAVE_REMOTE_LCD) && (LCD_REMOTE_DEPTH > 1))
@@ -137,22 +141,14 @@ static bool do_non_text_tags(struct gui_wps *gwps, struct skin_draw_info *info,
 #endif
         case SKIN_TOKEN_VOLUMEBAR:
         case SKIN_TOKEN_BATTERY_PERCENTBAR:
+#ifdef HAVE_LCD_BITMAP
         case SKIN_TOKEN_PROGRESSBAR:
         {
-#ifdef HAVE_LCD_BITMAP
             struct progressbar *bar = (struct progressbar*)token->value.data;
             if (do_refresh)
                 draw_progressbar(gwps, info->line_number, bar);
-#else /* HAVE_LCD_CHARCELL */
-            if (do_refresh)
-            {
-                if (data->full_line_progressbar)
-                    draw_player_fullbar(gwps, info->buf, info->buf_size);
-                else
-                    draw_player_progress(gwps);
-            }
-#endif
         }
+#endif
         break;
 #ifdef HAVE_LCD_BITMAP
         case SKIN_TOKEN_IMAGE_DISPLAY_LISTICON: