Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix FS#8201 and correct fix for FS#8040 by making the track unbuffer callback be called from where it should be: clear_track_info, and writing track metadata back to the main buffer *before* the callback is called and the track erased. This simplifies audio_clear_track_entries.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15748 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Nicolas Pennequin 2007-11-22 00:20:37 +00:00
parent e7988b8d88
commit c44d2bd4cb
1 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
apps/playback.c
View file

@ -316,6 +316,11 @@ static bool clear_track_info(struct track_info *track)
} }
if (track->id3_hid >= 0) { if (track->id3_hid >= 0) {
if (track->event_sent && track_unbuffer_callback) {
/* If there is an unbuffer callback, call it */
track_unbuffer_callback(bufgetid3(track->id3_hid));
}
if (bufclose(track->id3_hid)) if (bufclose(track->id3_hid))
track->id3_hid = -1; track->id3_hid = -1;
else else
@ -1473,6 +1478,7 @@ static void low_buffer_callback(void)
queue_post(&audio_queue, Q_AUDIO_FILL_BUFFER, 0); queue_post(&audio_queue, Q_AUDIO_FILL_BUFFER, 0);
} }
/* Clear tracks between write and read, non inclusive */
static void audio_clear_track_entries(bool clear_unbuffered) static void audio_clear_track_entries(bool clear_unbuffered)
{ {
int cur_idx = track_widx; int cur_idx = track_widx;
@ -1493,20 +1499,12 @@ static void audio_clear_track_entries(bool clear_unbuffered)
/* If the track is buffered, conditionally clear/notify, /* If the track is buffered, conditionally clear/notify,
* otherwise clear the track if that option is selected */ * otherwise clear the track if that option is selected */
if (tracks[cur_idx].event_sent) if (tracks[cur_idx].event_sent || clear_unbuffered)
{
/* If there is an unbuffer callback, call it, otherwise,
* just clear the track */
if (track_unbuffer_callback && tracks[cur_idx].id3_hid >= 0)
track_unbuffer_callback(bufgetid3(tracks[cur_idx].id3_hid));
clear_track_info(&tracks[cur_idx]);
}
else if (clear_unbuffered)
clear_track_info(&tracks[cur_idx]); clear_track_info(&tracks[cur_idx]);
} }
} }
/* Clear all tracks */
static bool audio_release_tracks(void) static bool audio_release_tracks(void)
{ {
int i, cur_idx; int i, cur_idx;
@ -2008,9 +2006,15 @@ static int audio_check_new_track(void)
new_playlist = false; new_playlist = false;
} }
/* Save the old track's metadata to allow the WPS to display it */ /* Save the track metadata to allow the WPS to display it
while PCM finishes playing that track */
copy_mp3entry(&prevtrack_id3, &curtrack_id3); copy_mp3entry(&prevtrack_id3, &curtrack_id3);
/* Update the main buffer copy of the track metadata with the one
the codec has been using (for the unbuffer callbacks) */
if (CUR_TI->id3_hid >= 0)
copy_mp3entry(bufgetid3(CUR_TI->id3_hid), &curtrack_id3);
/* Save a pointer to the old track to allow later clearing */ /* Save a pointer to the old track to allow later clearing */
prev_ti = CUR_TI; prev_ti = CUR_TI;
@ -2304,12 +2308,6 @@ static void audio_finalise_track_change(void)
automatic_skip = false; automatic_skip = false;
} }
/* Copy the track back to the main buffer */
if (prev_ti && prev_ti->id3_hid >= 0)
{
copy_mp3entry(bufgetid3(prev_ti->id3_hid), &prevtrack_id3);
}
/* Invalidate prevtrack_id3 */ /* Invalidate prevtrack_id3 */
prevtrack_id3.path[0] = 0; prevtrack_id3.path[0] = 0;