summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2010-01-28 06:54:37 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2010-01-28 06:54:37 +0000
commit6f0f98da1d38b6604bca6fb42c0c31ce4c3b79e7 (patch)
treebb41d6746832ab5d323bf11c207617825b757c54
parenta6bd83a31519370b9fe1229f9b2a7220dc8e6d7b (diff)
downloadrockbox-6f0f98da1d38b6604bca6fb42c0c31ce4c3b79e7.tar.gz
rockbox-6f0f98da1d38b6604bca6fb42c0c31ce4c3b79e7.zip
Fix remote backdrop crashes
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24357 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/gui/backdrop.c22
-rw-r--r--apps/gui/backdrop.h2
-rw-r--r--apps/screen_access.c4
3 files changed, 23 insertions, 5 deletions
diff --git a/apps/gui/backdrop.c b/apps/gui/backdrop.c
index 7e56dcb7db..058eaa5de4 100644
--- a/apps/gui/backdrop.c
+++ b/apps/gui/backdrop.c
@@ -211,7 +211,29 @@ void remote_backdrop_hide(void)
211{ 211{
212 lcd_remote_set_backdrop(NULL); 212 lcd_remote_set_backdrop(NULL);
213} 213}
214#else
215/* api functions */
216bool remote_backdrop_load(enum backdrop_type bdrop,
217 const char *filename)
218{
219 (void)bdrop; (void)filename;
220 return true;
221}
222
223void remote_backdrop_show(enum backdrop_type bdrop)
224{
225 (void)bdrop;
226}
214 227
228void remote_backdrop_unload(enum backdrop_type bdrop)
229{
230 (void)bdrop;
231}
232
233
234void remote_backdrop_hide(void)
235{
236}
215#endif 237#endif
216 238
217 239
diff --git a/apps/gui/backdrop.h b/apps/gui/backdrop.h
index f770797aa8..3b873fd137 100644
--- a/apps/gui/backdrop.h
+++ b/apps/gui/backdrop.h
@@ -41,12 +41,10 @@ void backdrop_hide(void);
41 41
42#if defined(HAVE_REMOTE_LCD) 42#if defined(HAVE_REMOTE_LCD)
43/* no main backdrop, stubs! */ 43/* no main backdrop, stubs! */
44#if LCD_REMOTE_DEPTH > 1
45bool remote_backdrop_load(enum backdrop_type bdrop,const char* filename); 44bool remote_backdrop_load(enum backdrop_type bdrop,const char* filename);
46void remote_backdrop_unload(enum backdrop_type bdrop); 45void remote_backdrop_unload(enum backdrop_type bdrop);
47void remote_backdrop_show(enum backdrop_type bdrop); 46void remote_backdrop_show(enum backdrop_type bdrop);
48void remote_backdrop_hide(void); 47void remote_backdrop_hide(void);
49#endif 48#endif
50#endif
51 49
52#endif /* _BACKDROP_H */ 50#endif /* _BACKDROP_H */
diff --git a/apps/screen_access.c b/apps/screen_access.c
index 28dad06cfc..46b5168661 100644
--- a/apps/screen_access.c
+++ b/apps/screen_access.c
@@ -288,13 +288,11 @@ struct screen screens[NB_SCREENS] =
288 .backlight_off=&remote_backlight_off, 288 .backlight_off=&remote_backlight_off,
289 .is_backlight_on=&is_remote_backlight_on, 289 .is_backlight_on=&is_remote_backlight_on,
290 .backlight_set_timeout=&remote_backlight_set_timeout, 290 .backlight_set_timeout=&remote_backlight_set_timeout,
291 291
292#if defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1
293 .backdrop_load=&remote_backdrop_load, 292 .backdrop_load=&remote_backdrop_load,
294 .backdrop_unload=&remote_backdrop_unload, 293 .backdrop_unload=&remote_backdrop_unload,
295 .backdrop_show=&remote_backdrop_show, 294 .backdrop_show=&remote_backdrop_show,
296 .backdrop_hide=&remote_backdrop_hide, 295 .backdrop_hide=&remote_backdrop_hide,
297#endif
298#ifdef HAVE_BUTTONBAR 296#ifdef HAVE_BUTTONBAR
299 .has_buttonbar=false, 297 .has_buttonbar=false,
300#endif 298#endif