From a5fa43b5269e31168ea9ab75c115adda9b74dad4 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 3 Dec 2021 14:02:07 +0100 Subject: [PATCH] fs/io: move to io/ --- src/PlaylistDatabase.cxx | 4 ++-- src/PlaylistFile.cxx | 4 ++-- src/PlaylistSave.cxx | 4 ++-- src/SongSave.cxx | 4 ++-- src/StateFile.cxx | 4 ++-- src/TagSave.cxx | 2 +- src/config/File.cxx | 4 ++-- src/db/plugins/simple/DatabaseSave.cxx | 4 ++-- src/db/plugins/simple/DirectorySave.cxx | 4 ++-- src/db/plugins/simple/SimpleDatabasePlugin.cxx | 6 +++--- src/decoder/Reader.hxx | 2 +- src/decoder/plugins/SidplayDecoderPlugin.cxx | 2 +- src/encoder/ToOutputStream.cxx | 2 +- src/fs/StandardDirectory.cxx | 2 +- src/fs/io/TextFile.cxx | 6 +++--- src/fs/io/TextFile.hxx | 2 +- src/fs/meson.build | 13 ------------- src/input/Reader.hxx | 2 +- src/input/plugins/FileInputPlugin.cxx | 2 +- src/{fs => }/io/BufferedOutputStream.cxx | 0 src/{fs => }/io/BufferedOutputStream.hxx | 0 src/{fs => }/io/BufferedReader.cxx | 0 src/{fs => }/io/BufferedReader.hxx | 0 src/{fs => }/io/FileOutputStream.cxx | 0 src/{fs => }/io/FileOutputStream.hxx | 0 src/{fs => }/io/FileReader.cxx | 0 src/{fs => }/io/FileReader.hxx | 0 src/{fs => }/io/LineReader.hxx | 0 src/{fs => }/io/OutputStream.hxx | 0 src/{fs => }/io/PeekReader.cxx | 0 src/{fs => }/io/PeekReader.hxx | 0 src/{fs => }/io/Reader.hxx | 0 src/{fs => }/io/StdioOutputStream.hxx | 0 src/io/meson.build | 5 +++++ src/lib/xiph/OggSyncState.cxx | 2 +- src/{fs/io => lib/zlib}/AutoGunzipReader.cxx | 0 src/{fs/io => lib/zlib}/AutoGunzipReader.hxx | 2 +- src/{fs/io => lib/zlib}/GunzipReader.cxx | 0 src/{fs/io => lib/zlib}/GunzipReader.hxx | 2 +- src/{fs/io => lib/zlib}/GzipOutputStream.cxx | 0 src/{fs/io => lib/zlib}/GzipOutputStream.hxx | 2 +- src/lib/zlib/meson.build | 4 ++++ src/mixer/Volume.cxx | 2 +- src/output/State.cxx | 2 +- src/output/plugins/RecorderOutputPlugin.cxx | 2 +- src/queue/PlaylistState.cxx | 4 ++-- src/queue/QueueSave.cxx | 4 ++-- src/storage/StorageState.cxx | 4 ++-- test/ContainerScan.cxx | 4 ++-- test/WriteFile.cxx | 2 +- test/dump_playlist.cxx | 4 ++-- test/meson.build | 3 ++- test/run_encoder.cxx | 2 +- test/run_gunzip.cxx | 6 +++--- test/run_gzip.cxx | 4 ++-- test/run_input.cxx | 4 ++-- test/test_vorbis_encoder.cxx | 2 +- 57 files changed, 68 insertions(+), 71 deletions(-) rename src/{fs => }/io/BufferedOutputStream.cxx (100%) rename src/{fs => }/io/BufferedOutputStream.hxx (100%) rename src/{fs => }/io/BufferedReader.cxx (100%) rename src/{fs => }/io/BufferedReader.hxx (100%) rename src/{fs => }/io/FileOutputStream.cxx (100%) rename src/{fs => }/io/FileOutputStream.hxx (100%) rename src/{fs => }/io/FileReader.cxx (100%) rename src/{fs => }/io/FileReader.hxx (100%) rename src/{fs => }/io/LineReader.hxx (100%) rename src/{fs => }/io/OutputStream.hxx (100%) rename src/{fs => }/io/PeekReader.cxx (100%) rename src/{fs => }/io/PeekReader.hxx (100%) rename src/{fs => }/io/Reader.hxx (100%) rename src/{fs => }/io/StdioOutputStream.hxx (100%) rename src/{fs/io => lib/zlib}/AutoGunzipReader.cxx (100%) rename src/{fs/io => lib/zlib}/AutoGunzipReader.hxx (97%) rename src/{fs/io => lib/zlib}/GunzipReader.cxx (100%) rename src/{fs/io => lib/zlib}/GunzipReader.hxx (98%) rename src/{fs/io => lib/zlib}/GzipOutputStream.cxx (100%) rename src/{fs/io => lib/zlib}/GzipOutputStream.hxx (98%) diff --git a/src/PlaylistDatabase.cxx b/src/PlaylistDatabase.cxx index 7733095c0..d2ad94509 100644 --- a/src/PlaylistDatabase.cxx +++ b/src/PlaylistDatabase.cxx @@ -19,8 +19,8 @@ #include "PlaylistDatabase.hxx" #include "db/PlaylistVector.hxx" -#include "fs/io/LineReader.hxx" -#include "fs/io/BufferedOutputStream.hxx" +#include "io/LineReader.hxx" +#include "io/BufferedOutputStream.hxx" #include "time/ChronoUtil.hxx" #include "util/StringStrip.hxx" #include "util/RuntimeError.hxx" diff --git a/src/PlaylistFile.cxx b/src/PlaylistFile.cxx index bd7e0b19b..7035136df 100644 --- a/src/PlaylistFile.cxx +++ b/src/PlaylistFile.cxx @@ -28,8 +28,8 @@ #include "Mapper.hxx" #include "protocol/RangeArg.hxx" #include "fs/io/TextFile.hxx" -#include "fs/io/FileOutputStream.hxx" -#include "fs/io/BufferedOutputStream.hxx" +#include "io/FileOutputStream.hxx" +#include "io/BufferedOutputStream.hxx" #include "config/Data.hxx" #include "config/Option.hxx" #include "config/Defaults.hxx" diff --git a/src/PlaylistSave.cxx b/src/PlaylistSave.cxx index 2c990da02..953ddf2aa 100644 --- a/src/PlaylistSave.cxx +++ b/src/PlaylistSave.cxx @@ -28,8 +28,8 @@ #include "fs/AllocatedPath.hxx" #include "fs/Traits.hxx" #include "fs/FileSystem.hxx" -#include "fs/io/FileOutputStream.hxx" -#include "fs/io/BufferedOutputStream.hxx" +#include "io/FileOutputStream.hxx" +#include "io/BufferedOutputStream.hxx" #include "util/UriExtract.hxx" static void diff --git a/src/SongSave.cxx b/src/SongSave.cxx index ff172cc32..842c633b3 100644 --- a/src/SongSave.cxx +++ b/src/SongSave.cxx @@ -22,8 +22,8 @@ #include "db/plugins/simple/Song.hxx" #include "song/DetachedSong.hxx" #include "TagSave.hxx" -#include "fs/io/LineReader.hxx" -#include "fs/io/BufferedOutputStream.hxx" +#include "io/LineReader.hxx" +#include "io/BufferedOutputStream.hxx" #include "tag/ParseName.hxx" #include "tag/Tag.hxx" #include "tag/Builder.hxx" diff --git a/src/StateFile.cxx b/src/StateFile.cxx index 9399b615a..46490b88d 100644 --- a/src/StateFile.cxx +++ b/src/StateFile.cxx @@ -22,8 +22,8 @@ #include "output/State.hxx" #include "queue/PlaylistState.hxx" #include "fs/io/TextFile.hxx" -#include "fs/io/FileOutputStream.hxx" -#include "fs/io/BufferedOutputStream.hxx" +#include "io/FileOutputStream.hxx" +#include "io/BufferedOutputStream.hxx" #include "storage/StorageState.hxx" #include "Partition.hxx" #include "Instance.hxx" diff --git a/src/TagSave.cxx b/src/TagSave.cxx index d23f97d28..3ecc4e69c 100644 --- a/src/TagSave.cxx +++ b/src/TagSave.cxx @@ -19,7 +19,7 @@ #include "TagSave.hxx" #include "tag/Tag.hxx" -#include "fs/io/BufferedOutputStream.hxx" +#include "io/BufferedOutputStream.hxx" #define SONG_TIME "Time: " diff --git a/src/config/File.cxx b/src/config/File.cxx index 1384e0582..8894b7509 100644 --- a/src/config/File.cxx +++ b/src/config/File.cxx @@ -31,8 +31,8 @@ #include "fs/FileSystem.hxx" #include "fs/List.hxx" #include "fs/Path.hxx" -#include "fs/io/FileReader.hxx" -#include "fs/io/BufferedReader.hxx" +#include "io/FileReader.hxx" +#include "io/BufferedReader.hxx" #include "Log.hxx" #include diff --git a/src/db/plugins/simple/DatabaseSave.cxx b/src/db/plugins/simple/DatabaseSave.cxx index 3a581b4f6..4e9bb503e 100644 --- a/src/db/plugins/simple/DatabaseSave.cxx +++ b/src/db/plugins/simple/DatabaseSave.cxx @@ -20,8 +20,8 @@ #include "DatabaseSave.hxx" #include "db/DatabaseLock.hxx" #include "DirectorySave.hxx" -#include "fs/io/BufferedOutputStream.hxx" -#include "fs/io/LineReader.hxx" +#include "io/BufferedOutputStream.hxx" +#include "io/LineReader.hxx" #include "tag/ParseName.hxx" #include "tag/Settings.hxx" #include "fs/Charset.hxx" diff --git a/src/db/plugins/simple/DirectorySave.cxx b/src/db/plugins/simple/DirectorySave.cxx index c25ef8a4e..e7648ac11 100644 --- a/src/db/plugins/simple/DirectorySave.cxx +++ b/src/db/plugins/simple/DirectorySave.cxx @@ -23,8 +23,8 @@ #include "SongSave.hxx" #include "song/DetachedSong.hxx" #include "PlaylistDatabase.hxx" -#include "fs/io/LineReader.hxx" -#include "fs/io/BufferedOutputStream.hxx" +#include "io/LineReader.hxx" +#include "io/BufferedOutputStream.hxx" #include "time/ChronoUtil.hxx" #include "util/StringAPI.hxx" #include "util/StringCompare.hxx" diff --git a/src/db/plugins/simple/SimpleDatabasePlugin.cxx b/src/db/plugins/simple/SimpleDatabasePlugin.cxx index 61ea9ef96..4b30c7ed8 100644 --- a/src/db/plugins/simple/SimpleDatabasePlugin.cxx +++ b/src/db/plugins/simple/SimpleDatabasePlugin.cxx @@ -34,8 +34,8 @@ #include "db/DatabaseLock.hxx" #include "db/DatabaseError.hxx" #include "fs/io/TextFile.hxx" -#include "fs/io/BufferedOutputStream.hxx" -#include "fs/io/FileOutputStream.hxx" +#include "io/BufferedOutputStream.hxx" +#include "io/FileOutputStream.hxx" #include "fs/FileInfo.hxx" #include "config/Block.hxx" #include "fs/FileSystem.hxx" @@ -46,7 +46,7 @@ #include "Log.hxx" #ifdef ENABLE_ZLIB -#include "fs/io/GzipOutputStream.hxx" +#include "lib/zlib/GzipOutputStream.hxx" #endif #include diff --git a/src/decoder/Reader.hxx b/src/decoder/Reader.hxx index f7946ac13..8e91c3c17 100644 --- a/src/decoder/Reader.hxx +++ b/src/decoder/Reader.hxx @@ -20,7 +20,7 @@ #ifndef MPD_DECODER_READER_HXX #define MPD_DECODER_READER_HXX -#include "fs/io/Reader.hxx" +#include "io/Reader.hxx" class DecoderClient; class InputStream; diff --git a/src/decoder/plugins/SidplayDecoderPlugin.cxx b/src/decoder/plugins/SidplayDecoderPlugin.cxx index 3aff1b4f6..8a7650f91 100644 --- a/src/decoder/plugins/SidplayDecoderPlugin.cxx +++ b/src/decoder/plugins/SidplayDecoderPlugin.cxx @@ -27,7 +27,7 @@ #include "fs/AllocatedPath.hxx" #include "lib/icu/Converter.hxx" #ifdef HAVE_SIDPLAYFP -#include "fs/io/FileReader.hxx" +#include "io/FileReader.hxx" #include "util/RuntimeError.hxx" #endif #include "util/StringFormat.hxx" diff --git a/src/encoder/ToOutputStream.cxx b/src/encoder/ToOutputStream.cxx index 98be4cd78..a30d67291 100644 --- a/src/encoder/ToOutputStream.cxx +++ b/src/encoder/ToOutputStream.cxx @@ -19,7 +19,7 @@ #include "ToOutputStream.hxx" #include "EncoderInterface.hxx" -#include "fs/io/OutputStream.hxx" +#include "io/OutputStream.hxx" void EncoderToOutputStream(OutputStream &os, Encoder &encoder) diff --git a/src/fs/StandardDirectory.cxx b/src/fs/StandardDirectory.cxx index bf27d0e75..66785361e 100644 --- a/src/fs/StandardDirectory.cxx +++ b/src/fs/StandardDirectory.cxx @@ -41,7 +41,7 @@ #ifdef USE_XDG #include "util/StringStrip.hxx" #include "util/StringCompare.hxx" -#include "io/TextFile.hxx" +#include "fs/io/TextFile.hxx" #include #include #endif diff --git a/src/fs/io/TextFile.cxx b/src/fs/io/TextFile.cxx index 1d958fd02..01f16d4e8 100644 --- a/src/fs/io/TextFile.cxx +++ b/src/fs/io/TextFile.cxx @@ -18,9 +18,9 @@ */ #include "TextFile.hxx" -#include "FileReader.hxx" -#include "AutoGunzipReader.hxx" -#include "BufferedReader.hxx" +#include "io/FileReader.hxx" +#include "io/BufferedReader.hxx" +#include "lib/zlib/AutoGunzipReader.hxx" #include "fs/Path.hxx" #include diff --git a/src/fs/io/TextFile.hxx b/src/fs/io/TextFile.hxx index 06b67f4bf..01b165fbb 100644 --- a/src/fs/io/TextFile.hxx +++ b/src/fs/io/TextFile.hxx @@ -20,7 +20,7 @@ #ifndef MPD_TEXT_FILE_HXX #define MPD_TEXT_FILE_HXX -#include "LineReader.hxx" +#include "io/LineReader.hxx" #include "config.h" #include diff --git a/src/fs/meson.build b/src/fs/meson.build index 2e483e7ae..5be31cf6a 100644 --- a/src/fs/meson.build +++ b/src/fs/meson.build @@ -14,12 +14,7 @@ fs_sources = [ 'CheckFile.cxx', 'LookupFile.cxx', 'DirectoryReader.cxx', - 'io/PeekReader.cxx', - 'io/FileReader.cxx', - 'io/BufferedReader.cxx', 'io/TextFile.cxx', - 'io/FileOutputStream.cxx', - 'io/BufferedOutputStream.cxx', ] if is_windows @@ -28,14 +23,6 @@ else shlwapi_dep = dependency('', required: false) endif -if zlib_dep.found() - fs_sources += [ - 'io/GunzipReader.cxx', - 'io/AutoGunzipReader.cxx', - 'io/GzipOutputStream.cxx', - ] -endif - fs = static_library( 'fs', fs_sources, diff --git a/src/input/Reader.hxx b/src/input/Reader.hxx index 440ec1baf..edde41b65 100644 --- a/src/input/Reader.hxx +++ b/src/input/Reader.hxx @@ -20,7 +20,7 @@ #ifndef MPD_INPUT_READER_HXX #define MPD_INPUT_READER_HXX -#include "fs/io/Reader.hxx" +#include "io/Reader.hxx" class InputStream; diff --git a/src/input/plugins/FileInputPlugin.cxx b/src/input/plugins/FileInputPlugin.cxx index b4e88acb7..32f4316c8 100644 --- a/src/input/plugins/FileInputPlugin.cxx +++ b/src/input/plugins/FileInputPlugin.cxx @@ -21,7 +21,7 @@ #include "../InputStream.hxx" #include "fs/Path.hxx" #include "fs/FileInfo.hxx" -#include "fs/io/FileReader.hxx" +#include "io/FileReader.hxx" #include "io/FileDescriptor.hxx" #include "util/RuntimeError.hxx" diff --git a/src/fs/io/BufferedOutputStream.cxx b/src/io/BufferedOutputStream.cxx similarity index 100% rename from src/fs/io/BufferedOutputStream.cxx rename to src/io/BufferedOutputStream.cxx diff --git a/src/fs/io/BufferedOutputStream.hxx b/src/io/BufferedOutputStream.hxx similarity index 100% rename from src/fs/io/BufferedOutputStream.hxx rename to src/io/BufferedOutputStream.hxx diff --git a/src/fs/io/BufferedReader.cxx b/src/io/BufferedReader.cxx similarity index 100% rename from src/fs/io/BufferedReader.cxx rename to src/io/BufferedReader.cxx diff --git a/src/fs/io/BufferedReader.hxx b/src/io/BufferedReader.hxx similarity index 100% rename from src/fs/io/BufferedReader.hxx rename to src/io/BufferedReader.hxx diff --git a/src/fs/io/FileOutputStream.cxx b/src/io/FileOutputStream.cxx similarity index 100% rename from src/fs/io/FileOutputStream.cxx rename to src/io/FileOutputStream.cxx diff --git a/src/fs/io/FileOutputStream.hxx b/src/io/FileOutputStream.hxx similarity index 100% rename from src/fs/io/FileOutputStream.hxx rename to src/io/FileOutputStream.hxx diff --git a/src/fs/io/FileReader.cxx b/src/io/FileReader.cxx similarity index 100% rename from src/fs/io/FileReader.cxx rename to src/io/FileReader.cxx diff --git a/src/fs/io/FileReader.hxx b/src/io/FileReader.hxx similarity index 100% rename from src/fs/io/FileReader.hxx rename to src/io/FileReader.hxx diff --git a/src/fs/io/LineReader.hxx b/src/io/LineReader.hxx similarity index 100% rename from src/fs/io/LineReader.hxx rename to src/io/LineReader.hxx diff --git a/src/fs/io/OutputStream.hxx b/src/io/OutputStream.hxx similarity index 100% rename from src/fs/io/OutputStream.hxx rename to src/io/OutputStream.hxx diff --git a/src/fs/io/PeekReader.cxx b/src/io/PeekReader.cxx similarity index 100% rename from src/fs/io/PeekReader.cxx rename to src/io/PeekReader.cxx diff --git a/src/fs/io/PeekReader.hxx b/src/io/PeekReader.hxx similarity index 100% rename from src/fs/io/PeekReader.hxx rename to src/io/PeekReader.hxx diff --git a/src/fs/io/Reader.hxx b/src/io/Reader.hxx similarity index 100% rename from src/fs/io/Reader.hxx rename to src/io/Reader.hxx diff --git a/src/fs/io/StdioOutputStream.hxx b/src/io/StdioOutputStream.hxx similarity index 100% rename from src/fs/io/StdioOutputStream.hxx rename to src/io/StdioOutputStream.hxx diff --git a/src/io/meson.build b/src/io/meson.build index 22456d654..3145bdd29 100644 --- a/src/io/meson.build +++ b/src/io/meson.build @@ -2,6 +2,11 @@ io = static_library( 'io', 'FileDescriptor.cxx', 'Open.cxx', + 'PeekReader.cxx', + 'FileReader.cxx', + 'BufferedReader.cxx', + 'FileOutputStream.cxx', + 'BufferedOutputStream.cxx', include_directories: inc, ) diff --git a/src/lib/xiph/OggSyncState.cxx b/src/lib/xiph/OggSyncState.cxx index 6f8ed978c..a36dd6243 100644 --- a/src/lib/xiph/OggSyncState.cxx +++ b/src/lib/xiph/OggSyncState.cxx @@ -18,7 +18,7 @@ */ #include "OggSyncState.hxx" -#include "fs/io/Reader.hxx" +#include "io/Reader.hxx" bool OggSyncState::Feed(size_t size) diff --git a/src/fs/io/AutoGunzipReader.cxx b/src/lib/zlib/AutoGunzipReader.cxx similarity index 100% rename from src/fs/io/AutoGunzipReader.cxx rename to src/lib/zlib/AutoGunzipReader.cxx diff --git a/src/fs/io/AutoGunzipReader.hxx b/src/lib/zlib/AutoGunzipReader.hxx similarity index 97% rename from src/fs/io/AutoGunzipReader.hxx rename to src/lib/zlib/AutoGunzipReader.hxx index 9da46974f..698506cd5 100644 --- a/src/fs/io/AutoGunzipReader.hxx +++ b/src/lib/zlib/AutoGunzipReader.hxx @@ -20,7 +20,7 @@ #ifndef MPD_AUTO_GUNZIP_READER_HXX #define MPD_AUTO_GUNZIP_READER_HXX -#include "PeekReader.hxx" +#include "io/PeekReader.hxx" #include diff --git a/src/fs/io/GunzipReader.cxx b/src/lib/zlib/GunzipReader.cxx similarity index 100% rename from src/fs/io/GunzipReader.cxx rename to src/lib/zlib/GunzipReader.cxx diff --git a/src/fs/io/GunzipReader.hxx b/src/lib/zlib/GunzipReader.hxx similarity index 98% rename from src/fs/io/GunzipReader.hxx rename to src/lib/zlib/GunzipReader.hxx index 51283099a..0db56a602 100644 --- a/src/fs/io/GunzipReader.hxx +++ b/src/lib/zlib/GunzipReader.hxx @@ -30,7 +30,7 @@ #ifndef GUNZIP_READER_HXX #define GUNZIP_READER_HXX -#include "Reader.hxx" +#include "io/Reader.hxx" #include "util/StaticFifoBuffer.hxx" #include diff --git a/src/fs/io/GzipOutputStream.cxx b/src/lib/zlib/GzipOutputStream.cxx similarity index 100% rename from src/fs/io/GzipOutputStream.cxx rename to src/lib/zlib/GzipOutputStream.cxx diff --git a/src/fs/io/GzipOutputStream.hxx b/src/lib/zlib/GzipOutputStream.hxx similarity index 98% rename from src/fs/io/GzipOutputStream.hxx rename to src/lib/zlib/GzipOutputStream.hxx index d141f30ff..267d17c8a 100644 --- a/src/fs/io/GzipOutputStream.hxx +++ b/src/lib/zlib/GzipOutputStream.hxx @@ -30,7 +30,7 @@ #ifndef GZIP_OUTPUT_STREAM_HXX #define GZIP_OUTPUT_STREAM_HXX -#include "OutputStream.hxx" +#include "io/OutputStream.hxx" #include diff --git a/src/lib/zlib/meson.build b/src/lib/zlib/meson.build index 86b35f971..a9674e72a 100644 --- a/src/lib/zlib/meson.build +++ b/src/lib/zlib/meson.build @@ -7,6 +7,9 @@ endif zlib = static_library( 'zlib', 'Error.cxx', + 'GunzipReader.cxx', + 'GzipOutputStream.cxx', + 'AutoGunzipReader.cxx', include_directories: inc, dependencies: [ zlib_dep, @@ -17,5 +20,6 @@ zlib_dep = declare_dependency( link_with: zlib, dependencies: [ zlib_dep, + io_dep, ], ) diff --git a/src/mixer/Volume.cxx b/src/mixer/Volume.cxx index 6eeade3fe..5f37e48fc 100644 --- a/src/mixer/Volume.cxx +++ b/src/mixer/Volume.cxx @@ -23,7 +23,7 @@ #include "util/StringCompare.hxx" #include "util/Domain.hxx" #include "system/PeriodClock.hxx" -#include "fs/io/BufferedOutputStream.hxx" +#include "io/BufferedOutputStream.hxx" #include "Log.hxx" #include diff --git a/src/output/State.cxx b/src/output/State.cxx index b2648c74e..adce37ac0 100644 --- a/src/output/State.cxx +++ b/src/output/State.cxx @@ -26,7 +26,7 @@ #include "MultipleOutputs.hxx" #include "Domain.hxx" #include "Log.hxx" -#include "fs/io/BufferedOutputStream.hxx" +#include "io/BufferedOutputStream.hxx" #include "util/StringCompare.hxx" #include diff --git a/src/output/plugins/RecorderOutputPlugin.cxx b/src/output/plugins/RecorderOutputPlugin.cxx index 2de03cbf0..dd6af3d04 100644 --- a/src/output/plugins/RecorderOutputPlugin.cxx +++ b/src/output/plugins/RecorderOutputPlugin.cxx @@ -27,7 +27,7 @@ #include "config/Path.hxx" #include "Log.hxx" #include "fs/AllocatedPath.hxx" -#include "fs/io/FileOutputStream.hxx" +#include "io/FileOutputStream.hxx" #include "util/Domain.hxx" #include "util/ScopeExit.hxx" diff --git a/src/queue/PlaylistState.cxx b/src/queue/PlaylistState.cxx index 39db11b22..85f54d045 100644 --- a/src/queue/PlaylistState.cxx +++ b/src/queue/PlaylistState.cxx @@ -28,8 +28,8 @@ #include "SingleMode.hxx" #include "StateFileConfig.hxx" #include "queue/QueueSave.hxx" -#include "fs/io/LineReader.hxx" -#include "fs/io/BufferedOutputStream.hxx" +#include "io/LineReader.hxx" +#include "io/BufferedOutputStream.hxx" #include "player/Control.hxx" #include "util/CharUtil.hxx" #include "util/StringAPI.hxx" diff --git a/src/queue/QueueSave.cxx b/src/queue/QueueSave.cxx index 80ae917b0..f4639f599 100644 --- a/src/queue/QueueSave.cxx +++ b/src/queue/QueueSave.cxx @@ -23,8 +23,8 @@ #include "song/DetachedSong.hxx" #include "SongSave.hxx" #include "playlist/PlaylistSong.hxx" -#include "fs/io/LineReader.hxx" -#include "fs/io/BufferedOutputStream.hxx" +#include "io/LineReader.hxx" +#include "io/BufferedOutputStream.hxx" #include "util/StringCompare.hxx" #include "Log.hxx" diff --git a/src/storage/StorageState.cxx b/src/storage/StorageState.cxx index 422421030..e15f2f9d8 100644 --- a/src/storage/StorageState.cxx +++ b/src/storage/StorageState.cxx @@ -24,8 +24,8 @@ #include "StorageState.hxx" #include "lib/fmt/ExceptionFormatter.hxx" -#include "fs/io/LineReader.hxx" -#include "fs/io/BufferedOutputStream.hxx" +#include "io/LineReader.hxx" +#include "io/BufferedOutputStream.hxx" #include "storage/Registry.hxx" #include "storage/CompositeStorage.hxx" #include "db/plugins/simple/SimpleDatabasePlugin.hxx" diff --git a/test/ContainerScan.cxx b/test/ContainerScan.cxx index e97cc4ce9..8588df218 100644 --- a/test/ContainerScan.cxx +++ b/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" diff --git a/test/WriteFile.cxx b/test/WriteFile.cxx index 1ef9f909a..2ac700f18 100644 --- a/test/WriteFile.cxx +++ b/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" diff --git a/test/dump_playlist.cxx b/test/dump_playlist.cxx index 3e3993c73..f483e6675 100644 --- a/test/dump_playlist.cxx +++ b/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" diff --git a/test/meson.build b/test/meson.build index b8b1806c2..d3a69ccb4 100644 --- a/test/meson.build +++ b/test/meson.build @@ -183,7 +183,8 @@ if zlib_dep.found() 'run_gzip.cxx', include_directories: inc, dependencies: [ - fs_dep, + zlib_dep, + util_dep, ], ) diff --git a/test/run_encoder.cxx b/test/run_encoder.cxx index 6135b5f2e..7782bee9f 100644 --- a/test/run_encoder.cxx +++ b/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 diff --git a/test/run_gunzip.cxx b/test/run_gunzip.cxx index d9617e15e..c47c41464 100644 --- a/test/run_gunzip.cxx +++ b/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" diff --git a/test/run_gzip.cxx b/test/run_gzip.cxx index 362ce7a71..0c318480c 100644 --- a/test/run_gzip.cxx +++ b/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" diff --git a/test/run_input.cxx b/test/run_input.cxx index 8ba9c7489..8c8adfcd6 100644 --- a/test/run_input.cxx +++ b/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" diff --git a/test/test_vorbis_encoder.cxx b/test/test_vorbis_encoder.cxx index 670a108e4..ffcdc1fa5 100644 --- a/test/test_vorbis_encoder.cxx +++ b/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"