diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2008-03-17 05:22:53 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2008-03-17 05:22:53 +0000 |
commit | a67e5d89efe6c3fcf5a2eaf27aac1c14f024ee27 (patch) | |
tree | 2e62c72ea2e45410216bdbd62b70101db0f4e7ca /firmware/mpeg.c | |
parent | c6b6bad18fcd68182574086c2eb2a1da30d36d25 (diff) | |
download | rockbox-a67e5d89efe6c3fcf5a2eaf27aac1c14f024ee27.tar.gz rockbox-a67e5d89efe6c3fcf5a2eaf27aac1c14f024ee27.zip |
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
Diffstat (limited to 'firmware/mpeg.c')
-rw-r--r-- | firmware/mpeg.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/firmware/mpeg.c b/firmware/mpeg.c index 9023c304d2..f2322e563b 100644 --- a/firmware/mpeg.c +++ b/firmware/mpeg.c | |||
@@ -485,7 +485,7 @@ static void generate_unbuffer_events(void) | |||
485 | for (i = 0; i < numentries; i++) | 485 | for (i = 0; i < numentries; i++) |
486 | { | 486 | { |
487 | /* Send an event to notify that track has finished. */ | 487 | /* Send an event to notify that track has finished. */ |
488 | send_event(PLAYBACK_EVENT_TRACK_FINISH, false, &trackdata[cur_idx].id3); | 488 | send_event(PLAYBACK_EVENT_TRACK_FINISH, &trackdata[cur_idx].id3); |
489 | cur_idx = (cur_idx + 1) & MAX_TRACK_ENTRIES_MASK; | 489 | cur_idx = (cur_idx + 1) & MAX_TRACK_ENTRIES_MASK; |
490 | } | 490 | } |
491 | } | 491 | } |
@@ -499,7 +499,7 @@ static void generate_postbuffer_events(void) | |||
499 | 499 | ||
500 | for (i = 0; i < numentries; i++) | 500 | for (i = 0; i < numentries; i++) |
501 | { | 501 | { |
502 | send_event(PLAYBACK_EVENT_TRACK_BUFFER, false, &trackdata[cur_idx].id3); | 502 | send_event(PLAYBACK_EVENT_TRACK_BUFFER, &trackdata[cur_idx].id3); |
503 | cur_idx = (cur_idx + 1) & MAX_TRACK_ENTRIES_MASK; | 503 | cur_idx = (cur_idx + 1) & MAX_TRACK_ENTRIES_MASK; |
504 | } | 504 | } |
505 | } | 505 | } |
@@ -1049,7 +1049,7 @@ static void track_change(void) | |||
1049 | if (num_tracks_in_memory() > 0) | 1049 | if (num_tracks_in_memory() > 0) |
1050 | { | 1050 | { |
1051 | remove_current_tag(); | 1051 | remove_current_tag(); |
1052 | send_event(PLAYBACK_EVENT_TRACK_CHANGE, false, audio_current_track()); | 1052 | send_event(PLAYBACK_EVENT_TRACK_CHANGE, audio_current_track()); |
1053 | update_playlist(); | 1053 | update_playlist(); |
1054 | } | 1054 | } |
1055 | 1055 | ||
@@ -1102,7 +1102,7 @@ static void start_playback_if_ready(void) | |||
1102 | if (play_pending_track_change) | 1102 | if (play_pending_track_change) |
1103 | { | 1103 | { |
1104 | play_pending_track_change = false; | 1104 | play_pending_track_change = false; |
1105 | send_event(PLAYBACK_EVENT_TRACK_CHANGE, false, audio_current_track()); | 1105 | send_event(PLAYBACK_EVENT_TRACK_CHANGE, audio_current_track()); |
1106 | } | 1106 | } |
1107 | play_pending = false; | 1107 | play_pending = false; |
1108 | } | 1108 | } |