diff options
author | Thomas Martitz <kugel@rockbox.org> | 2014-03-14 23:15:16 +0100 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2014-03-14 23:36:30 +0100 |
commit | 470989bd708d9a425dbbf2d83b8fcbd0a8d0f488 (patch) | |
tree | f3bef37bc0f8ff7da4beddad9903209ced1bc25a /apps/plugins/mpegplayer | |
parent | 50f0dd80d660b332a1739e07a630c2cef1b678c6 (diff) | |
download | rockbox-470989bd708d9a425dbbf2d83b8fcbd0a8d0f488.tar.gz rockbox-470989bd708d9a425dbbf2d83b8fcbd0a8d0f488.zip |
events: Rework event subsystem (add_event, send_event) to be more versatile.
add_event_ex is added that takes an extra user_data pointer. This pointer is
passed to the callback (add_event and add_event_ex have slightly different
callbacks types). All callbacks also get the event id passed. Events added
with add_event_ex must be removed with remove_event_ex because the user_data
pointer must match in addition to the callback pointer.
On the other add_event is simplified to omit the oneshort parameter which
was almost always false (still there with add_event_ex).
As a side effect the ata_idle_notify callbacks are changed as well, they
do not take a data parameter anymore which was always NULL anyway.
This commit also adds some documentation to events.h
Change-Id: I13e29a0f88ef908f175b376d83550f9e0231f772
Diffstat (limited to 'apps/plugins/mpegplayer')
-rw-r--r-- | apps/plugins/mpegplayer/mpeg_settings.c | 5 | ||||
-rw-r--r-- | apps/plugins/mpegplayer/mpegplayer.c | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/apps/plugins/mpegplayer/mpeg_settings.c b/apps/plugins/mpegplayer/mpeg_settings.c index bcef4c66bf..b5c9c6bbc8 100644 --- a/apps/plugins/mpegplayer/mpeg_settings.c +++ b/apps/plugins/mpegplayer/mpeg_settings.c | |||
@@ -677,8 +677,9 @@ static uint32_t increment_time(uint32_t val, int32_t amount, uint32_t range) | |||
677 | } | 677 | } |
678 | 678 | ||
679 | #if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP) | 679 | #if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP) |
680 | static void get_start_time_lcd_enable_hook(void *param) | 680 | static void get_start_time_lcd_enable_hook(unsigned short id, void *param) |
681 | { | 681 | { |
682 | (void)id; | ||
682 | (void)param; | 683 | (void)param; |
683 | rb->queue_post(rb->button_queue, LCD_ENABLE_EVENT_0, 0); | 684 | rb->queue_post(rb->button_queue, LCD_ENABLE_EVENT_0, 0); |
684 | } | 685 | } |
@@ -698,7 +699,7 @@ static int get_start_time(uint32_t duration) | |||
698 | mylcd_update(); | 699 | mylcd_update(); |
699 | 700 | ||
700 | #if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP) | 701 | #if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP) |
701 | rb->add_event(LCD_EVENT_ACTIVATION, false, get_start_time_lcd_enable_hook); | 702 | rb->add_event(LCD_EVENT_ACTIVATION, get_start_time_lcd_enable_hook); |
702 | #endif | 703 | #endif |
703 | 704 | ||
704 | draw_slider(0, 100, &rc_bound); | 705 | draw_slider(0, 100, &rc_bound); |
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c index 928c48ab11..467c961912 100644 --- a/apps/plugins/mpegplayer/mpegplayer.c +++ b/apps/plugins/mpegplayer/mpegplayer.c | |||
@@ -1026,8 +1026,9 @@ static void fps_init(void) | |||
1026 | 1026 | ||
1027 | #if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP) | 1027 | #if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP) |
1028 | /* So we can refresh the overlay */ | 1028 | /* So we can refresh the overlay */ |
1029 | static void osd_lcd_enable_hook(void* param) | 1029 | static void osd_lcd_enable_hook(unsigned short id, void* param) |
1030 | { | 1030 | { |
1031 | (void)id; | ||
1031 | (void)param; | 1032 | (void)param; |
1032 | rb->queue_post(rb->button_queue, LCD_ENABLE_EVENT_1, 0); | 1033 | rb->queue_post(rb->button_queue, LCD_ENABLE_EVENT_1, 0); |
1033 | } | 1034 | } |
@@ -1043,7 +1044,7 @@ static void osd_backlight_on_video_mode(bool video_on) | |||
1043 | #endif | 1044 | #endif |
1044 | } else { | 1045 | } else { |
1045 | #if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP) | 1046 | #if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP) |
1046 | rb->add_event(LCD_EVENT_ACTIVATION, false, osd_lcd_enable_hook); | 1047 | rb->add_event(LCD_EVENT_ACTIVATION, osd_lcd_enable_hook); |
1047 | #endif | 1048 | #endif |
1048 | /* Revert to user's backlight settings */ | 1049 | /* Revert to user's backlight settings */ |
1049 | backlight_use_settings(); | 1050 | backlight_use_settings(); |