summaryrefslogtreecommitdiffstats
path: root/apps/tagtree.c
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/tagtree.c
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/tagtree.c')
-rw-r--r--apps/tagtree.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/apps/tagtree.c b/apps/tagtree.c
index ff364ec5e4..b3b94a489e 100644
--- a/apps/tagtree.c
+++ b/apps/tagtree.c
@@ -804,10 +804,11 @@ static int nat_compare(const void *p1, const void *p2)
return strnatcasecmp(e1->name, e2->name);
}
-static void tagtree_buffer_event(void *data)
+static void tagtree_buffer_event(unsigned short id, void *ev_data)
{
+ (void)id;
struct tagcache_search tcs;
- struct mp3entry *id3 = ((struct track_event *)data)->id3;
+ struct mp3entry *id3 = ((struct track_event *)ev_data)->id3;
bool runtimedb = global_settings.runtimedb;
bool autoresume = global_settings.autoresume_enable;
@@ -868,9 +869,10 @@ static void tagtree_buffer_event(void *data)
tagcache_search_finish(&tcs);
}
-static void tagtree_track_finish_event(void *data)
+static void tagtree_track_finish_event(unsigned short id, void *ev_data)
{
- struct track_event *te = (struct track_event *)data;
+ (void)id;
+ struct track_event *te = (struct track_event *)ev_data;
struct mp3entry *id3 = te->id3;
long tagcache_idx = id3->tagcache_idx;
@@ -1183,8 +1185,8 @@ void tagtree_init(void)
if (rootmenu < 0)
rootmenu = 0;
- add_event(PLAYBACK_EVENT_TRACK_BUFFER, false, tagtree_buffer_event);
- add_event(PLAYBACK_EVENT_TRACK_FINISH, false, tagtree_track_finish_event);
+ add_event(PLAYBACK_EVENT_TRACK_BUFFER, tagtree_buffer_event);
+ add_event(PLAYBACK_EVENT_TRACK_FINISH, tagtree_track_finish_event);
core_shrink(tagtree_handle, core_get_data(tagtree_handle), tagtree_buf_used);
}