diff options
author | Thomas Martitz <kugel@rockbox.org> | 2009-03-17 02:43:47 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2009-03-17 02:43:47 +0000 |
commit | b7739fbf1c838cb6e6e47f9d28d5b339828e1e30 (patch) | |
tree | f4011d6a14cd93fae2002eeccdd63e039ab44f7e /apps/plugins/mpegplayer/mpeg_settings.c | |
parent | aad712d39f3cdeb95a22e56edb805554dd0a90e1 (diff) | |
download | rockbox-b7739fbf1c838cb6e6e47f9d28d5b339828e1e30.tar.gz rockbox-b7739fbf1c838cb6e6e47f9d28d5b339828e1e30.zip |
Rework lcd_enabled and lcd_set/call_enable hook
a) lcd_enabled() is now lcd_active(), and is available for HAVE_LCD_SLEEP only targets (e.g. ipod video) too. It was depandent on HAVE_LCD_ENALE only before
b) rename the hook accordingly, and implement the hook for other other targets too (e.g. the clip [the only mono target with lcd_enable/lcd_sleep yet, so the code is still in the lcd driver], ipod, fuze, c200)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20331 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/mpegplayer/mpeg_settings.c')
-rw-r--r-- | apps/plugins/mpegplayer/mpeg_settings.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/apps/plugins/mpegplayer/mpeg_settings.c b/apps/plugins/mpegplayer/mpeg_settings.c index de667ec782..3452903b47 100644 --- a/apps/plugins/mpegplayer/mpeg_settings.c +++ b/apps/plugins/mpegplayer/mpeg_settings.c | |||
@@ -604,7 +604,7 @@ static int get_start_time(uint32_t duration) | |||
604 | lcd_(update)(); | 604 | lcd_(update)(); |
605 | 605 | ||
606 | #if defined(HAVE_LCD_ENABLE) && defined(HAVE_LCD_COLOR) | 606 | #if defined(HAVE_LCD_ENABLE) && defined(HAVE_LCD_COLOR) |
607 | rb->lcd_set_enable_hook(get_start_time_lcd_enable_hook); | 607 | rb->lcd_activation_set_hook(get_start_time_lcd_enable_hook); |
608 | #endif | 608 | #endif |
609 | 609 | ||
610 | draw_slider(0, 100, &rc_bound); | 610 | draw_slider(0, 100, &rc_bound); |
@@ -794,11 +794,10 @@ static int get_start_time(uint32_t duration) | |||
794 | rb->yield(); | 794 | rb->yield(); |
795 | } | 795 | } |
796 | 796 | ||
797 | #ifdef HAVE_LCD_COLOR | 797 | #if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP) |
798 | #ifdef HAVE_LCD_ENABLE | 798 | rb->lcd_activation_set_hook(NULL); |
799 | rb->lcd_set_enable_hook(NULL); | ||
800 | #endif | 799 | #endif |
801 | #else | 800 | #ifndef HAVE_LCD_COLOR |
802 | stream_gray_show(false); | 801 | stream_gray_show(false); |
803 | grey_clear_display(); | 802 | grey_clear_display(); |
804 | grey_update(); | 803 | grey_update(); |