summaryrefslogtreecommitdiff
path: root/apps/plugins/mpegplayer/mpegplayer.c
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2009-10-20 21:54:59 +0000
committerThomas Martitz <kugel@rockbox.org>2009-10-20 21:54:59 +0000
commitd85c3ec41020a6c56b0d5d95a9ed790f57d73c6e (patch)
tree2f51ed47fee689024ed8c145634044362c8ed7d5 /apps/plugins/mpegplayer/mpegplayer.c
parent774bacc692b4d5c7b769bb88d24e182db9e4656f (diff)
downloadrockbox-d85c3ec41020a6c56b0d5d95a9ed790f57d73c6e.tar.gz
rockbox-d85c3ec41020a6c56b0d5d95a9ed790f57d73c6e.zip
Convert lcd_activation callbacks to use the event system to allow for multiple parallel callbacks (for custom statusbar).
Increase maximum event count as we need more (I actually had a report about it during custom statusbar testing). Removed corresponding functions from the core and plugin api. Bump min version and sort. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23302 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/mpegplayer/mpegplayer.c')
-rw-r--r--apps/plugins/mpegplayer/mpegplayer.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c
index 0cb5f94d19..7c52a47260 100644
--- a/apps/plugins/mpegplayer/mpegplayer.c
+++ b/apps/plugins/mpegplayer/mpegplayer.c
@@ -652,8 +652,9 @@ static void draw_putsxy_oriented(int x, int y, const char *str)
652 652
653#if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP) 653#if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP)
654/* So we can refresh the overlay */ 654/* So we can refresh the overlay */
655static void wvs_lcd_enable_hook(void) 655static void wvs_lcd_enable_hook(void* param)
656{ 656{
657 (void)param;
657 rb->queue_post(rb->button_queue, LCD_ENABLE_EVENT_1, 0); 658 rb->queue_post(rb->button_queue, LCD_ENABLE_EVENT_1, 0);
658} 659}
659#endif 660#endif
@@ -665,11 +666,11 @@ static void wvs_backlight_on_video_mode(bool video_on)
665 /* backlight control in lib/helper.c */ 666 /* backlight control in lib/helper.c */
666 backlight_force_on(); 667 backlight_force_on();
667#if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP) 668#if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP)
668 rb->lcd_activation_set_hook(NULL); 669 rb->remove_event(LCD_EVENT_ACTIVATION, wvs_lcd_enable_hook);
669#endif 670#endif
670 } else { 671 } else {
671#if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP) 672#if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP)
672 rb->lcd_activation_set_hook(wvs_lcd_enable_hook); 673 rb->add_event(LCD_EVENT_ACTIVATION, false, wvs_lcd_enable_hook);
673#endif 674#endif
674 /* Revert to user's backlight settings */ 675 /* Revert to user's backlight settings */
675 backlight_use_settings(); 676 backlight_use_settings();
@@ -1671,7 +1672,7 @@ static void button_loop(void)
1671#if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP) 1672#if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP)
1672 /* Be sure hook is removed before exiting since the stop will put it 1673 /* Be sure hook is removed before exiting since the stop will put it
1673 * back because of the backlight restore. */ 1674 * back because of the backlight restore. */
1674 rb->lcd_activation_set_hook(NULL); 1675 rb->remove_event(LCD_EVENT_ACTIVATION, wvs_lcd_enable_hook);
1675#endif 1676#endif
1676 1677
1677 rb->lcd_setfont(FONT_UI); 1678 rb->lcd_setfont(FONT_UI);