From ee593c95e22b0361431f97dcc8a91c0264a5485a Mon Sep 17 00:00:00 2001 From: Rafaël Carré Date: Fri, 31 Oct 2008 21:48:44 +0000 Subject: Make lcd_set_enable_hook() conditional on HAVE_LCD_ENABLE and HAVE_LCD_COLOR This prepares for the Clip which will define HAVE_LCD_ENABLE but won't need the hook since the internal LCD framebuffer is updated regardless if the display is on or off. firmware/drivers/lcd-16bit.c has not been modified since HAVE_LCD_COLOR is obviously defined here git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18951 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/mpegplayer/mpeg_settings.c | 6 +++--- apps/plugins/mpegplayer/mpegplayer.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'apps/plugins') diff --git a/apps/plugins/mpegplayer/mpeg_settings.c b/apps/plugins/mpegplayer/mpeg_settings.c index 519fd0f059..14863c943d 100644 --- a/apps/plugins/mpegplayer/mpeg_settings.c +++ b/apps/plugins/mpegplayer/mpeg_settings.c @@ -571,7 +571,7 @@ static int get_start_time(uint32_t duration) lcd_(clear_display)(); lcd_(update)(); -#ifdef HAVE_LCD_ENABLE +#if defined(HAVE_LCD_ENABLE) && defined(HAVE_LCD_COLOR) rb->lcd_set_enable_hook(get_start_time_lcd_enable_hook); #endif @@ -762,11 +762,11 @@ static int get_start_time(uint32_t duration) rb->yield(); } +#ifdef HAVE_LCD_COLOR #ifdef HAVE_LCD_ENABLE rb->lcd_set_enable_hook(NULL); #endif - -#ifndef HAVE_LCD_COLOR +#else stream_gray_show(false); grey_clear_display(); grey_update(); diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c index cb8c0d2133..5e34c2b041 100644 --- a/apps/plugins/mpegplayer/mpegplayer.c +++ b/apps/plugins/mpegplayer/mpegplayer.c @@ -612,11 +612,11 @@ static void wvs_backlight_on_video_mode(bool video_on) /* Turn off backlight timeout */ /* backlight control in lib/helper.c */ backlight_force_on(rb); -#ifdef HAVE_LCD_ENABLE +#if defined(HAVE_LCD_ENABLE) && defined(HAVE_LCD_COLOR) rb->lcd_set_enable_hook(NULL); #endif } else { -#ifdef HAVE_LCD_ENABLE +#if defined(HAVE_LCD_ENABLE) && defined(HAVE_LCD_COLOR) rb->lcd_set_enable_hook(wvs_lcd_enable_hook); #endif /* Revert to user's backlight settings */ @@ -1605,7 +1605,7 @@ static void button_loop(void) wvs_stop(); -#ifdef HAVE_LCD_ENABLE +#if defined(HAVE_LCD_ENABLE) && defined(HAVE_LCD_COLOR) /* Be sure hook is removed before exiting since the stop will put it * back because of the backlight restore. */ rb->lcd_set_enable_hook(NULL); -- cgit v1.2.3