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 | |
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')
-rw-r--r-- | apps/plugins/mpegplayer/mpeg_settings.c | 9 | ||||
-rw-r--r-- | apps/plugins/mpegplayer/mpegplayer.c | 16 |
2 files changed, 12 insertions, 13 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(); |
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c index eaf8f246c6..82ebfb1111 100644 --- a/apps/plugins/mpegplayer/mpegplayer.c +++ b/apps/plugins/mpegplayer/mpegplayer.c | |||
@@ -621,7 +621,7 @@ static void draw_putsxy_oriented(int x, int y, const char *str) | |||
621 | } | 621 | } |
622 | #endif /* LCD_PORTRAIT */ | 622 | #endif /* LCD_PORTRAIT */ |
623 | 623 | ||
624 | #if defined(HAVE_LCD_ENABLE) && defined(HAVE_LCD_COLOR) | 624 | #if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP) |
625 | /* So we can refresh the overlay */ | 625 | /* So we can refresh the overlay */ |
626 | static void wvs_lcd_enable_hook(void) | 626 | static void wvs_lcd_enable_hook(void) |
627 | { | 627 | { |
@@ -635,12 +635,12 @@ static void wvs_backlight_on_video_mode(bool video_on) | |||
635 | /* Turn off backlight timeout */ | 635 | /* Turn off backlight timeout */ |
636 | /* backlight control in lib/helper.c */ | 636 | /* backlight control in lib/helper.c */ |
637 | backlight_force_on(); | 637 | backlight_force_on(); |
638 | #if defined(HAVE_LCD_ENABLE) && defined(HAVE_LCD_COLOR) | 638 | #if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP) |
639 | rb->lcd_set_enable_hook(NULL); | 639 | rb->lcd_activation_set_hook(NULL); |
640 | #endif | 640 | #endif |
641 | } else { | 641 | } else { |
642 | #if defined(HAVE_LCD_ENABLE) && defined(HAVE_LCD_COLOR) | 642 | #if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP) |
643 | rb->lcd_set_enable_hook(wvs_lcd_enable_hook); | 643 | rb->lcd_activation_set_hook(wvs_lcd_enable_hook); |
644 | #endif | 644 | #endif |
645 | /* Revert to user's backlight settings */ | 645 | /* Revert to user's backlight settings */ |
646 | backlight_use_settings(); | 646 | backlight_use_settings(); |
@@ -1485,7 +1485,7 @@ static void button_loop(void) | |||
1485 | continue; | 1485 | continue; |
1486 | } /* BUTTON_NONE: */ | 1486 | } /* BUTTON_NONE: */ |
1487 | 1487 | ||
1488 | #ifdef HAVE_LCD_ENABLE | 1488 | #if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP) |
1489 | case LCD_ENABLE_EVENT_1: | 1489 | case LCD_ENABLE_EVENT_1: |
1490 | { | 1490 | { |
1491 | /* Draw the current frame if prepared already */ | 1491 | /* Draw the current frame if prepared already */ |
@@ -1628,10 +1628,10 @@ static void button_loop(void) | |||
1628 | 1628 | ||
1629 | wvs_stop(); | 1629 | wvs_stop(); |
1630 | 1630 | ||
1631 | #if defined(HAVE_LCD_ENABLE) && defined(HAVE_LCD_COLOR) | 1631 | #if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP) |
1632 | /* Be sure hook is removed before exiting since the stop will put it | 1632 | /* Be sure hook is removed before exiting since the stop will put it |
1633 | * back because of the backlight restore. */ | 1633 | * back because of the backlight restore. */ |
1634 | rb->lcd_set_enable_hook(NULL); | 1634 | rb->lcd_activation_set_hook(NULL); |
1635 | #endif | 1635 | #endif |
1636 | 1636 | ||
1637 | rb->lcd_setfont(FONT_UI); | 1637 | rb->lcd_setfont(FONT_UI); |