From 6f0f98da1d38b6604bca6fb42c0c31ce4c3b79e7 Mon Sep 17 00:00:00 2001 From: Jonathan Gordon Date: Thu, 28 Jan 2010 06:54:37 +0000 Subject: Fix remote backdrop crashes git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24357 a1c6a512-1295-4272-9138-f99709370657 --- apps/gui/backdrop.c | 22 ++++++++++++++++++++++ apps/gui/backdrop.h | 2 -- apps/screen_access.c | 4 +--- 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) { lcd_remote_set_backdrop(NULL); } +#else +/* api functions */ +bool remote_backdrop_load(enum backdrop_type bdrop, + const char *filename) +{ + (void)bdrop; (void)filename; + return true; +} + +void remote_backdrop_show(enum backdrop_type bdrop) +{ + (void)bdrop; +} +void remote_backdrop_unload(enum backdrop_type bdrop) +{ + (void)bdrop; +} + + +void remote_backdrop_hide(void) +{ +} #endif 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); #if defined(HAVE_REMOTE_LCD) /* no main backdrop, stubs! */ -#if LCD_REMOTE_DEPTH > 1 bool remote_backdrop_load(enum backdrop_type bdrop,const char* filename); void remote_backdrop_unload(enum backdrop_type bdrop); void remote_backdrop_show(enum backdrop_type bdrop); void remote_backdrop_hide(void); #endif -#endif #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] = .backlight_off=&remote_backlight_off, .is_backlight_on=&is_remote_backlight_on, .backlight_set_timeout=&remote_backlight_set_timeout, - -#if defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1 + .backdrop_load=&remote_backdrop_load, .backdrop_unload=&remote_backdrop_unload, .backdrop_show=&remote_backdrop_show, .backdrop_hide=&remote_backdrop_hide, -#endif #ifdef HAVE_BUTTONBAR .has_buttonbar=false, #endif -- cgit v1.2.3