Merge branch 'v0.19.x'

This commit is contained in:
Max Kellermann
2014-12-09 14:03:47 +01:00
2 changed files with 11 additions and 6 deletions

4
NEWS
View File

@@ -12,6 +12,10 @@ ver 0.20 (not yet released)
* reset song priority on playback * reset song priority on playback
* remove dependency on GLib * remove dependency on GLib
ver 0.19.7 (not yet released)
* playlist
- don't skip non-existent songs in "listplaylist"
ver 0.19.6 (2014/12/08) ver 0.19.6 (2014/12/08)
* decoder * decoder
- ffmpeg: support FFmpeg 2.5 - ffmpeg: support FFmpeg 2.5

View File

@@ -43,12 +43,13 @@ playlist_provider_print(Client &client, const char *uri,
DetachedSong *song; DetachedSong *song;
while ((song = e.NextSong()) != nullptr) { while ((song = e.NextSong()) != nullptr) {
if (playlist_check_translate_song(*song, base_uri.c_str(), if (playlist_check_translate_song(*song, base_uri.c_str(),
loader)) { loader) &&
if (detail) detail)
song_print_info(client, *song); song_print_info(client, *song);
else else
song_print_uri(client, *song); /* fallback if no detail was requested or no
} detail was available */
song_print_uri(client, *song);
delete song; delete song;
} }