input/InputStream: move Open() to Open.cxx

Allow compiling test programs with only selected plugins.

3 files changed, 74 insertions, 51 deletions

diff --git a/Makefile.am b/Makefile.am
index c982bf3c6..3c63ddf3e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1027,6 +1027,7 @@ endif
 libinput_a_SOURCES = \
 	src/input/Init.cxx src/input/Init.hxx \
 	src/input/Registry.cxx src/input/Registry.hxx \
+	src/input/Open.cxx \
 	src/input/InputStream.cxx src/input/InputStream.hxx \
 	src/input/InputPlugin.hxx \
 	src/input/TextInputStream.cxx src/input/TextInputStream.hxx \
@@ -1558,7 +1559,7 @@ test_visit_archive_LDADD = \
 test_visit_archive_SOURCES = test/visit_archive.cxx \
 	src/Log.cxx src/LogBackend.cxx \
 	src/IOThread.cxx \
-	src/input/InputStream.cxx
+	src/input/Open.cxx
 
 endif
 
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)
 {
diff --git a/src/input/Open.cxx b/src/input/Open.cxx
new file mode 100644
index 000000000..6e89569d6
--- /dev/null
+++ b/src/input/Open.cxx
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2003-2014 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "config.h"
+#include "InputStream.hxx"
+#include "Registry.hxx"
+#include "InputPlugin.hxx"
+#include "plugins/RewindInputPlugin.hxx"
+#include "util/Error.hxx"
+#include "util/Domain.hxx"
+
+static constexpr Domain input_domain("input");
+
+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;
+}