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/tagtree.c | |
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/tagtree.c')
-rw-r--r-- | apps/tagtree.c | 14 |
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) | |||
804 | return strnatcasecmp(e1->name, e2->name); | 804 | return strnatcasecmp(e1->name, e2->name); |
805 | } | 805 | } |
806 | 806 | ||
807 | static void tagtree_buffer_event(void *data) | 807 | static void tagtree_buffer_event(unsigned short id, void *ev_data) |
808 | { | 808 | { |
809 | (void)id; | ||
809 | struct tagcache_search tcs; | 810 | struct tagcache_search tcs; |
810 | struct mp3entry *id3 = ((struct track_event *)data)->id3; | 811 | struct mp3entry *id3 = ((struct track_event *)ev_data)->id3; |
811 | 812 | ||
812 | bool runtimedb = global_settings.runtimedb; | 813 | bool runtimedb = global_settings.runtimedb; |
813 | bool autoresume = global_settings.autoresume_enable; | 814 | bool autoresume = global_settings.autoresume_enable; |
@@ -868,9 +869,10 @@ static void tagtree_buffer_event(void *data) | |||
868 | tagcache_search_finish(&tcs); | 869 | tagcache_search_finish(&tcs); |
869 | } | 870 | } |
870 | 871 | ||
871 | static void tagtree_track_finish_event(void *data) | 872 | static void tagtree_track_finish_event(unsigned short id, void *ev_data) |
872 | { | 873 | { |
873 | struct track_event *te = (struct track_event *)data; | 874 | (void)id; |
875 | struct track_event *te = (struct track_event *)ev_data; | ||
874 | struct mp3entry *id3 = te->id3; | 876 | struct mp3entry *id3 = te->id3; |
875 | 877 | ||
876 | long tagcache_idx = id3->tagcache_idx; | 878 | long tagcache_idx = id3->tagcache_idx; |
@@ -1183,8 +1185,8 @@ void tagtree_init(void) | |||
1183 | if (rootmenu < 0) | 1185 | if (rootmenu < 0) |
1184 | rootmenu = 0; | 1186 | rootmenu = 0; |
1185 | 1187 | ||
1186 | add_event(PLAYBACK_EVENT_TRACK_BUFFER, false, tagtree_buffer_event); | 1188 | add_event(PLAYBACK_EVENT_TRACK_BUFFER, tagtree_buffer_event); |
1187 | add_event(PLAYBACK_EVENT_TRACK_FINISH, false, tagtree_track_finish_event); | 1189 | add_event(PLAYBACK_EVENT_TRACK_FINISH, tagtree_track_finish_event); |
1188 | 1190 | ||
1189 | core_shrink(tagtree_handle, core_get_data(tagtree_handle), tagtree_buf_used); | 1191 | core_shrink(tagtree_handle, core_get_data(tagtree_handle), tagtree_buf_used); |
1190 | } | 1192 | } |