5 files changed, 0 insertions, 197 deletions

diff --git a/apps/gui/skin_engine/skin_display.c b/apps/gui/skin_engine/skin_display.c
index 501d3a305a..7ee349b346 100644
--- a/apps/gui/skin_engine/skin_display.c
+++ b/apps/gui/skin_engine/skin_display.c
@@ -662,7 +662,6 @@ bool skin_has_sbs(enum screen_type screen, struct wps_data *data)
  */
 int skin_wait_for_action(enum skinnable_screens skin, int context, int timeout)
 {
-    (void)skin; /* silence charcell warning */
     int button = ACTION_NONE;
 #ifdef HAVE_LCD_BITMAP
     /* when the peak meter is enabled we want to have a
diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c
index dce88e9c58..de7c1db372 100644
--- a/apps/gui/skin_engine/skin_parser.c
+++ b/apps/gui/skin_engine/skin_parser.c
@@ -1815,14 +1815,6 @@ static void skin_data_reset(struct wps_data *wps_data)
     wps_data->peak_meter_enabled = false;
     wps_data->wps_sb_tag = false;
     wps_data->show_sb_on_wps = false;
-#else /* HAVE_LCD_CHARCELLS */
-    /* progress bars */
-    int i;
-    for (i = 0; i < 8; i++)
-    {
-        wps_data->wps_progress_pat[i] = 0;
-    }
-    wps_data->full_line_progressbar = false;
 #endif
     wps_data->wps_loaded = false;
 }
diff --git a/apps/gui/skin_engine/skin_render.c b/apps/gui/skin_engine/skin_render.c
index 4415619b7e..e14c882dd9 100644
--- a/apps/gui/skin_engine/skin_render.c
+++ b/apps/gui/skin_engine/skin_render.c
@@ -97,10 +97,6 @@ get_child(OFFSETTYPE(struct skin_element**) children, int child)
 static bool do_non_text_tags(struct gui_wps *gwps, struct skin_draw_info *info,
                              struct skin_element *element, struct skin_viewport* skin_vp)
 {
-#ifndef HAVE_LCD_BITMAP
-    (void)skin_vp; /* silence warnings */
-    (void)info;
-#endif
     struct wps_token *token = (struct wps_token *)SKINOFFSETTOPTR(skin_buffer, element->data);
 
 #ifdef HAVE_LCD_BITMAP
@@ -832,14 +828,6 @@ void skin_render(struct gui_wps *gwps, unsigned refresh_mode)
     int old_refresh_mode = refresh_mode;
     skin_buffer = get_skin_buffer(gwps->data);
     
-#ifdef HAVE_LCD_CHARCELLS
-    int i;
-    for (i = 0; i < 8; i++)
-    {
-        if (data->wps_progress_pat[i] == 0)
-            data->wps_progress_pat[i] = display->get_locked_pattern();
-    }
-#endif
 
     viewport = SKINOFFSETTOPTR(skin_buffer, data->tree);
     skin_viewport = SKINOFFSETTOPTR(skin_buffer, viewport->data);
diff --git a/apps/gui/skin_engine/skin_tokens.c b/apps/gui/skin_engine/skin_tokens.c
index 75c3203066..50704fd66e 100644
--- a/apps/gui/skin_engine/skin_tokens.c
+++ b/apps/gui/skin_engine/skin_tokens.c
@@ -37,9 +37,6 @@
 #include "cuesheet.h"
 #include "replaygain.h"
 #include "core_alloc.h"
-#ifdef HAVE_LCD_CHARCELLS
-#include "hwcompat.h"
-#endif
 #include "abrepeat.h"
 #include "lang.h"
 #include "misc.h"
@@ -577,148 +574,6 @@ static struct mp3entry* get_mp3entry_from_offset(int offset, char **filename)
     return pid3;
 }
 
-#ifdef HAVE_LCD_CHARCELLS
-static void format_player_progress(struct gui_wps *gwps)
-{
-    struct wps_state *state = skin_get_global_state();
-    struct screen *display = gwps->display;
-    unsigned char progress_pattern[7];
-    int pos = 0;
-    int i;
-
-    int elapsed, length;
-    if (LIKELY(state->id3))
-    {
-        elapsed = state->id3->elapsed;
-        length = state->id3->length;
-    }
-    else
-    {
-        elapsed = 0;
-        length = 0;
-    }
-
-    if (length)
-        pos = 36 * (elapsed + state->ff_rewind_count) / length;
-
-    for (i = 0; i < 7; i++, pos -= 5)
-    {
-        if (pos <= 0)
-            progress_pattern[i] = 0x1fu;
-        else if (pos >= 5)
-            progress_pattern[i] = 0x00u;
-        else
-            progress_pattern[i] = 0x1fu >> pos;
-    }
-
-    display->define_pattern(gwps->data->wps_progress_pat[0], progress_pattern);
-}
-
-static void format_player_fullbar(struct gui_wps *gwps, char* buf, int buf_size)
-{
-    static const unsigned char numbers[10][4] = {
-        {0x0e, 0x0a, 0x0a, 0x0e}, /* 0 */
-        {0x04, 0x0c, 0x04, 0x04}, /* 1 */
-        {0x0e, 0x02, 0x04, 0x0e}, /* 2 */
-        {0x0e, 0x02, 0x06, 0x0e}, /* 3 */
-        {0x08, 0x0c, 0x0e, 0x04}, /* 4 */
-        {0x0e, 0x0c, 0x02, 0x0c}, /* 5 */
-        {0x0e, 0x08, 0x0e, 0x0e}, /* 6 */
-        {0x0e, 0x02, 0x04, 0x08}, /* 7 */
-        {0x0e, 0x0e, 0x0a, 0x0e}, /* 8 */
-        {0x0e, 0x0e, 0x02, 0x0e}  /* 9 */
-    };
-
-    struct wps_state *state = skin_get_global_state();
-    struct screen *display = gwps->display;
-    struct wps_data *data = gwps->data;
-    unsigned char progress_pattern[7];
-    char timestr[10];
-    int time;
-    int time_idx = 0;
-    int pos = 0;
-    int pat_idx = 1;
-    int digit, i, j;
-    bool softchar;
-
-    int elapsed, length;
-    if (LIKELY(state->id3))
-    {
-        elapsed = state->id3->elapsed;
-        length = state->id3->length;
-    }
-    else
-    {
-        elapsed = 0;
-        length = 0;
-    }
-
-    if (buf_size < 34) /* worst case: 11x UTF-8 char + \0 */
-        return;
-
-    time = elapsed + state->ff_rewind_count;
-    if (length)
-        pos = 55 * time / length;
-
-    memset(timestr, 0, sizeof(timestr));
-    format_time(timestr, sizeof(timestr)-2, time);
-    timestr[strlen(timestr)] = ':';   /* always safe */
-
-    for (i = 0; i < 11; i++, pos -= 5)
-    {
-        softchar = false;
-        memset(progress_pattern, 0, sizeof(progress_pattern));
-
-        if ((digit = timestr[time_idx]))
-        {
-            softchar = true;
-            digit -= '0';
-
-            if (timestr[time_idx + 1] == ':')  /* ones, left aligned */
-            {
-                memcpy(progress_pattern, numbers[digit], 4);
-                time_idx += 2;
-            }
-            else  /* tens, shifted right */
-            {
-                for (j = 0; j < 4; j++)
-                    progress_pattern[j] = numbers[digit][j] >> 1;
-
-                if (time_idx > 0)  /* not the first group, add colon in front */
-                {
-                    progress_pattern[1] |= 0x10u;
-                    progress_pattern[3] |= 0x10u;
-                }
-                time_idx++;
-            }
-
-            if (pos >= 5)
-                progress_pattern[5] = progress_pattern[6] = 0x1fu;
-        }
-
-        if (pos > 0 && pos < 5)
-        {
-            softchar = true;
-            progress_pattern[5] = progress_pattern[6] = (~0x1fu >> pos) & 0x1fu;
-        }
-
-        if (softchar && pat_idx < 8)
-        {
-            display->define_pattern(data->wps_progress_pat[pat_idx],
-                                    progress_pattern);
-            buf = utf8encode(data->wps_progress_pat[pat_idx], buf);
-            pat_idx++;
-        }
-        else if (pos <= 0)
-            buf = utf8encode(' ', buf);
-        else
-            buf = utf8encode(0xe115, buf); /* 2/7 _ */
-    }
-    *buf = '\0';
-}
-
-#endif /* HAVE_LCD_CHARCELLS */
-
 /* Don't inline this; it was broken out of get_token_value to reduce stack
  * usage.
  */
@@ -1351,34 +1206,6 @@ const char *get_token_value(struct gui_wps *gwps,
             return "-";
 #endif
 
-#ifdef HAVE_LCD_CHARCELLS
-        case SKIN_TOKEN_PROGRESSBAR:
-        {
-            char *end;
-            format_player_progress(gwps);
-            end = utf8encode(data->wps_progress_pat[0], buf);
-            *end = '\0';
-            return buf;
-        }
-
-        case SKIN_TOKEN_PLAYER_PROGRESSBAR:
-            if(is_new_player())
-            {
-                /* we need 11 characters (full line) for
-                    progress-bar */
-                strlcpy(buf, "           ", buf_size);
-                format_player_fullbar(gwps,buf,buf_size);
-                DEBUGF("bar='%s'\n",buf);
-            }
-            else
-            {
-                /* Tell the user if we have an OldPlayer */
-                strlcpy(buf, " <Old LCD> ", buf_size);
-            }
-            return buf;
-#endif
-
-
 #ifdef HAVE_LCD_BITMAP
         /* peakmeter */
         case SKIN_TOKEN_PEAKMETER_LEFT:
diff --git a/apps/gui/skin_engine/wps_internals.h b/apps/gui/skin_engine/wps_internals.h
index e7996b0530..caf43b21cb 100644
--- a/apps/gui/skin_engine/wps_internals.h
+++ b/apps/gui/skin_engine/wps_internals.h
@@ -374,9 +374,6 @@ struct wps_data
     bool peak_meter_enabled;
     bool wps_sb_tag;
     bool show_sb_on_wps;
-#else /*HAVE_LCD_CHARCELLS */
-    unsigned short wps_progress_pat[8];
-    bool full_line_progressbar;
 #endif
     bool wps_loaded;
 };