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

Some bugfixes after r17109:

Browse source 
* Fix FS#8893 by plugging a file descriptor leak in audio_load_track.
* Fix a possible null pointer dereference by not allowing audio_current_track to return NULL.
* Make audio_current_track return prevtrack_id3 only during an automatic track skip. Fixes the wrong metadata being displayed for a short time after a backwards skip.
-Cette ligne, et les suivantes ci-dessous, seront ignorées--

M    apps/playback.c


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17126 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Nicolas Pennequin 2008-04-15 19:20:57 +00:00
parent 7acc5538bd
commit b36d3c0be2
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/playback.c
View file

@ -552,7 +552,7 @@ struct mp3entry* audio_current_track(void)
/* The usual case */
return &curtrack_id3;
}
else if (offset == -1 && *prevtrack_id3.path)
else if (automatic_skip && offset == -1 && *prevtrack_id3.path)
{
/* We're in a track transition. The codec has moved on to the nex track,
but the audio being played is still the same (now previous) track.
@ -563,7 +563,8 @@ struct mp3entry* audio_current_track(void)
else if (tracks[cur_idx].id3_hid >= 0)
{
/* Get the ID3 metadata from the main buffer */
return bufgetid3(tracks[cur_idx].id3_hid);
struct mp3entry *ret = bufgetid3(tracks[cur_idx].id3_hid);
if (ret) return ret;
}
/* We didn't find the ID3 metadata, so we fill temp_id3 with the little info
@ -1648,8 +1649,6 @@ static bool audio_load_track(size_t offset, bool start_play)
return false;
}
close(fd);
if (track_widx == track_ridx)
{
buf_request_buffer_handle(tracks[track_widx].id3_hid);
@ -1664,6 +1663,7 @@ static bool audio_load_track(size_t offset, bool start_play)
}
}
close(fd);
return true;
}