fs/io: move to io/

test/ContainerScan.cxx

@@ -24,8 +24,8 @@
 #include "decoder/DecoderPlugin.hxx"
 #include "fs/Path.hxx"
 #include "fs/NarrowPath.hxx"
-#include "fs/io/StdioOutputStream.hxx"
-#include "fs/io/BufferedOutputStream.hxx"
+#include "io/StdioOutputStream.hxx"
+#include "io/BufferedOutputStream.hxx"
 #include "util/PrintException.hxx"
 #include "util/UriExtract.hxx"
 

test/WriteFile.cxx

@@ -17,7 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "fs/io/FileOutputStream.hxx"
+#include "io/FileOutputStream.hxx"
 #include "fs/NarrowPath.hxx"
 #include "util/PrintException.hxx"
 

test/dump_playlist.cxx

@@ -29,8 +29,8 @@
 #include "playlist/PlaylistPlugin.hxx"
 #include "fs/Path.hxx"
 #include "fs/NarrowPath.hxx"
-#include "fs/io/BufferedOutputStream.hxx"
-#include "fs/io/StdioOutputStream.hxx"
+#include "io/BufferedOutputStream.hxx"
+#include "io/StdioOutputStream.hxx"
 #include "thread/Cond.hxx"
 #include "util/PrintException.hxx"
 

test/meson.build

@@ -183,7 +183,8 @@ if zlib_dep.found()
     'run_gzip.cxx',
     include_directories: inc,
     dependencies: [
-      fs_dep,
+      zlib_dep,
+      util_dep,
     ],
   )
 

test/run_encoder.cxx

@@ -24,7 +24,7 @@
 #include "pcm/AudioFormat.hxx"
 #include "pcm/AudioParser.hxx"
 #include "config/Block.hxx"
-#include "fs/io/StdioOutputStream.hxx"
+#include "io/StdioOutputStream.hxx"
 #include "util/PrintException.hxx"
 
 #include <exception>

test/run_gunzip.cxx

@@ -17,9 +17,9 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "fs/io/GunzipReader.hxx"
-#include "fs/io/FileReader.hxx"
-#include "fs/io/StdioOutputStream.hxx"
+#include "lib/zlib/GunzipReader.hxx"
+#include "io/FileReader.hxx"
+#include "io/StdioOutputStream.hxx"
 #include "fs/NarrowPath.hxx"
 #include "util/PrintException.hxx"
 

test/run_gzip.cxx

@@ -17,8 +17,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "fs/io/GzipOutputStream.hxx"
-#include "fs/io/StdioOutputStream.hxx"
+#include "lib/zlib/GzipOutputStream.hxx"
+#include "io/StdioOutputStream.hxx"
 #include "system/Error.hxx"
 #include "util/PrintException.hxx"
 

test/run_input.cxx

@@ -33,8 +33,8 @@
 #include "LogBackend.hxx"
 #include "fs/Path.hxx"
 #include "fs/NarrowPath.hxx"
-#include "fs/io/BufferedOutputStream.hxx"
-#include "fs/io/StdioOutputStream.hxx"
+#include "io/BufferedOutputStream.hxx"
+#include "io/StdioOutputStream.hxx"
 #include "util/ConstBuffer.hxx"
 #include "util/OptionDef.hxx"
 #include "util/OptionParser.hxx"

test/test_vorbis_encoder.cxx

@@ -23,7 +23,7 @@
 #include "encoder/ToOutputStream.hxx"
 #include "pcm/AudioFormat.hxx"
 #include "config/Block.hxx"
-#include "fs/io/StdioOutputStream.hxx"
+#include "io/StdioOutputStream.hxx"
 #include "tag/Tag.hxx"
 #include "tag/Builder.hxx"
 #include "util/PrintException.hxx"