From a67e5d89efe6c3fcf5a2eaf27aac1c14f024ee27 Mon Sep 17 00:00:00 2001 From: Jonathan Gordon Date: Mon, 17 Mar 2008 05:22:53 +0000 Subject: It makes more sense for the callback registrar to decide if its a "oneshot" then the callback caller. (Doing it this way means playback could(/should?) registar a disk spinup callback at init which is called every spinup without needing to be reregistered) git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16685 a1c6a512-1295-4272-9138-f99709370657 --- apps/playback.c | 6 +++--- apps/scrobbler.c | 2 +- apps/tagtree.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'apps') diff --git a/apps/playback.c b/apps/playback.c index ee1787e..7eecd23 100644 --- a/apps/playback.c +++ b/apps/playback.c @@ -1731,7 +1731,7 @@ static bool audio_load_track(int offset, bool start_play) { if (get_metadata(&id3, fd, trackname)) { - send_event(PLAYBACK_EVENT_TRACK_BUFFER, false, &id3); + send_event(PLAYBACK_EVENT_TRACK_BUFFER, &id3); tracks[track_widx].id3_hid = bufalloc(&id3, sizeof(struct mp3entry), TYPE_ID3); @@ -1968,7 +1968,7 @@ static int audio_check_new_track(void) bool end_of_playlist; /* Temporary flag, not the same as playlist_end */ /* Now it's good time to send track unbuffer events. */ - send_event(PLAYBACK_EVENT_TRACK_FINISH, false, &curtrack_id3); + send_event(PLAYBACK_EVENT_TRACK_FINISH, &curtrack_id3); if (dir_skip) { @@ -2339,7 +2339,7 @@ static void audio_finalise_track_change(void) bufgetid3(prev_ti->id3_hid)->elapsed = 0; } - send_event(PLAYBACK_EVENT_TRACK_CHANGE, false, &curtrack_id3); + send_event(PLAYBACK_EVENT_TRACK_CHANGE, &curtrack_id3); track_changed = true; playlist_update_resume_info(audio_current_track()); diff --git a/apps/scrobbler.c b/apps/scrobbler.c index 2f60e85..85285cb 100644 --- a/apps/scrobbler.c +++ b/apps/scrobbler.c @@ -227,7 +227,7 @@ int scrobbler_init(void) scrobbler_cache = buffer_alloc(SCROBBLER_MAX_CACHE*SCROBBLER_CACHE_LEN); - add_event(PLAYBACK_EVENT_TRACK_CHANGE, scrobbler_change_event); + add_event(PLAYBACK_EVENT_TRACK_CHANGE, false, scrobbler_change_event); cache_pos = 0; pending = false; scrobbler_initialised = true; diff --git a/apps/tagtree.c b/apps/tagtree.c index 4572204..faffb00 100644 --- a/apps/tagtree.c +++ b/apps/tagtree.c @@ -925,8 +925,8 @@ void tagtree_init(void) uniqbuf = buffer_alloc(UNIQBUF_SIZE); - add_event(PLAYBACK_EVENT_TRACK_BUFFER, tagtree_buffer_event); - add_event(PLAYBACK_EVENT_TRACK_FINISH, tagtree_track_finish_event); + add_event(PLAYBACK_EVENT_TRACK_BUFFER, false, tagtree_buffer_event); + add_event(PLAYBACK_EVENT_TRACK_FINISH, false, tagtree_track_finish_event); } static bool show_search_progress(bool init, int count) -- cgit v1.1