fifo_buffer: move to util/

15 files changed, 23 insertions, 23 deletions

diff --git a/Makefile.am b/Makefile.am
index c2b52fcfe..ffb927e2c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -208,8 +208,6 @@ src_mpd_SOURCES = \
 	src/DatabaseSelection.cxx src/DatabaseSelection.hxx \
 	src/ExcludeList.cxx src/ExcludeList.hxx \
 	src/fd_util.c \
-	src/fifo_buffer.c src/fifo_buffer.h \
-	src/growing_fifo.c src/growing_fifo.h \
 	src/filter_config.c \
 	src/filter_plugin.c \
 	src/filter_registry.c \
@@ -343,6 +341,8 @@ endif
 # Generic utility library
 
 libutil_a_SOURCES = \
+	src/util/fifo_buffer.c src/util/fifo_buffer.h \
+	src/util/growing_fifo.c src/util/growing_fifo.h \
 	src/util/LazyRandomEngine.cxx src/util/LazyRandomEngine.hxx \
 	src/util/SliceBuffer.hxx \
 	src/util/HugeAllocator.cxx src/util/HugeAllocator.hxx \
@@ -1077,6 +1077,7 @@ test_run_input_SOURCES = test/run_input.c \
 	src/fd_util.c
 
 test_dump_text_file_LDADD = \
+	libutil.a \
 	$(INPUT_LIBS) \
 	$(ARCHIVE_LIBS) \
 	$(GLIB_LIBS)
@@ -1085,7 +1086,7 @@ test_dump_text_file_SOURCES = test/dump_text_file.cxx \
 	src/IOThread.cxx \
 	src/ConfigFile.cxx src/tokenizer.c src/utils.c src/string_util.c\
 	src/Tag.cxx src/TagNames.c src/TagPool.cxx \
-	src/text_input_stream.c src/fifo_buffer.c \
+	src/text_input_stream.c \
 	src/uri.c \
 	src/fd_util.c
 
@@ -1106,7 +1107,7 @@ test_dump_playlist_SOURCES = test/dump_playlist.cxx \
 	src/Song.cxx src/Tag.cxx src/TagNames.c src/TagPool.cxx src/TagSave.cxx \
 	src/tag_handler.c src/tag_file.c \
 	src/audio_check.c src/pcm_buffer.c \
-	src/text_input_stream.c src/fifo_buffer.c \
+	src/text_input_stream.c \
 	src/cue/cue_parser.c src/cue/cue_parser.h \
 	src/fd_util.c
 
@@ -1200,7 +1201,6 @@ if ENABLE_ENCODER
 noinst_PROGRAMS += test/run_encoder
 test_run_encoder_SOURCES = test/run_encoder.c \
 	test/stdbin.h \
-	src/fifo_buffer.c src/growing_fifo.c \
 	src/ConfigFile.cxx src/tokenizer.c \
 	src/utils.c src/string_util.c \
 	src/Tag.cxx src/TagNames.c src/TagPool.cxx \
@@ -1210,6 +1210,7 @@ test_run_encoder_SOURCES = test/run_encoder.c \
 test_run_encoder_LDADD = \
 	$(ENCODER_LIBS) \
 	libpcm.a \
+	libutil.a \
 	$(TAG_LIBS) \
 	$(GLIB_LIBS)
 endif
@@ -1226,12 +1227,12 @@ test_test_vorbis_encoder_SOURCES = test/test_vorbis_encoder.c \
 	src/audio_format.c \
 	src/audio_parser.c \
 	src/pcm_buffer.c \
-	src/fifo_buffer.c src/growing_fifo.c \
 	$(ENCODER_SRC)
 test_test_vorbis_encoder_CPPFLAGS = $(AM_CPPFLAGS) \
 	$(ENCODER_CFLAGS)
 test_test_vorbis_encoder_LDADD = $(MPD_LIBS) \
 	$(ENCODER_LIBS) \
+	libutil.a \
 	$(GLIB_LIBS)
 endif
 
@@ -1253,7 +1254,6 @@ test_run_normalize_LDADD = \
 
 test_run_convert_SOURCES = test/run_convert.c \
 	src/dsd2pcm/dsd2pcm.c \
-	src/fifo_buffer.c \
 	src/audio_format.c \
 	src/audio_check.c \
 	src/audio_parser.c
@@ -1279,7 +1279,6 @@ test_run_output_SOURCES = test/run_output.cxx \
 	src/audio_parser.c \
 	src/timer.c src/clock.c \
 	src/Tag.cxx src/TagNames.c src/TagPool.cxx \
-	src/fifo_buffer.c src/growing_fifo.c \
 	src/page.c \
 	src/socket_util.c \
 	src/resolver.c \
@@ -1323,9 +1322,10 @@ if ENABLE_INOTIFY
 noinst_PROGRAMS += test/run_inotify
 test_run_inotify_SOURCES = test/run_inotify.cxx \
 	src/fd_util.c \
-	src/fifo_buffer.c \
 	src/InotifySource.cxx
-test_run_inotify_LDADD = $(GLIB_LIBS)
+test_run_inotify_LDADD = \
+	libutil.a \
+	$(GLIB_LIBS)
 endif
 
 test_test_byte_reverse_SOURCES = \
diff --git a/src/ClientNew.cxx b/src/ClientNew.cxx
index 6ece4d5c9..77eb33c8e 100644
--- a/src/ClientNew.cxx
+++ b/src/ClientNew.cxx
@@ -22,7 +22,7 @@
 #include "ClientList.hxx"
 #include "Partition.hxx"
 #include "fd_util.h"
-#include "fifo_buffer.h"
+#include "util/fifo_buffer.h"
 extern "C" {
 #include "resolver.h"
 }
diff --git a/src/ClientRead.cxx b/src/ClientRead.cxx
index e84f6622d..7e85c3a99 100644
--- a/src/ClientRead.cxx
+++ b/src/ClientRead.cxx
@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "ClientInternal.hxx"
-#include "fifo_buffer.h"
+#include "util/fifo_buffer.h"
 
 #include <assert.h>
 #include <string.h>
diff --git a/src/InotifySource.cxx b/src/InotifySource.cxx
index 5f6239585..37c96536f 100644
--- a/src/InotifySource.cxx
+++ b/src/InotifySource.cxx
@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "InotifySource.hxx"
-#include "fifo_buffer.h"
+#include "util/fifo_buffer.h"
 #include "fd_util.h"
 #include "mpd_error.h"
 
diff --git a/src/encoder/flac_encoder.c b/src/encoder/flac_encoder.c
index 6b09bcd66..db6503fb0 100644
--- a/src/encoder/flac_encoder.c
+++ b/src/encoder/flac_encoder.c
@@ -22,8 +22,8 @@
 #include "encoder_plugin.h"
 #include "audio_format.h"
 #include "pcm_buffer.h"
-#include "fifo_buffer.h"
-#include "growing_fifo.h"
+#include "util/fifo_buffer.h"
+#include "util/growing_fifo.h"
 
 #include <assert.h>
 #include <string.h>
diff --git a/src/encoder/null_encoder.c b/src/encoder/null_encoder.c
index 48cdf139b..fa1a0a034 100644
--- a/src/encoder/null_encoder.c
+++ b/src/encoder/null_encoder.c
@@ -20,8 +20,8 @@
 #include "config.h"
 #include "encoder_api.h"
 #include "encoder_plugin.h"
-#include "fifo_buffer.h"
-#include "growing_fifo.h"
+#include "util/fifo_buffer.h"
+#include "util/growing_fifo.h"
 
 #include <assert.h>
 #include <string.h>
diff --git a/src/encoder/wave_encoder.c b/src/encoder/wave_encoder.c
index 9eeb4d513..a6ee512d4 100644
--- a/src/encoder/wave_encoder.c
+++ b/src/encoder/wave_encoder.c
@@ -20,8 +20,8 @@
 #include "config.h"
 #include "encoder_api.h"
 #include "encoder_plugin.h"
-#include "fifo_buffer.h"
-#include "growing_fifo.h"
+#include "util/fifo_buffer.h"
+#include "util/growing_fifo.h"
 
 #include <assert.h>
 #include <string.h>
diff --git a/src/output/httpd_client.c b/src/output/httpd_client.c
index 72de90457..781858109 100644
--- a/src/output/httpd_client.c
+++ b/src/output/httpd_client.c
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "httpd_client.h"
 #include "httpd_internal.h"
-#include "fifo_buffer.h"
+#include "util/fifo_buffer.h"
 #include "page.h"
 #include "icy_server.h"
 #include "glib_socket.h"
diff --git a/src/output/osx_output_plugin.c b/src/output/osx_output_plugin.c
index cd51fca20..7b42589f7 100644
--- a/src/output/osx_output_plugin.c
+++ b/src/output/osx_output_plugin.c
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "osx_output_plugin.h"
 #include "output_api.h"
-#include "fifo_buffer.h"
+#include "util/fifo_buffer.h"
 
 #include <glib.h>
 #include <CoreAudio/AudioHardware.h>
diff --git a/src/text_input_stream.c b/src/text_input_stream.c
index 4a858fc85..4a2eeb817 100644
--- a/src/text_input_stream.c
+++ b/src/text_input_stream.c
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "text_input_stream.h"
 #include "input_stream.h"
-#include "fifo_buffer.h"
+#include "util/fifo_buffer.h"
 
 #include <glib.h>
 
diff --git a/src/fifo_buffer.c b/src/util/fifo_buffer.c
index 915fb0579..915fb0579 100644
--- a/src/fifo_buffer.c
+++ b/src/util/fifo_buffer.c
diff --git a/src/fifo_buffer.h b/src/util/fifo_buffer.h
index 49c7f4992..49c7f4992 100644
--- a/src/fifo_buffer.h
+++ b/src/util/fifo_buffer.h
diff --git a/src/growing_fifo.c b/src/util/growing_fifo.c
index 88431f60e..88431f60e 100644
--- a/src/growing_fifo.c
+++ b/src/util/growing_fifo.c
diff --git a/src/growing_fifo.h b/src/util/growing_fifo.h
index 723c3b3ff..723c3b3ff 100644
--- a/src/growing_fifo.h
+++ b/src/util/growing_fifo.h
diff --git a/test/run_convert.c b/test/run_convert.c
index 4f57400fd..21be83f73 100644
--- a/test/run_convert.c
+++ b/test/run_convert.c
@@ -28,7 +28,7 @@
 #include "audio_format.h"
 #include "pcm_convert.h"
 #include "conf.h"
-#include "fifo_buffer.h"
+#include "util/fifo_buffer.h"
 #include "stdbin.h"
 
 #include <glib.h>