summaryrefslogtreecommitdiffstats
path: root/apps/hosted/android
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2014-03-14 23:15:16 +0100
committerThomas Martitz <kugel@rockbox.org>2014-03-14 23:36:30 +0100
commit470989bd708d9a425dbbf2d83b8fcbd0a8d0f488 (patch)
treef3bef37bc0f8ff7da4beddad9903209ced1bc25a /apps/hosted/android
parent50f0dd80d660b332a1739e07a630c2cef1b678c6 (diff)
downloadrockbox-470989bd708d9a425dbbf2d83b8fcbd0a8d0f488.tar.gz
rockbox-470989bd708d9a425dbbf2d83b8fcbd0a8d0f488.tar.bz2
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/hosted/android')
-rw-r--r--apps/hosted/android/notification.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/apps/hosted/android/notification.c b/apps/hosted/android/notification.c
index 874cd3bcef..66715d26f9 100644
--- a/apps/hosted/android/notification.c
+++ b/apps/hosted/android/notification.c
@@ -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);
}