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

Playlist{Any,Registry,Mapper}: move functions to PlaylistStream.cxx

Browse Source
This commit is contained in:
Max Kellermann
2014-02-07 21:29:31 +01:00
parent 02b67edaf5
commit 77de233117
7 changed files with 145 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/playlist/PlaylistRegistry.cxx
View File

@@ -20,7 +20,6 @@
#include "config.h"
#include "PlaylistRegistry.hxx"
#include "PlaylistPlugin.hxx"
#include "CloseSongEnumerator.hxx"
#include "plugins/ExtM3uPlaylistPlugin.hxx"
#include "plugins/M3uPlaylistPlugin.hxx"
#include "plugins/XspfPlaylistPlugin.hxx"
@@ -221,7 +220,7 @@ playlist_list_open_stream_mime(InputStream &is, const char *full_mime)
return playlist_list_open_stream_mime2(is, mime.c_str());
}
static SongEnumerator *
SongEnumerator *
playlist_list_open_stream_suffix(InputStream &is, const char *suffix)
{
assert(suffix != nullptr);
@@ -278,32 +277,3 @@ playlist_suffix_supported(const char *suffix)
return false;
}
SongEnumerator *
playlist_list_open_path(const char *path_fs, Mutex &mutex, Cond &cond)
{
const char *suffix;
assert(path_fs != nullptr);
suffix = uri_get_suffix(path_fs);
if (suffix == nullptr || !playlist_suffix_supported(suffix))
return nullptr;
Error error;
InputStream *is = InputStream::OpenReady(path_fs, mutex, cond, error);
if (is == nullptr) {
if (error.IsDefined())
LogError(error);
return nullptr;
}
auto playlist = playlist_list_open_stream_suffix(*is, suffix);
if (playlist != nullptr)
playlist = new CloseSongEnumerator(playlist, is);
else
is->Close();
return playlist;
}