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

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

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

15
apps/playlist_viewer.c
View file

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