diff options
author | Thomas Martitz <kugel@rockbox.org> | 2009-08-27 17:55:05 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2009-08-27 17:55:05 +0000 |
commit | 3598eb02d7ac5ee0eba1aeceacf52a4ba1b866bb (patch) | |
tree | 45b80f78a640e2f86f6671bd9ff6a93d7f0712a0 /apps/gui | |
parent | f814a44c473af227ebaef568e747c58279e69dbb (diff) | |
download | rockbox-3598eb02d7ac5ee0eba1aeceacf52a4ba1b866bb.tar.gz rockbox-3598eb02d7ac5ee0eba1aeceacf52a4ba1b866bb.zip |
Do some #ifdef'ing to make the Player happy.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22520 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui')
-rw-r--r-- | apps/gui/skin_engine/skin_display.c | 4 | ||||
-rw-r--r-- | apps/gui/wps.c | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/apps/gui/skin_engine/skin_display.c b/apps/gui/skin_engine/skin_display.c index e674c9becf..a6cab63829 100644 --- a/apps/gui/skin_engine/skin_display.c +++ b/apps/gui/skin_engine/skin_display.c | |||
@@ -129,6 +129,8 @@ bool skin_update(struct gui_wps *gwps, unsigned int update_type) | |||
129 | return retval; | 129 | return retval; |
130 | } | 130 | } |
131 | 131 | ||
132 | #ifdef HAVE_LCD_BITMAP | ||
133 | |||
132 | void skin_statusbar_changed(struct gui_wps *skin) | 134 | void skin_statusbar_changed(struct gui_wps *skin) |
133 | { | 135 | { |
134 | if (!skin) | 136 | if (!skin) |
@@ -159,8 +161,6 @@ void skin_statusbar_changed(struct gui_wps *skin) | |||
159 | 161 | ||
160 | } | 162 | } |
161 | 163 | ||
162 | #ifdef HAVE_LCD_BITMAP | ||
163 | |||
164 | static void draw_progressbar(struct gui_wps *gwps, | 164 | static void draw_progressbar(struct gui_wps *gwps, |
165 | struct skin_viewport *wps_vp) | 165 | struct skin_viewport *wps_vp) |
166 | { | 166 | { |
diff --git a/apps/gui/wps.c b/apps/gui/wps.c index cfa857099e..1d97501bc1 100644 --- a/apps/gui/wps.c +++ b/apps/gui/wps.c | |||
@@ -89,8 +89,9 @@ static struct wps_data wps_datas[NB_SCREENS]; | |||
89 | static void wps_state_init(void); | 89 | static void wps_state_init(void); |
90 | static void track_changed_callback(void *param); | 90 | static void track_changed_callback(void *param); |
91 | static void nextid3available_callback(void* param); | 91 | static void nextid3available_callback(void* param); |
92 | #ifdef HAVE_LCD_BITMAP | ||
92 | static void statusbar_toggle_handler(void *data); | 93 | static void statusbar_toggle_handler(void *data); |
93 | 94 | #endif | |
94 | 95 | ||
95 | #define WPS_DEFAULTCFG WPS_DIR "/rockbox_default.wps" | 96 | #define WPS_DEFAULTCFG WPS_DIR "/rockbox_default.wps" |
96 | #ifdef HAVE_REMOTE_LCD | 97 | #ifdef HAVE_REMOTE_LCD |
@@ -693,6 +694,8 @@ long gui_wps_show(void) | |||
693 | #ifdef HAVE_LCD_CHARCELLS | 694 | #ifdef HAVE_LCD_CHARCELLS |
694 | status_set_audio(true); | 695 | status_set_audio(true); |
695 | status_set_param(false); | 696 | status_set_param(false); |
697 | #else | ||
698 | statusbar_toggle_handler(NULL); | ||
696 | #endif | 699 | #endif |
697 | 700 | ||
698 | #ifdef AB_REPEAT_ENABLE | 701 | #ifdef AB_REPEAT_ENABLE |
@@ -700,7 +703,6 @@ long gui_wps_show(void) | |||
700 | ab_reset_markers(); | 703 | ab_reset_markers(); |
701 | #endif | 704 | #endif |
702 | wps_state_init(); | 705 | wps_state_init(); |
703 | statusbar_toggle_handler(NULL); | ||
704 | 706 | ||
705 | while ( 1 ) | 707 | while ( 1 ) |
706 | { | 708 | { |