diff options
author | Max Kellermann <max@duempel.org> | 2014-05-21 18:21:25 +0200 |
---|---|---|
committer | Max Kellermann <max@duempel.org> | 2014-05-21 18:47:32 +0200 |
commit | c42e412c0ab0c24e88e21e5d4d46b350387e91a2 (patch) | |
tree | 685753bac61503e9824828f51647eac1d30a97ee /src/input/InputStream.cxx | |
parent | 542e7feba88295d03ef463b3f1726753fa91f72d (diff) | |
download | mpd-c42e412c0ab0c24e88e21e5d4d46b350387e91a2.tar.gz mpd-c42e412c0ab0c24e88e21e5d4d46b350387e91a2.tar.xz mpd-c42e412c0ab0c24e88e21e5d4d46b350387e91a2.zip |
input/InputStream: move Open() to Open.cxx
Allow compiling test programs with only selected plugins.
Diffstat (limited to '')
-rw-r--r-- | src/input/InputStream.cxx | 51 |
1 files changed, 1 insertions, 50 deletions
diff --git a/src/input/InputStream.cxx b/src/input/InputStream.cxx index d4f1b1f87..e7307540d 100644 --- a/src/input/InputStream.cxx +++ b/src/input/InputStream.cxx @@ -19,65 +19,16 @@ #include "config.h" #include "InputStream.hxx" -#include "Registry.hxx" -#include "InputPlugin.hxx" -#include "plugins/RewindInputPlugin.hxx" +#include "thread/Cond.hxx" #include "util/UriUtil.hxx" -#include "util/Error.hxx" -#include "util/Domain.hxx" #include <assert.h> #include <stdio.h> /* for SEEK_SET */ -static constexpr Domain input_domain("input"); - InputStream::~InputStream() { } -InputStream * -InputStream::Open(const char *url, - Mutex &mutex, Cond &cond, - Error &error) -{ - input_plugins_for_each_enabled(plugin) { - InputStream *is; - - is = plugin->open(url, mutex, cond, error); - if (is != nullptr) { - is = input_rewind_open(is); - - return is; - } else if (error.IsDefined()) - return nullptr; - } - - error.Set(input_domain, "Unrecognized URI"); - return nullptr; -} - -InputStream * -InputStream::OpenReady(const char *uri, - Mutex &mutex, Cond &cond, - Error &error) -{ - InputStream *is = Open(uri, mutex, cond, error); - if (is == nullptr) - return nullptr; - - mutex.lock(); - is->WaitReady(); - bool success = is->Check(error); - mutex.unlock(); - - if (!success) { - delete is; - is = nullptr; - } - - return is; -} - bool InputStream::Check(gcc_unused Error &error) { |