oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

pcm_*: move to src/pcm/

This commit is contained in:
Max Kellermann 2013-04-09 01:24:52 +02:00
parent 3f3b26fb0e
commit c654c7630a
65 changed files with 60 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
Makefile.am
View File

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

2
src/DecoderInternal.hxx
View File

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

2
src/Main.cxx
View File

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

2
src/MixerAll.cxx
View File

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

2
src/OutputThread.cxx
View File

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

2
src/decoder/FLACCommon.hxx
View File

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

2
src/encoder/flac_encoder.c
View File

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

2
src/filter/ConvertFilterPlugin.cxx
View File

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

2
src/filter/NormalizeFilterPlugin.cxx
View File

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

4
src/filter/ReplayGainFilterPlugin.cxx
View File

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

2
src/filter/RouteFilterPlugin.cxx
View File

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

4
src/filter/VolumeFilterPlugin.cxx
View File

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

2
src/mixer/SoftwareMixerPlugin.cxx
View File

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

2
src/output/AlsaOutputPlugin.cxx
View File

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

2
src/output/OssOutputPlugin.cxx
View File

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

2
src/output/WinmmOutputPlugin.cxx
View File

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

2
src/output_internal.h
View File

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

0
src/PcmChannels.cxx → src/pcm/PcmChannels.cxx
View File

0
src/PcmChannels.hxx → src/pcm/PcmChannels.hxx
View File

0
src/PcmConvert.cxx → src/pcm/PcmConvert.cxx
View File

0
src/PcmConvert.hxx → src/pcm/PcmConvert.hxx
View File

0
src/PcmDither.cxx → src/pcm/PcmDither.cxx
View File

0
src/PcmDither.hxx → src/pcm/PcmDither.hxx
View File

0
src/PcmFormat.cxx → src/pcm/PcmFormat.cxx
View File

0
src/PcmFormat.hxx → src/pcm/PcmFormat.hxx
View File

0
src/PcmMix.cxx → src/pcm/PcmMix.cxx
View File

0
src/PcmMix.hxx → src/pcm/PcmMix.hxx
View File

0
src/PcmPrng.hxx → src/pcm/PcmPrng.hxx
View File

0
src/PcmUtils.hxx → src/pcm/PcmUtils.hxx
View File

0
src/PcmVolume.cxx → src/pcm/PcmVolume.cxx
View File

0
src/PcmVolume.hxx → src/pcm/PcmVolume.hxx
View File

0
src/dsd2pcm/dsd2pcm.c → src/pcm/dsd2pcm/dsd2pcm.c
View File

0
src/dsd2pcm/dsd2pcm.h → src/pcm/dsd2pcm/dsd2pcm.h
View File

0
src/dsd2pcm/dsd2pcm.hpp → src/pcm/dsd2pcm/dsd2pcm.hpp
View File

0
src/dsd2pcm/info.txt → src/pcm/dsd2pcm/info.txt
View File

0
src/dsd2pcm/main.cpp → src/pcm/dsd2pcm/main.cpp
View File

0
src/dsd2pcm/noiseshape.c → src/pcm/dsd2pcm/noiseshape.c
View File

0
src/dsd2pcm/noiseshape.h → src/pcm/dsd2pcm/noiseshape.h
View File

0
src/dsd2pcm/noiseshape.hpp → src/pcm/dsd2pcm/noiseshape.hpp
View File

0
src/pcm_buffer.c → src/pcm/pcm_buffer.c
View File

0
src/pcm_buffer.h → src/pcm/pcm_buffer.h
View File

0
src/pcm_dsd.c → src/pcm/pcm_dsd.c
View File

0
src/pcm_dsd.h → src/pcm/pcm_dsd.h
View File

0
src/pcm_dsd_usb.c → src/pcm/pcm_dsd_usb.c
View File

0
src/pcm_dsd_usb.h → src/pcm/pcm_dsd_usb.h
View File

0
src/pcm_export.c → src/pcm/pcm_export.c
View File

0
src/pcm_export.h → src/pcm/pcm_export.h
View File

0
src/pcm_pack.c → src/pcm/pcm_pack.c
View File

0
src/pcm_pack.h → src/pcm/pcm_pack.h
View File

0
src/pcm_resample.c → src/pcm/pcm_resample.c
View File

0
src/pcm_resample.h → src/pcm/pcm_resample.h
View File

0
src/pcm_resample_fallback.c → src/pcm/pcm_resample_fallback.c
View File

0
src/pcm_resample_internal.h → src/pcm/pcm_resample_internal.h
View File

0
src/pcm_resample_libsamplerate.c → src/pcm/pcm_resample_libsamplerate.c
View File

2
test/read_mixer.cxx
View File

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

2
test/run_convert.cxx
View File

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

2
test/run_filter.cxx
View File

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

2
test/run_output.cxx
View File

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

2
test/software_volume.cxx
View File

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

4
test/test_pcm_channels.cxx
View File

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

2
test/test_pcm_dither.cxx
View File

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

8
test/test_pcm_format.cxx
View File

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

2
test/test_pcm_mix.cxx
View File

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

2
test/test_pcm_pack.cxx
View File

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

2
test/test_pcm_volume.cxx
View File

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