oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

playlist/CloseSongEnumerator: new wrapper class

Browse Source 
Simplifies a lot of code, because we don't need to return both the
SongEnumerator and the InputStream.
This commit is contained in:
Max Kellermann
2014-02-07 20:27:24 +01:00
parent ffd16b55a6
commit 8549ccfd8c
11 changed files with 111 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/playlist/PlaylistRegistry.cxx
View File

@@ -20,6 +20,7 @@
#include "config.h"
#include "PlaylistRegistry.hxx"
#include "PlaylistPlugin.hxx"
#include "CloseSongEnumerator.hxx"
#include "plugins/ExtM3uPlaylistPlugin.hxx"
#include "plugins/M3uPlaylistPlugin.hxx"
#include "plugins/XspfPlaylistPlugin.hxx"
@@ -279,8 +280,7 @@ playlist_suffix_supported(const char *suffix)
}
SongEnumerator *
playlist_list_open_path(const char *path_fs, Mutex &mutex, Cond &cond,
InputStream **is_r)
playlist_list_open_path(const char *path_fs, Mutex &mutex, Cond &cond)
{
const char *suffix;
@@ -301,7 +301,7 @@ playlist_list_open_path(const char *path_fs, Mutex &mutex, Cond &cond,
auto playlist = playlist_list_open_stream_suffix(*is, suffix);
if (playlist != nullptr)
*is_r = is;
playlist = new CloseSongEnumerator(playlist, is);
else
is->Close();