From 01d8eb629072e4d5d02345868f4233177c99d70a Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@musicpd.org>
Date: Fri, 22 Jun 2018 19:31:06 +0200
Subject: [PATCH] input/rewind: move sources out of the "plugins" directory
This is not a plugin.
---
Makefile.am | 2 +-
src/input/Open.cxx | 2 +-
.../RewindInputPlugin.cxx => RewindInputStream.cxx} | 4 ++--
.../RewindInputPlugin.hxx => RewindInputStream.hxx} | 6 +++---
test/test_rewind.cxx | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
rename src/input/{plugins/RewindInputPlugin.cxx => RewindInputStream.cxx} (98%)
rename src/input/{plugins/RewindInputPlugin.hxx => RewindInputStream.hxx} (92%)
diff --git a/Makefile.am b/Makefile.am
index 29e1b9dd6..fce275360 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1389,7 +1389,7 @@ libinput_a_SOURCES = \
src/input/ThreadInputStream.cxx src/input/ThreadInputStream.hxx \
src/input/AsyncInputStream.cxx src/input/AsyncInputStream.hxx \
src/input/ProxyInputStream.cxx src/input/ProxyInputStream.hxx \
- src/input/plugins/RewindInputPlugin.cxx src/input/plugins/RewindInputPlugin.hxx \
+ src/input/RewindInputStream.cxx src/input/RewindInputStream.hxx \
src/input/plugins/FileInputPlugin.cxx src/input/plugins/FileInputPlugin.hxx
libinput_a_CPPFLAGS = $(AM_CPPFLAGS) \
diff --git a/src/input/Open.cxx b/src/input/Open.cxx
index 177f575ed..9c136b064 100644
--- a/src/input/Open.cxx
+++ b/src/input/Open.cxx
@@ -22,7 +22,7 @@
#include "Registry.hxx"
#include "InputPlugin.hxx"
#include "LocalOpen.hxx"
-#include "plugins/RewindInputPlugin.hxx"
+#include "RewindInputStream.hxx"
#include "fs/Traits.hxx"
#include "fs/AllocatedPath.hxx"
diff --git a/src/input/plugins/RewindInputPlugin.cxx b/src/input/RewindInputStream.cxx
similarity index 98%
rename from src/input/plugins/RewindInputPlugin.cxx
rename to src/input/RewindInputStream.cxx
index 2bce86236..d91638fd8 100644
--- a/src/input/plugins/RewindInputPlugin.cxx
+++ b/src/input/RewindInputStream.cxx
@@ -18,8 +18,8 @@
*/
#include "config.h"
-#include "RewindInputPlugin.hxx"
-#include "../ProxyInputStream.hxx"
+#include "RewindInputStream.hxx"
+#include "ProxyInputStream.hxx"
#include <assert.h>
#include <string.h>
diff --git a/src/input/plugins/RewindInputPlugin.hxx b/src/input/RewindInputStream.hxx
similarity index 92%
rename from src/input/plugins/RewindInputPlugin.hxx
rename to src/input/RewindInputStream.hxx
index 5c425292c..327a440da 100644
--- a/src/input/plugins/RewindInputPlugin.hxx
+++ b/src/input/RewindInputStream.hxx
@@ -24,11 +24,11 @@
* each decoder plugin peek a portion from the stream).
*/
-#ifndef MPD_INPUT_REWIND_HXX
-#define MPD_INPUT_REWIND_HXX
+#ifndef MPD_REWIND_INPUT_STREAM_HXX
+#define MPD_REWIND_INPUT_STREAM_HXX
#include "check.h"
-#include "input/Ptr.hxx"
+#include "Ptr.hxx"
InputStreamPtr
input_rewind_open(InputStreamPtr is);
diff --git a/test/test_rewind.cxx b/test/test_rewind.cxx
index b854da36a..d911b5692 100644
--- a/test/test_rewind.cxx
+++ b/test/test_rewind.cxx
@@ -3,7 +3,7 @@
*/
#include "config.h"
-#include "input/plugins/RewindInputPlugin.hxx"
+#include "input/RewindInputStream.hxx"
#include "input/InputStream.hxx"
#include "thread/Mutex.hxx"
#include "thread/Cond.hxx"