pcm_*: move to src/pcm/

Makefile.am

@@ -315,23 +315,23 @@ libevent_a_SOURCES = \
 # PCM library
 
 libpcm_a_SOURCES = \
-	src/pcm_buffer.c src/pcm_buffer.h \
-	src/pcm_export.c src/pcm_export.h \
-	src/PcmConvert.cxx src/PcmConvert.hxx \
-	src/dsd2pcm/dsd2pcm.c src/dsd2pcm/dsd2pcm.h \
-	src/pcm_dsd.c src/pcm_dsd.h \
-	src/pcm_dsd_usb.c src/pcm_dsd_usb.h \
-	src/PcmVolume.cxx src/PcmVolume.hxx \
-	src/PcmMix.cxx src/PcmMix.hxx \
-	src/PcmChannels.cxx src/PcmChannels.hxx \
-	src/pcm_pack.c src/pcm_pack.h \
-	src/PcmFormat.cxx src/PcmFormat.hxx \
-	src/pcm_resample.c src/pcm_resample.h \
-	src/pcm_resample_fallback.c \
-	src/pcm_resample_internal.h \
-	src/PcmDither.cxx src/PcmDither.hxx \
-	src/PcmPrng.hxx \
-	src/PcmUtils.hxx
+	src/pcm/pcm_buffer.c src/pcm/pcm_buffer.h \
+	src/pcm/pcm_export.c src/pcm/pcm_export.h \
+	src/pcm/PcmConvert.cxx src/pcm/PcmConvert.hxx \
+	src/pcm/dsd2pcm/dsd2pcm.c src/pcm/dsd2pcm/dsd2pcm.h \
+	src/pcm/pcm_dsd.c src/pcm/pcm_dsd.h \
+	src/pcm/pcm_dsd_usb.c src/pcm/pcm_dsd_usb.h \
+	src/pcm/PcmVolume.cxx src/pcm/PcmVolume.hxx \
+	src/pcm/PcmMix.cxx src/pcm/PcmMix.hxx \
+	src/pcm/PcmChannels.cxx src/pcm/PcmChannels.hxx \
+	src/pcm/pcm_pack.c src/pcm/pcm_pack.h \
+	src/pcm/PcmFormat.cxx src/pcm/PcmFormat.hxx \
+	src/pcm/pcm_resample.c src/pcm/pcm_resample.h \
+	src/pcm/pcm_resample_fallback.c \
+	src/pcm/pcm_resample_internal.h \
+	src/pcm/PcmDither.cxx src/pcm/PcmDither.hxx \
+	src/pcm/PcmPrng.hxx \
+	src/pcm/PcmUtils.hxx
 libpcm_a_CPPFLAGS = $(AM_CPPFLAGS) \
 	$(SAMPLERATE_CFLAGS)
 
@@ -340,7 +340,7 @@ PCM_LIBS = \
 	$(SAMPLERATE_LIBS)
 
 if HAVE_LIBSAMPLERATE
-libpcm_a_SOURCES += src/pcm_resample_libsamplerate.c
+libpcm_a_SOURCES += src/pcm/pcm_resample_libsamplerate.c
 endif
 
 # File system library
@@ -1141,13 +1141,14 @@ test_dump_playlist_LDADD = \
 	libevent.a \
 	libfs.a \
 	libutil.a \
+	libpcm.a \
 	$(GLIB_LIBS)
 test_dump_playlist_SOURCES = test/dump_playlist.cxx \
 	$(DECODER_SRC) \
 	src/IOThread.cxx \
 	src/Song.cxx src/Tag.cxx src/TagNames.c src/TagPool.cxx src/TagSave.cxx \
 	src/tag_handler.c src/TagFile.cxx \
-	src/audio_check.c src/pcm_buffer.c \
+	src/audio_check.c \
 	src/text_input_stream.c \
 	src/cue/CueParser.cxx src/cue/CueParser.hxx \
 	src/fd_util.c
@@ -1262,12 +1263,12 @@ test_test_vorbis_encoder_SOURCES = test/test_vorbis_encoder.cxx \
 	src/audio_check.c \
 	src/audio_format.c \
 	src/AudioParser.cxx \
-	src/pcm_buffer.c \
 	$(ENCODER_SRC)
 test_test_vorbis_encoder_CPPFLAGS = $(AM_CPPFLAGS) \
 	$(ENCODER_CFLAGS)
 test_test_vorbis_encoder_LDADD = $(MPD_LIBS) \
 	$(ENCODER_LIBS) \
+	$(PCM_LIBS) \
 	libconf.a \
 	libfs.a \
 	libutil.a \
@@ -1291,7 +1292,6 @@ test_run_normalize_LDADD = \
 	$(GLIB_LIBS)
 
 test_run_convert_SOURCES = test/run_convert.cxx \
-	src/dsd2pcm/dsd2pcm.c \
 	src/audio_format.c \
 	src/audio_check.c \
 	src/AudioParser.cxx
@@ -1401,13 +1401,13 @@ test_test_queue_priority_LDADD = \
 	libutil.a \
 	$(GLIB_LIBS)
 
-noinst_PROGRAMS += src/dsd2pcm/dsd2pcm
+noinst_PROGRAMS += src/pcm/dsd2pcm/dsd2pcm
 
-src_dsd2pcm_dsd2pcm_SOURCES = \
-	src/dsd2pcm/dsd2pcm.c src/dsd2pcm/dsd2pcm.h \
-	src/dsd2pcm/noiseshape.c src/dsd2pcm/noiseshape.h \
-	src/dsd2pcm/main.cpp
-src_dsd2pcm_dsd2pcm_LDADD = libutil.a
+src_pcm_dsd2pcm_dsd2pcm_SOURCES = \
+	src/pcm/dsd2pcm/dsd2pcm.c src/pcm/dsd2pcm/dsd2pcm.h \
+	src/pcm/dsd2pcm/noiseshape.c src/pcm/dsd2pcm/noiseshape.h \
+	src/pcm/dsd2pcm/main.cpp
+src_pcm_dsd2pcm_dsd2pcm_LDADD = libutil.a
 
 endif
 

src/DecoderInternal.hxx

@@ -21,7 +21,7 @@
 #define MPD_DECODER_INTERNAL_HXX
 
 #include "decoder_command.h"
-#include "PcmConvert.hxx"
+#include "pcm/PcmConvert.hxx"
 #include "replay_gain_info.h"
 
 struct input_stream;

src/Main.cxx

@@ -56,7 +56,7 @@
 extern "C" {
 #include "daemon.h"
 #include "stats.h"
-#include "pcm_resample.h"
+#include "pcm/pcm_resample.h"
 }
 
 #include "mpd_error.h"

src/MixerAll.cxx

@@ -23,7 +23,7 @@
 #include "MixerInternal.hxx"
 #include "MixerList.hxx"
 #include "OutputAll.hxx"
-#include "PcmVolume.hxx"
+#include "pcm/PcmVolume.hxx"
 
 extern "C" {
 #include "output_internal.h"

src/OutputThread.cxx

@@ -20,7 +20,7 @@
 #include "config.h"
 #include "OutputThread.hxx"
 #include "output_api.h"
-#include "PcmMix.hxx"
+#include "pcm/PcmMix.hxx"
 
 extern "C" {
 #include "output_internal.h"

src/decoder/FLACCommon.hxx

@@ -28,7 +28,7 @@
 #include "decoder_api.h"
 
 extern "C" {
-#include "pcm_buffer.h"
+#include "pcm/pcm_buffer.h"
 }
 
 #include <FLAC/stream_decoder.h>

src/encoder/flac_encoder.c

@@ -21,7 +21,7 @@
 #include "encoder_api.h"
 #include "encoder_plugin.h"
 #include "audio_format.h"
-#include "pcm_buffer.h"
+#include "pcm/pcm_buffer.h"
 #include "util/fifo_buffer.h"
 #include "util/growing_fifo.h"
 

src/filter/ConvertFilterPlugin.cxx

@@ -23,7 +23,7 @@
 #include "FilterInternal.hxx"
 #include "FilterRegistry.hxx"
 #include "conf.h"
-#include "PcmConvert.hxx"
+#include "pcm/PcmConvert.hxx"
 #include "util/Manual.hxx"
 #include "audio_format.h"
 #include "poison.h"

src/filter/NormalizeFilterPlugin.cxx

@@ -21,7 +21,7 @@
 #include "FilterPlugin.hxx"
 #include "FilterInternal.hxx"
 #include "FilterRegistry.hxx"
-#include "pcm_buffer.h"
+#include "pcm/pcm_buffer.h"
 #include "audio_format.h"
 #include "AudioCompress/compress.h"
 

src/filter/ReplayGainFilterPlugin.cxx

@@ -26,10 +26,10 @@
 #include "replay_gain_info.h"
 #include "replay_gain_config.h"
 #include "MixerControl.hxx"
-#include "PcmVolume.hxx"
+#include "pcm/PcmVolume.hxx"
 
 extern "C" {
-#include "pcm_buffer.h"
+#include "pcm/pcm_buffer.h"
 }
 
 #include <assert.h>

src/filter/RouteFilterPlugin.cxx

@@ -47,7 +47,7 @@
 #include "FilterPlugin.hxx"
 #include "FilterInternal.hxx"
 #include "FilterRegistry.hxx"
-#include "pcm_buffer.h"
+#include "pcm/pcm_buffer.h"
 
 #include <assert.h>
 #include <string.h>

src/filter/VolumeFilterPlugin.cxx

@@ -23,8 +23,8 @@
 #include "FilterInternal.hxx"
 #include "FilterRegistry.hxx"
 #include "conf.h"
-#include "pcm_buffer.h"
-#include "PcmVolume.hxx"
+#include "pcm/pcm_buffer.h"
+#include "pcm/PcmVolume.hxx"
 #include "audio_format.h"
 
 #include <assert.h>

src/mixer/SoftwareMixerPlugin.cxx

@@ -23,7 +23,7 @@
 #include "FilterPlugin.hxx"
 #include "FilterRegistry.hxx"
 #include "filter/VolumeFilterPlugin.hxx"
-#include "PcmVolume.hxx"
+#include "pcm/PcmVolume.hxx"
 
 #include <assert.h>
 #include <math.h>

src/output/AlsaOutputPlugin.cxx

@@ -21,7 +21,7 @@
 #include "AlsaOutputPlugin.hxx"
 #include "output_api.h"
 #include "MixerList.hxx"
-#include "pcm_export.h"
+#include "pcm/pcm_export.h"
 
 #include <glib.h>
 #include <alsa/asoundlib.h>

src/output/OssOutputPlugin.cxx

@@ -52,7 +52,7 @@
 #endif
 
 #ifdef AFMT_S24_PACKED
-#include "pcm_export.h"
+#include "pcm/pcm_export.h"
 #endif
 
 struct oss_data {

src/output/WinmmOutputPlugin.cxx

@@ -20,7 +20,7 @@
 #include "config.h"
 #include "WinmmOutputPlugin.hxx"
 #include "output_api.h"
-#include "pcm_buffer.h"
+#include "pcm/pcm_buffer.h"
 #include "MixerList.hxx"
 
 #include <stdlib.h>

src/output_internal.h

@@ -21,7 +21,7 @@
 #define MPD_OUTPUT_INTERNAL_H
 
 #include "audio_format.h"
-#include "pcm_buffer.h"
+#include "pcm/pcm_buffer.h"
 
 #include <glib.h>
 

test/read_mixer.cxx

@@ -21,7 +21,7 @@
 #include "MixerControl.hxx"
 #include "MixerList.hxx"
 #include "FilterRegistry.hxx"
-#include "PcmVolume.hxx"
+#include "pcm/PcmVolume.hxx"
 #include "GlobalEvents.hxx"
 #include "Main.hxx"
 #include "event/Loop.hxx"

test/run_convert.cxx

@@ -26,7 +26,7 @@
 #include "config.h"
 #include "AudioParser.hxx"
 #include "audio_format.h"
-#include "PcmConvert.hxx"
+#include "pcm/PcmConvert.hxx"
 #include "conf.h"
 #include "util/fifo_buffer.h"
 #include "stdbin.h"

test/run_filter.cxx

@@ -24,7 +24,7 @@
 #include "audio_format.h"
 #include "FilterPlugin.hxx"
 #include "FilterInternal.hxx"
-#include "PcmVolume.hxx"
+#include "pcm/PcmVolume.hxx"
 #include "MixerControl.hxx"
 #include "stdbin.h"
 

test/run_output.cxx

@@ -27,7 +27,7 @@
 #include "IOThread.hxx"
 #include "fs/Path.hxx"
 #include "AudioParser.hxx"
-#include "PcmConvert.hxx"
+#include "pcm/PcmConvert.hxx"
 
 extern "C" {
 #include "output_plugin.h"

test/software_volume.cxx

@@ -24,7 +24,7 @@
  */
 
 #include "config.h"
-#include "PcmVolume.hxx"
+#include "pcm/PcmVolume.hxx"
 #include "AudioParser.hxx"
 #include "audio_format.h"
 #include "stdbin.h"

test/test_pcm_channels.cxx

@@ -20,8 +20,8 @@
 #include "config.h"
 #include "test_pcm_all.hxx"
 #include "test_pcm_util.hxx"
-#include "PcmChannels.hxx"
-#include "pcm_buffer.h"
+#include "pcm/PcmChannels.hxx"
+#include "pcm/pcm_buffer.h"
 
 #include <glib.h>
 

test/test_pcm_dither.cxx

@@ -19,7 +19,7 @@
 
 #include "test_pcm_all.hxx"
 #include "test_pcm_util.hxx"
-#include "PcmDither.hxx"
+#include "pcm/PcmDither.hxx"
 
 #include <glib.h>
 

test/test_pcm_format.cxx

@@ -20,10 +20,10 @@
 #include "config.h"
 #include "test_pcm_all.hxx"
 #include "test_pcm_util.hxx"
-#include "PcmFormat.hxx"
-#include "PcmDither.hxx"
-#include "PcmUtils.hxx"
-#include "pcm_buffer.h"
+#include "pcm/PcmFormat.hxx"
+#include "pcm/PcmDither.hxx"
+#include "pcm/PcmUtils.hxx"
+#include "pcm/pcm_buffer.h"
 #include "audio_format.h"
 
 #include <glib.h>

test/test_pcm_mix.cxx

@@ -20,7 +20,7 @@
 #include "config.h"
 #include "test_pcm_all.hxx"
 #include "test_pcm_util.hxx"
-#include "PcmMix.hxx"
+#include "pcm/PcmMix.hxx"
 
 #include <glib.h>
 

test/test_pcm_pack.cxx

@@ -21,7 +21,7 @@
 #include "test_pcm_util.hxx"
 
 extern "C" {
-#include "pcm_pack.h"
+#include "pcm/pcm_pack.h"
 }
 
 #include <glib.h>

test/test_pcm_volume.cxx

@@ -18,7 +18,7 @@
  */
 
 #include "test_pcm_all.hxx"
-#include "PcmVolume.hxx"
+#include "pcm/PcmVolume.hxx"
 #include "test_pcm_util.hxx"
 
 #include <glib.h>