nihilazo
/
rockbox
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Stop playback and exit viewer if last track in current playlist is removed 

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9739 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Hardeep Sidhu 2006-04-20 07:30:28 +00:00
parent 24f0a374c6
commit c7f304e1b9
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
apps/playlist_viewer.c
View File

@ -412,7 +412,7 @@ static bool update_playlist(bool force)
{
/* Reload tracks */
viewer.num_tracks = nb_tracks;
if (viewer.num_tracks < 0)
if (viewer.num_tracks <= 0)
return false;
playlist_buffer_load_entries_screen(&viewer.buffer, FORWARD);
if (viewer.buffer.num_loaded <= 0)
@ -457,16 +457,21 @@ static int onplay_menu(int index)
playlist_delete(viewer.playlist, current_track->index);
if (current)
{
/* Start playing new track except if it's the last track
in the playlist and repeat mode is disabled */
current_track=
playlist_buffer_get_track(&viewer.buffer, index);
if (current_track->display_index != viewer.num_tracks ||
global_settings.repeat_mode == REPEAT_ALL)
if (playlist_amount_ex(viewer.playlist) <= 0)
audio_stop();
else
{
talk_buffer_steal(); /* will use the mp3 buffer */
audio_play(0);
viewer.current_playing_track = -1;
/* Start playing new track except if it's the lasttrack
track in the playlist and repeat mode is disabled */
current_track =
playlist_buffer_get_track(&viewer.buffer, index);
if (current_track->display_index!=viewer.num_tracks ||
global_settings.repeat_mode == REPEAT_ALL)
{
talk_buffer_steal(); /* will use the mp3 buffer */
audio_play(0);
viewer.current_playing_track = -1;
}
}
}
ret = 1;