devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Try to fix FS#9502: end playback properly if no valid files were found in a playlist.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18891 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Magnus Holmgren 2008-10-26 20:15:10 +00:00
parent e511017293
commit 1b9991c229
1 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

9
apps/playback.c
View file

@ -290,6 +290,7 @@ static void audio_thread(void);
static void audio_initiate_track_change(long direction); static void audio_initiate_track_change(long direction);
static bool audio_have_tracks(void); static bool audio_have_tracks(void);
static void audio_reset_buffer(void); static void audio_reset_buffer(void);
static void audio_stop_playback(void);
/* Codec thread */ /* Codec thread */
extern struct codec_api ci; extern struct codec_api ci;
@ -1657,6 +1658,13 @@ static bool audio_load_track(size_t offset, bool start_play)
logf("End-of-playlist"); logf("End-of-playlist");
memset(&lasttrack_id3, 0, sizeof(struct mp3entry)); memset(&lasttrack_id3, 0, sizeof(struct mp3entry));
filling = STATE_END_OF_PLAYLIST; filling = STATE_END_OF_PLAYLIST;
if (curtrack_id3.length == 0 && curtrack_id3.filesize == 0)
{
/* Stop playback if no valid track was found. */
audio_stop_playback();
}
return false; return false;
} }
@ -1692,6 +1700,7 @@ static bool audio_load_track(size_t offset, bool start_play)
if (track_widx == track_ridx) if (track_widx == track_ridx)
{ {
/* TODO: Superfluos buffering call? */
buf_request_buffer_handle(tracks[track_widx].id3_hid); buf_request_buffer_handle(tracks[track_widx].id3_hid);
copy_mp3entry(&curtrack_id3, bufgetid3(tracks[track_widx].id3_hid)); copy_mp3entry(&curtrack_id3, bufgetid3(tracks[track_widx].id3_hid));
curtrack_id3.offset = offset; curtrack_id3.offset = offset;