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
This commit is contained in:
Thomas Martitz 2014-03-14 23:15:16 +01:00
parent 50f0dd80d6
commit 470989bd70
25 changed files with 247 additions and 149 deletions

View file

@ -44,8 +44,9 @@ static const struct dim dim = { .width = 200, .height = 200 };
/*
* notify about track change, and show track info */
static void track_changed_callback(void *param)
static void track_changed_callback(unsigned short id, void *param)
{
(void)id;
struct mp3entry* id3 = ((struct track_event *)param)->id3;
JNIEnv e = *env_ptr;
if (id3)
@ -106,8 +107,9 @@ static void track_changed_callback(void *param)
/*
* notify about track finishing */
static void track_finished_callback(void *param)
static void track_finished_callback(unsigned short id, void *param)
{
(void)id;
if (((struct track_event *)param)->flags & TEF_REWIND)
return; /* Not a true track end */
@ -144,6 +146,6 @@ void notification_init(void)
finishNotification = e->GetMethodID(env_ptr, class, "finishNotification",
"()V");
add_event(PLAYBACK_EVENT_TRACK_CHANGE, false, track_changed_callback);
add_event(PLAYBACK_EVENT_TRACK_FINISH, false, track_finished_callback);
add_event(PLAYBACK_EVENT_TRACK_CHANGE track_changed_callback);
add_event(PLAYBACK_EVENT_TRACK_FINISH track_finished_callback);
}