fix errors, warnings, tabs

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

4 files changed, 18 insertions, 8 deletions

diff --git a/apps/gui/skin_engine/skin_display.c b/apps/gui/skin_engine/skin_display.c
index f001640..4c96782 100644
--- a/apps/gui/skin_engine/skin_display.c
+++ b/apps/gui/skin_engine/skin_display.c
@@ -340,10 +340,10 @@ void wps_display_images(struct gui_wps *gwps, struct viewport* vp)
 #ifdef HAVE_ALBUMART
     /* now draw the AA */
     if (data->albumart && data->albumart->vp == vp
-	    && data->albumart->draw_handle >= 0)
+        && data->albumart->draw_handle >= 0)
     {
         draw_album_art(gwps, data->albumart->draw_handle, false);
-		data->albumart->draw_handle = -1;
+        data->albumart->draw_handle = -1;
     }
 #endif
 
@@ -354,7 +354,7 @@ void wps_display_images(struct gui_wps *gwps, struct viewport* vp)
 
 bool draw_player_progress(struct gui_wps *gwps)
 {
-    struct wps_state *state = gwps->state;
+    struct wps_state *state = skin_get_global_state();
     struct screen *display = gwps->display;
     unsigned char progress_pattern[7];
     int pos = 0;
@@ -404,7 +404,7 @@ void draw_player_fullbar(struct gui_wps *gwps, char* buf, int buf_size)
         {0x0e, 0x0e, 0x02, 0x0e}, /* 9 */
     };
 
-    struct wps_state *state = gwps->state;
+    struct wps_state *state = skin_get_global_state();
     struct screen *display = gwps->display;
     struct wps_data *data = gwps->data;
     unsigned char progress_pattern[7];
diff --git a/apps/gui/skin_engine/skin_engine.c b/apps/gui/skin_engine/skin_engine.c
index b3f0fd9..00a11fc 100644
--- a/apps/gui/skin_engine/skin_engine.c
+++ b/apps/gui/skin_engine/skin_engine.c
@@ -61,7 +61,9 @@ void settings_apply_skins(void)
         FOR_NB_SCREENS(j)
             skin_get_gwps(i, j);
     }
+#if LCD_DEPTH > 1 || defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1
     skin_backdrops_preload(); /* should maybe check the retval here... */
+#endif
     viewportmanager_theme_changed(THEME_STATUSBAR);
 #if LCD_DEPTH > 1 || defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1
     FOR_NB_SCREENS(i)
@@ -72,8 +74,7 @@ void settings_apply_skins(void)
 
 char* wps_default_skin(enum screen_type screen);
 char* default_radio_skin(enum screen_type screen);
-int sb_preproccess(enum screen_type screen, struct wps_data *data);
-int sb_postproccess(enum screen_type screen, struct wps_data *data);
+
 struct wps_state     wps_state               = { .id3 = NULL };
 static struct gui_skin_helper {
     int (*preproccess)(enum screen_type screen, struct wps_data *data);
@@ -143,10 +144,11 @@ struct gui_wps *skin_get_gwps(enum skinnable_screens skin, enum screen_type scre
     if (!loading_a_sbs && skins[skin][screen].data.wps_loaded == false)
     {
         char buf[MAX_PATH*2], path[MAX_PATH];
-        char *setting, *ext;
+        char *setting = NULL, *ext = NULL;
         switch (skin)
         {
             case CUSTOM_STATUSBAR:
+#ifdef HAVE_LCD_BITMAP
                 if (skin_buffer == NULL)
                 {
                     /* still loading, buffers not initialised yet,
@@ -171,6 +173,9 @@ struct gui_wps *skin_get_gwps(enum skinnable_screens skin, enum screen_type scre
                     setting = global_settings.sbs_file;
                     ext = "sbs";
                 }
+#else
+                return &skins[skin][screen].gui_wps;
+#endif /* HAVE_LCD_BITMAP */
                 break;
             case WPS:
 #if defined(HAVE_REMOTE_LCD) && NB_SCREENS > 1
diff --git a/apps/gui/skin_engine/skin_tokens.c b/apps/gui/skin_engine/skin_tokens.c
index 0e98c2d..c3f803e 100644
--- a/apps/gui/skin_engine/skin_tokens.c
+++ b/apps/gui/skin_engine/skin_tokens.c
@@ -56,6 +56,7 @@
 #include "tagcache.h"
 
 #include "wps_internals.h"
+#include "skin_engine.h"
 #include "root_menu.h"
 #ifdef HAVE_RECORDING
 #include "recording.h"
diff --git a/apps/gui/statusbar-skinned.h b/apps/gui/statusbar-skinned.h
index 02a3a71..66d9df3 100644
--- a/apps/gui/statusbar-skinned.h
+++ b/apps/gui/statusbar-skinned.h
@@ -51,13 +51,17 @@ int sb_touch_to_button(int context);
 #if (LCD_DEPTH > 1) || (defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1)
 int sb_get_backdrop(enum screen_type screen);
 #endif
+int sb_preproccess(enum screen_type screen, struct wps_data *data);
+int sb_postproccess(enum screen_type screen, struct wps_data *data);
 
 #else /* CHARCELL */
 #define sb_skin_init()
 #define sb_skin_data_load(a,b,c)
 #define sb_skin_set_update_delay(a)
 #define sb_skin_set_state(a,b)
-#define sb_create_from_settings(a)
+#define sb_create_from_settings NULL
+#define sb_preproccess NULL
+#define sb_postproccess NULL
 #endif
 void do_sbs_update_callback(void *param);
 #endif /* __STATUSBAR_SKINNED_H__ */