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/iap | |
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/iap')
-rw-r--r-- | apps/iap/iap-core.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/apps/iap/iap-core.c b/apps/iap/iap-core.c index 7226a908c5..4fa9c09a47 100644 --- a/apps/iap/iap-core.c +++ b/apps/iap/iap-core.c | |||
@@ -349,8 +349,9 @@ static void iap_thread(void) | |||
349 | } | 349 | } |
350 | 350 | ||
351 | /* called by playback when the next track starts */ | 351 | /* called by playback when the next track starts */ |
352 | static void iap_track_changed(void *ignored) | 352 | static void iap_track_changed(unsigned short id, void *ignored) |
353 | { | 353 | { |
354 | (void)id; | ||
354 | (void)ignored; | 355 | (void)ignored; |
355 | if ((interface_state == IST_EXTENDED) && device.do_notify) { | 356 | if ((interface_state == IST_EXTENDED) && device.do_notify) { |
356 | long playlist_pos = playlist_next(0); | 357 | long playlist_pos = playlist_next(0); |
@@ -401,7 +402,7 @@ static void iap_start(void) | |||
401 | if (!tid) | 402 | if (!tid) |
402 | panicf("Could not create iap thread"); | 403 | panicf("Could not create iap thread"); |
403 | timeout_register(&iap_task_tmo, iap_task, MS_TO_TICKS(100), (intptr_t)NULL); | 404 | timeout_register(&iap_task_tmo, iap_task, MS_TO_TICKS(100), (intptr_t)NULL); |
404 | add_event(PLAYBACK_EVENT_TRACK_CHANGE, false, iap_track_changed); | 405 | add_event(PLAYBACK_EVENT_TRACK_CHANGE, iap_track_changed); |
405 | 406 | ||
406 | /* Since we cannot allocate memory while in interrupt context | 407 | /* Since we cannot allocate memory while in interrupt context |
407 | * post a message to our own queue to get that done | 408 | * post a message to our own queue to get that done |