diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2010-09-14 12:21:56 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2010-09-14 12:21:56 +0000 |
commit | 71379cafb15bd18863ee95bc9a7749387a4877cf (patch) | |
tree | 6f8f79ad6e8ade6f84dc46c4542eee9ea96e5261 /apps | |
parent | 46142b91cd2427d584e42a4bf7612f3505375740 (diff) | |
download | rockbox-71379cafb15bd18863ee95bc9a7749387a4877cf.tar.gz rockbox-71379cafb15bd18863ee95bc9a7749387a4877cf.zip |
fix errors, warnings, tabs
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28075 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/gui/skin_engine/skin_display.c | 8 | ||||
-rw-r--r-- | apps/gui/skin_engine/skin_engine.c | 11 | ||||
-rw-r--r-- | apps/gui/skin_engine/skin_tokens.c | 1 | ||||
-rw-r--r-- | apps/gui/statusbar-skinned.h | 6 | ||||
-rw-r--r-- | apps/main.c | 1 | ||||
-rw-r--r-- | apps/radio/radio_skin.c | 8 |
6 files changed, 23 insertions, 12 deletions
diff --git a/apps/gui/skin_engine/skin_display.c b/apps/gui/skin_engine/skin_display.c index f001640cde..4c96782280 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 b3f0fd9e42..00a11fca48 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 0e98c2d42f..c3f803e4a3 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 02a3a7159e..66d9df3850 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__ */ diff --git a/apps/main.c b/apps/main.c index 4c05b4342c..b86b083e44 100644 --- a/apps/main.c +++ b/apps/main.c @@ -73,6 +73,7 @@ #include "scrobbler.h" #include "icon.h" #include "viewport.h" +#include "skin_engine/skin_engine.h" #include "statusbar-skinned.h" #include "bootchart.h" diff --git a/apps/radio/radio_skin.c b/apps/radio/radio_skin.c index 0217c83f92..0d745f7dd3 100644 --- a/apps/radio/radio_skin.c +++ b/apps/radio/radio_skin.c @@ -77,12 +77,12 @@ void fms_fix_displays(enum fms_exiting toggle_state) #endif viewportmanager_theme_undo(i, skin_has_sbs(i, data)); } - } #ifdef HAVE_TOUCHSCREEN - if (i==SCREEN_MAIN && !data->touchregions) - touchscreen_set_mode(toggle_state == FMS_ENTER ? - TOUCHSCREEN_BUTTON : global_settings.touch_mode); + if (i==SCREEN_MAIN && !data->touchregions) + touchscreen_set_mode(toggle_state == FMS_ENTER ? + TOUCHSCREEN_BUTTON : global_settings.touch_mode); #endif + } } |