From ee593c95e22b0361431f97dcc8a91c0264a5485a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C3=ABl=20Carr=C3=A9?= 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 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'apps/plugins/mpegplayer/mpeg_settings.c') diff --git a/apps/plugins/mpegplayer/mpeg_settings.c b/apps/plugins/mpegplayer/mpeg_settings.c index 519fd0f..14863c9 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(); -- cgit v1.1