diff --git a/src/decoder/plugins/DsdLib.hxx b/src/decoder/plugins/DsdLib.hxx index 6709f2821..e4758e25a 100644 --- a/src/decoder/plugins/DsdLib.hxx +++ b/src/decoder/plugins/DsdLib.hxx @@ -20,7 +20,7 @@ #ifndef MPD_DECODER_DSDLIB_HXX #define MPD_DECODER_DSDLIB_HXX -#include "system/ByteOrder.hxx" +#include "util/ByteOrder.hxx" #include "input/Offset.hxx" #include "util/Compiler.h" diff --git a/src/decoder/plugins/DsdiffDecoderPlugin.cxx b/src/decoder/plugins/DsdiffDecoderPlugin.cxx index e601c6ebd..188f15083 100644 --- a/src/decoder/plugins/DsdiffDecoderPlugin.cxx +++ b/src/decoder/plugins/DsdiffDecoderPlugin.cxx @@ -32,7 +32,7 @@ #include "input/InputStream.hxx" #include "CheckAudioFormat.hxx" #include "util/bit_reverse.h" -#include "system/ByteOrder.hxx" +#include "util/ByteOrder.hxx" #include "tag/Handler.hxx" #include "DsdLib.hxx" #include "Log.hxx" diff --git a/src/decoder/plugins/DsfDecoderPlugin.cxx b/src/decoder/plugins/DsfDecoderPlugin.cxx index e040d449c..898ec32b5 100644 --- a/src/decoder/plugins/DsfDecoderPlugin.cxx +++ b/src/decoder/plugins/DsfDecoderPlugin.cxx @@ -33,7 +33,7 @@ #include "input/InputStream.hxx" #include "CheckAudioFormat.hxx" #include "util/bit_reverse.h" -#include "system/ByteOrder.hxx" +#include "util/ByteOrder.hxx" #include "DsdLib.hxx" #include "tag/Handler.hxx" #include "Log.hxx" diff --git a/src/decoder/plugins/HybridDsdDecoderPlugin.cxx b/src/decoder/plugins/HybridDsdDecoderPlugin.cxx index 9ff8802e4..3269c601d 100644 --- a/src/decoder/plugins/HybridDsdDecoderPlugin.cxx +++ b/src/decoder/plugins/HybridDsdDecoderPlugin.cxx @@ -20,7 +20,7 @@ #include "HybridDsdDecoderPlugin.hxx" #include "../DecoderAPI.hxx" #include "input/InputStream.hxx" -#include "system/ByteOrder.hxx" +#include "util/ByteOrder.hxx" #include "util/Domain.hxx" #include "util/WritableBuffer.hxx" #include "util/StaticFifoBuffer.hxx" diff --git a/src/decoder/plugins/PcmDecoderPlugin.cxx b/src/decoder/plugins/PcmDecoderPlugin.cxx index a5ee99b00..3cf9f3775 100644 --- a/src/decoder/plugins/PcmDecoderPlugin.cxx +++ b/src/decoder/plugins/PcmDecoderPlugin.cxx @@ -24,7 +24,7 @@ #include "CheckAudioFormat.hxx" #include "pcm/PcmPack.hxx" #include "input/InputStream.hxx" -#include "system/ByteOrder.hxx" +#include "util/ByteOrder.hxx" #include "util/Domain.hxx" #include "util/ByteReverse.hxx" #include "util/StaticFifoBuffer.hxx" diff --git a/src/decoder/plugins/SidplayDecoderPlugin.cxx b/src/decoder/plugins/SidplayDecoderPlugin.cxx index 90d762dae..3d34b4436 100644 --- a/src/decoder/plugins/SidplayDecoderPlugin.cxx +++ b/src/decoder/plugins/SidplayDecoderPlugin.cxx @@ -32,7 +32,7 @@ #include "util/Macros.hxx" #include "util/StringFormat.hxx" #include "util/Domain.hxx" -#include "system/ByteOrder.hxx" +#include "util/ByteOrder.hxx" #include "Log.hxx" #ifdef HAVE_SIDPLAYFP diff --git a/src/encoder/plugins/OpusEncoderPlugin.cxx b/src/encoder/plugins/OpusEncoderPlugin.cxx index 8a55ea07e..64c2aa617 100644 --- a/src/encoder/plugins/OpusEncoderPlugin.cxx +++ b/src/encoder/plugins/OpusEncoderPlugin.cxx @@ -22,7 +22,7 @@ #include "AudioFormat.hxx" #include "config/Domain.hxx" #include "util/Alloc.hxx" -#include "system/ByteOrder.hxx" +#include "util/ByteOrder.hxx" #include "util/StringUtil.hxx" #include diff --git a/src/encoder/plugins/WaveEncoderPlugin.cxx b/src/encoder/plugins/WaveEncoderPlugin.cxx index 2b6156569..20abcc474 100644 --- a/src/encoder/plugins/WaveEncoderPlugin.cxx +++ b/src/encoder/plugins/WaveEncoderPlugin.cxx @@ -19,7 +19,7 @@ #include "WaveEncoderPlugin.hxx" #include "../EncoderAPI.hxx" -#include "system/ByteOrder.hxx" +#include "util/ByteOrder.hxx" #include "util/DynamicFifoBuffer.hxx" #include diff --git a/src/input/plugins/CdioParanoiaInputPlugin.cxx b/src/input/plugins/CdioParanoiaInputPlugin.cxx index 2a96b6082..0079e55a9 100644 --- a/src/input/plugins/CdioParanoiaInputPlugin.cxx +++ b/src/input/plugins/CdioParanoiaInputPlugin.cxx @@ -30,7 +30,7 @@ #include "util/StringCompare.hxx" #include "util/RuntimeError.hxx" #include "util/Domain.hxx" -#include "system/ByteOrder.hxx" +#include "util/ByteOrder.hxx" #include "fs/AllocatedPath.hxx" #include "Log.hxx" #include "config/Block.hxx" diff --git a/src/lib/alsa/HwSetup.cxx b/src/lib/alsa/HwSetup.cxx index eae4ae32e..abdaf983f 100644 --- a/src/lib/alsa/HwSetup.cxx +++ b/src/lib/alsa/HwSetup.cxx @@ -19,7 +19,7 @@ #include "HwSetup.hxx" #include "Format.hxx" -#include "system/ByteOrder.hxx" +#include "util/ByteOrder.hxx" #include "util/Domain.hxx" #include "util/RuntimeError.hxx" #include "AudioFormat.hxx" diff --git a/src/net/IPv4Address.hxx b/src/net/IPv4Address.hxx index 7a39ed016..e1ca39dfa 100644 --- a/src/net/IPv4Address.hxx +++ b/src/net/IPv4Address.hxx @@ -31,7 +31,7 @@ #define IPV4_ADDRESS_HXX #include "SocketAddress.hxx" -#include "system/ByteOrder.hxx" +#include "util/ByteOrder.hxx" #include diff --git a/src/net/IPv6Address.hxx b/src/net/IPv6Address.hxx index e9531b3f7..a2911280a 100644 --- a/src/net/IPv6Address.hxx +++ b/src/net/IPv6Address.hxx @@ -31,7 +31,7 @@ #define IPV6_ADDRESS_HXX #include "SocketAddress.hxx" -#include "system/ByteOrder.hxx" +#include "util/ByteOrder.hxx" #include "util/Compiler.h" #include diff --git a/src/output/plugins/OSXOutputPlugin.cxx b/src/output/plugins/OSXOutputPlugin.cxx index db7a98e28..0eed34f64 100644 --- a/src/output/plugins/OSXOutputPlugin.cxx +++ b/src/output/plugins/OSXOutputPlugin.cxx @@ -29,7 +29,7 @@ #include "pcm/PcmExport.hxx" #include "thread/Mutex.hxx" #include "thread/Cond.hxx" -#include "system/ByteOrder.hxx" +#include "util/ByteOrder.hxx" #include "util/StringBuffer.hxx" #include "util/StringFormat.hxx" #include "Log.hxx" diff --git a/src/output/plugins/OssOutputPlugin.cxx b/src/output/plugins/OssOutputPlugin.cxx index 26e8ff2a9..591b081c5 100644 --- a/src/output/plugins/OssOutputPlugin.cxx +++ b/src/output/plugins/OssOutputPlugin.cxx @@ -25,7 +25,7 @@ #include "util/ConstBuffer.hxx" #include "util/Domain.hxx" #include "util/Macros.hxx" -#include "system/ByteOrder.hxx" +#include "util/ByteOrder.hxx" #include "Log.hxx" #include diff --git a/src/output/plugins/sles/SlesOutputPlugin.cxx b/src/output/plugins/sles/SlesOutputPlugin.cxx index 3ebe08dfd..ff6608e89 100644 --- a/src/output/plugins/sles/SlesOutputPlugin.cxx +++ b/src/output/plugins/sles/SlesOutputPlugin.cxx @@ -27,7 +27,7 @@ #include "thread/Cond.hxx" #include "util/Macros.hxx" #include "util/Domain.hxx" -#include "system/ByteOrder.hxx" +#include "util/ByteOrder.hxx" #include "Log.hxx" #include diff --git a/src/pcm/PcmPack.cxx b/src/pcm/PcmPack.cxx index 58d6a1a1d..cb4f4261e 100644 --- a/src/pcm/PcmPack.cxx +++ b/src/pcm/PcmPack.cxx @@ -18,7 +18,7 @@ */ #include "PcmPack.hxx" -#include "system/ByteOrder.hxx" +#include "util/ByteOrder.hxx" static void pack_sample(uint8_t *dest, const int32_t *src0) noexcept diff --git a/src/tag/Aiff.cxx b/src/tag/Aiff.cxx index 57ec343d5..3cc3a7f43 100644 --- a/src/tag/Aiff.cxx +++ b/src/tag/Aiff.cxx @@ -19,7 +19,7 @@ #include "Aiff.hxx" #include "input/InputStream.hxx" -#include "system/ByteOrder.hxx" +#include "util/ByteOrder.hxx" #include #include diff --git a/src/tag/ApeLoader.cxx b/src/tag/ApeLoader.cxx index 88556cd4b..eb2c76b75 100644 --- a/src/tag/ApeLoader.cxx +++ b/src/tag/ApeLoader.cxx @@ -18,7 +18,7 @@ */ #include "ApeLoader.hxx" -#include "system/ByteOrder.hxx" +#include "util/ByteOrder.hxx" #include "input/InputStream.hxx" #include "util/StringView.hxx" diff --git a/src/tag/Riff.cxx b/src/tag/Riff.cxx index 85cbcf743..9671861fe 100644 --- a/src/tag/Riff.cxx +++ b/src/tag/Riff.cxx @@ -19,7 +19,7 @@ #include "Riff.hxx" #include "input/InputStream.hxx" -#include "system/ByteOrder.hxx" +#include "util/ByteOrder.hxx" #include #include diff --git a/src/system/ByteOrder.hxx b/src/util/ByteOrder.hxx similarity index 99% rename from src/system/ByteOrder.hxx rename to src/util/ByteOrder.hxx index 8ed3b6c72..edeeb31c3 100644 --- a/src/system/ByteOrder.hxx +++ b/src/util/ByteOrder.hxx @@ -30,7 +30,7 @@ #ifndef BYTE_ORDER_HXX #define BYTE_ORDER_HXX -#include "util/Compiler.h" +#include "Compiler.h" #include diff --git a/src/util/ByteReverse.cxx b/src/util/ByteReverse.cxx index b0518316a..225f4089c 100644 --- a/src/util/ByteReverse.cxx +++ b/src/util/ByteReverse.cxx @@ -18,7 +18,7 @@ */ #include "ByteReverse.hxx" -#include "system/ByteOrder.hxx" +#include "util/ByteOrder.hxx" #include "Compiler.h" #include diff --git a/test/test_pcm_export.cxx b/test/test_pcm_export.cxx index c8b266617..e53cba931 100644 --- a/test/test_pcm_export.cxx +++ b/test/test_pcm_export.cxx @@ -20,7 +20,7 @@ #include "config.h" #include "pcm/PcmExport.hxx" #include "pcm/Traits.hxx" -#include "system/ByteOrder.hxx" +#include "util/ByteOrder.hxx" #include "util/ConstBuffer.hxx" #include diff --git a/test/test_pcm_pack.cxx b/test/test_pcm_pack.cxx index a3055cbf7..8acbac61c 100644 --- a/test/test_pcm_pack.cxx +++ b/test/test_pcm_pack.cxx @@ -19,7 +19,7 @@ #include "test_pcm_util.hxx" #include "pcm/PcmPack.hxx" -#include "system/ByteOrder.hxx" +#include "util/ByteOrder.hxx" #include