[Pkg-mpd-commits] [SCM] Git repository for pkg-mpd branch, master, updated. upstream/0.16.2-28-g71fb44f
Alexander Wirt
formorer at debian.org
Sat May 14 15:31:35 UTC 2011
The following commit has been merged in the master branch:
commit f75af78043428fb77253d1ddf16bb688bad0cefa
Author: Alexander Wirt <formorer at debian.org>
Date: Sun Mar 20 19:50:43 2011 +0100
Imported Upstream version 0.16.2
diff --git a/Makefile.am b/Makefile.am
index cf79d09..88eebe6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -859,6 +859,7 @@ test_run_input_LDADD = $(MPD_LIBS) \
$(INPUT_LIBS) \
$(GLIB_LIBS)
test_run_input_SOURCES = test/run_input.c \
+ test/stdbin.h \
src/conf.c src/tokenizer.c src/utils.c \
src/tag.c src/tag_pool.c src/tag_save.c \
src/fd_util.c \
@@ -906,6 +907,7 @@ test_run_decoder_LDADD = $(MPD_LIBS) \
$(INPUT_LIBS) $(DECODER_LIBS) \
$(GLIB_LIBS)
test_run_decoder_SOURCES = test/run_decoder.c \
+ test/stdbin.h \
src/conf.c src/tokenizer.c src/utils.c src/log.c \
src/tag.c src/tag_pool.c \
src/replay_gain_info.c \
@@ -946,6 +948,7 @@ test_run_filter_LDADD = $(MPD_LIBS) \
$(SAMPLERATE_LIBS) \
$(GLIB_LIBS)
test_run_filter_SOURCES = test/run_filter.c \
+ test/stdbin.h \
src/filter_plugin.c \
src/filter_registry.c \
src/conf.c src/tokenizer.c src/utils.c \
@@ -968,6 +971,7 @@ endif
if ENABLE_ENCODER
noinst_PROGRAMS += test/run_encoder
test_run_encoder_SOURCES = test/run_encoder.c \
+ test/stdbin.h \
src/conf.c src/tokenizer.c \
src/utils.c \
src/tag.c src/tag_pool.c \
@@ -975,12 +979,15 @@ test_run_encoder_SOURCES = test/run_encoder.c \
src/audio_format.c \
src/audio_parser.c \
$(ENCODER_SRC)
+test_run_encoder_CPPFLAGS = $(AM_CPPFLAGS) \
+ $(ENCODER_CFLAGS)
test_run_encoder_LDADD = $(MPD_LIBS) \
$(ENCODER_LIBS) \
$(GLIB_LIBS)
endif
test_software_volume_SOURCES = test/software_volume.c \
+ test/stdbin.h \
src/audio_check.c \
src/audio_parser.c \
src/pcm_volume.c
@@ -988,6 +995,7 @@ test_software_volume_LDADD = \
$(GLIB_LIBS)
test_run_normalize_SOURCES = test/run_normalize.c \
+ test/stdbin.h \
src/audio_check.c \
src/audio_parser.c \
src/AudioCompress/compress.c
@@ -1025,6 +1033,7 @@ test_run_output_LDADD = $(MPD_LIBS) \
$(OUTPUT_LIBS) \
$(GLIB_LIBS)
test_run_output_SOURCES = test/run_output.c \
+ test/stdbin.h \
src/conf.c src/tokenizer.c src/utils.c src/log.c \
src/audio_check.c \
src/audio_format.c \
diff --git a/Makefile.in b/Makefile.in
index 6390628..51c39b9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -913,9 +913,9 @@ am__test_run_convert_SOURCES_DIST = test/run_convert.c \
test_run_convert_OBJECTS = $(am_test_run_convert_OBJECTS)
@ENABLE_TEST_TRUE at test_run_convert_DEPENDENCIES = \
@ENABLE_TEST_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-am__test_run_decoder_SOURCES_DIST = test/run_decoder.c src/conf.c \
- src/tokenizer.c src/utils.c src/log.c src/tag.c src/tag_pool.c \
- src/replay_gain_info.c src/uri.c src/fd_util.c \
+am__test_run_decoder_SOURCES_DIST = test/run_decoder.c test/stdbin.h \
+ src/conf.c src/tokenizer.c src/utils.c src/log.c src/tag.c \
+ src/tag_pool.c src/replay_gain_info.c src/uri.c src/fd_util.c \
src/audio_check.c src/audio_format.c src/timer.c \
src/archive/bz2_archive_plugin.c \
src/archive/zzip_archive_plugin.c \
@@ -1028,39 +1028,39 @@ test_run_decoder_OBJECTS = $(am_test_run_decoder_OBJECTS)
@ENABLE_TEST_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
@ENABLE_TEST_TRUE@ $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
@ENABLE_TEST_TRUE@ $(am__DEPENDENCIES_6) $(am__DEPENDENCIES_1)
-am__test_run_encoder_SOURCES_DIST = test/run_encoder.c src/conf.c \
- src/tokenizer.c src/utils.c src/tag.c src/tag_pool.c \
- src/audio_check.c src/audio_format.c src/audio_parser.c \
- src/encoder_list.c src/encoder/null_encoder.c \
- src/encoder/wave_encoder.c src/encoder/vorbis_encoder.c \
- src/encoder/lame_encoder.c src/encoder/twolame_encoder.c \
- src/encoder/flac_encoder.c
- at ENABLE_ENCODER_TRUE@am__objects_161 = src/encoder_list.$(OBJEXT) \
- at ENABLE_ENCODER_TRUE@ src/encoder/null_encoder.$(OBJEXT)
- at ENABLE_ENCODER_TRUE@@ENABLE_WAVE_ENCODER_TRUE at am__objects_162 = src/encoder/wave_encoder.$(OBJEXT)
- at ENABLE_ENCODER_TRUE@@ENABLE_VORBIS_ENCODER_TRUE at am__objects_163 = src/encoder/vorbis_encoder.$(OBJEXT)
- at ENABLE_ENCODER_TRUE@@ENABLE_LAME_ENCODER_TRUE at am__objects_164 = src/encoder/lame_encoder.$(OBJEXT)
- at ENABLE_ENCODER_TRUE@@ENABLE_TWOLAME_ENCODER_TRUE at am__objects_165 = src/encoder/twolame_encoder.$(OBJEXT)
- at ENABLE_ENCODER_TRUE@@ENABLE_FLAC_ENCODER_TRUE at am__objects_166 = src/encoder/flac_encoder.$(OBJEXT)
+am__test_run_encoder_SOURCES_DIST = test/run_encoder.c test/stdbin.h \
+ src/conf.c src/tokenizer.c src/utils.c src/tag.c \
+ src/tag_pool.c src/audio_check.c src/audio_format.c \
+ src/audio_parser.c src/encoder_list.c \
+ src/encoder/null_encoder.c src/encoder/wave_encoder.c \
+ src/encoder/vorbis_encoder.c src/encoder/lame_encoder.c \
+ src/encoder/twolame_encoder.c src/encoder/flac_encoder.c
+ at ENABLE_ENCODER_TRUE@am__objects_161 = src/test_run_encoder-encoder_list.$(OBJEXT) \
+ at ENABLE_ENCODER_TRUE@ src/encoder/test_run_encoder-null_encoder.$(OBJEXT)
+ at ENABLE_ENCODER_TRUE@@ENABLE_WAVE_ENCODER_TRUE at am__objects_162 = src/encoder/test_run_encoder-wave_encoder.$(OBJEXT)
+ at ENABLE_ENCODER_TRUE@@ENABLE_VORBIS_ENCODER_TRUE at am__objects_163 = src/encoder/test_run_encoder-vorbis_encoder.$(OBJEXT)
+ at ENABLE_ENCODER_TRUE@@ENABLE_LAME_ENCODER_TRUE at am__objects_164 = src/encoder/test_run_encoder-lame_encoder.$(OBJEXT)
+ at ENABLE_ENCODER_TRUE@@ENABLE_TWOLAME_ENCODER_TRUE at am__objects_165 = src/encoder/test_run_encoder-twolame_encoder.$(OBJEXT)
+ at ENABLE_ENCODER_TRUE@@ENABLE_FLAC_ENCODER_TRUE at am__objects_166 = src/encoder/test_run_encoder-flac_encoder.$(OBJEXT)
am__objects_167 = $(am__objects_161) $(am__objects_162) \
$(am__objects_163) $(am__objects_164) $(am__objects_165) \
$(am__objects_166)
- at ENABLE_ENCODER_TRUE@@ENABLE_TEST_TRUE at am_test_run_encoder_OBJECTS = test/run_encoder.$(OBJEXT) \
- at ENABLE_ENCODER_TRUE@@ENABLE_TEST_TRUE@ src/conf.$(OBJEXT) \
- at ENABLE_ENCODER_TRUE@@ENABLE_TEST_TRUE@ src/tokenizer.$(OBJEXT) \
- at ENABLE_ENCODER_TRUE@@ENABLE_TEST_TRUE@ src/utils.$(OBJEXT) \
- at ENABLE_ENCODER_TRUE@@ENABLE_TEST_TRUE@ src/tag.$(OBJEXT) \
- at ENABLE_ENCODER_TRUE@@ENABLE_TEST_TRUE@ src/tag_pool.$(OBJEXT) \
- at ENABLE_ENCODER_TRUE@@ENABLE_TEST_TRUE@ src/audio_check.$(OBJEXT) \
- at ENABLE_ENCODER_TRUE@@ENABLE_TEST_TRUE@ src/audio_format.$(OBJEXT) \
- at ENABLE_ENCODER_TRUE@@ENABLE_TEST_TRUE@ src/audio_parser.$(OBJEXT) \
+ at ENABLE_ENCODER_TRUE@@ENABLE_TEST_TRUE at am_test_run_encoder_OBJECTS = test/test_run_encoder-run_encoder.$(OBJEXT) \
+ at ENABLE_ENCODER_TRUE@@ENABLE_TEST_TRUE@ src/test_run_encoder-conf.$(OBJEXT) \
+ at ENABLE_ENCODER_TRUE@@ENABLE_TEST_TRUE@ src/test_run_encoder-tokenizer.$(OBJEXT) \
+ at ENABLE_ENCODER_TRUE@@ENABLE_TEST_TRUE@ src/test_run_encoder-utils.$(OBJEXT) \
+ at ENABLE_ENCODER_TRUE@@ENABLE_TEST_TRUE@ src/test_run_encoder-tag.$(OBJEXT) \
+ at ENABLE_ENCODER_TRUE@@ENABLE_TEST_TRUE@ src/test_run_encoder-tag_pool.$(OBJEXT) \
+ at ENABLE_ENCODER_TRUE@@ENABLE_TEST_TRUE@ src/test_run_encoder-audio_check.$(OBJEXT) \
+ at ENABLE_ENCODER_TRUE@@ENABLE_TEST_TRUE@ src/test_run_encoder-audio_format.$(OBJEXT) \
+ at ENABLE_ENCODER_TRUE@@ENABLE_TEST_TRUE@ src/test_run_encoder-audio_parser.$(OBJEXT) \
@ENABLE_ENCODER_TRUE@@ENABLE_TEST_TRUE@ $(am__objects_167)
test_run_encoder_OBJECTS = $(am_test_run_encoder_OBJECTS)
@ENABLE_ENCODER_TRUE@@ENABLE_TEST_TRUE at test_run_encoder_DEPENDENCIES = \
@ENABLE_ENCODER_TRUE@@ENABLE_TEST_TRUE@ $(am__DEPENDENCIES_1) \
@ENABLE_ENCODER_TRUE@@ENABLE_TEST_TRUE@ $(am__DEPENDENCIES_7) \
@ENABLE_ENCODER_TRUE@@ENABLE_TEST_TRUE@ $(am__DEPENDENCIES_1)
-am__test_run_filter_SOURCES_DIST = test/run_filter.c \
+am__test_run_filter_SOURCES_DIST = test/run_filter.c test/stdbin.h \
src/filter_plugin.c src/filter_registry.c src/conf.c \
src/tokenizer.c src/utils.c src/pcm_volume.c src/pcm_convert.c \
src/pcm_byteswap.c src/pcm_format.c src/pcm_channels.c \
@@ -1123,9 +1123,10 @@ am__test_run_inotify_SOURCES_DIST = test/run_inotify.c src/fd_util.c \
test_run_inotify_OBJECTS = $(am_test_run_inotify_OBJECTS)
@ENABLE_INOTIFY_TRUE@@ENABLE_TEST_TRUE at test_run_inotify_DEPENDENCIES = \
@ENABLE_INOTIFY_TRUE@@ENABLE_TEST_TRUE@ $(am__DEPENDENCIES_1)
-am__test_run_input_SOURCES_DIST = test/run_input.c src/conf.c \
- src/tokenizer.c src/utils.c src/tag.c src/tag_pool.c \
- src/tag_save.c src/fd_util.c src/archive/bz2_archive_plugin.c \
+am__test_run_input_SOURCES_DIST = test/run_input.c test/stdbin.h \
+ src/conf.c src/tokenizer.c src/utils.c src/tag.c \
+ src/tag_pool.c src/tag_save.c src/fd_util.c \
+ src/archive/bz2_archive_plugin.c \
src/archive/zzip_archive_plugin.c \
src/archive/iso9660_archive_plugin.c src/archive_api.c \
src/archive_list.c src/archive_plugin.c \
@@ -1169,7 +1170,7 @@ test_run_input_OBJECTS = $(am_test_run_input_OBJECTS)
@ENABLE_TEST_TRUE@ $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
@ENABLE_TEST_TRUE@ $(am__DEPENDENCIES_1)
am__test_run_normalize_SOURCES_DIST = test/run_normalize.c \
- src/audio_check.c src/audio_parser.c \
+ test/stdbin.h src/audio_check.c src/audio_parser.c \
src/AudioCompress/compress.c
@ENABLE_TEST_TRUE at am_test_run_normalize_OBJECTS = \
@ENABLE_TEST_TRUE@ test/run_normalize.$(OBJEXT) \
@@ -1179,11 +1180,12 @@ am__test_run_normalize_SOURCES_DIST = test/run_normalize.c \
test_run_normalize_OBJECTS = $(am_test_run_normalize_OBJECTS)
@ENABLE_TEST_TRUE at test_run_normalize_DEPENDENCIES = \
@ENABLE_TEST_TRUE@ $(am__DEPENDENCIES_1)
-am__test_run_output_SOURCES_DIST = test/run_output.c src/conf.c \
- src/tokenizer.c src/utils.c src/log.c src/audio_check.c \
- src/audio_format.c src/audio_parser.c src/timer.c src/tag.c \
- src/tag_pool.c src/fifo_buffer.c src/page.c src/socket_util.c \
- src/output_init.c src/output_list.c src/encoder_list.c \
+am__test_run_output_SOURCES_DIST = test/run_output.c test/stdbin.h \
+ src/conf.c src/tokenizer.c src/utils.c src/log.c \
+ src/audio_check.c src/audio_format.c src/audio_parser.c \
+ src/timer.c src/tag.c src/tag_pool.c src/fifo_buffer.c \
+ src/page.c src/socket_util.c src/output_init.c \
+ src/output_list.c src/encoder_list.c \
src/encoder/null_encoder.c src/encoder/wave_encoder.c \
src/encoder/vorbis_encoder.c src/encoder/lame_encoder.c \
src/encoder/twolame_encoder.c src/encoder/flac_encoder.c \
@@ -1299,7 +1301,8 @@ test_run_output_OBJECTS = $(am_test_run_output_OBJECTS)
test_run_output_LINK = $(CCLD) $(test_run_output_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
am__test_software_volume_SOURCES_DIST = test/software_volume.c \
- src/audio_check.c src/audio_parser.c src/pcm_volume.c
+ test/stdbin.h src/audio_check.c src/audio_parser.c \
+ src/pcm_volume.c
@ENABLE_TEST_TRUE at am_test_software_volume_OBJECTS = \
@ENABLE_TEST_TRUE@ test/software_volume.$(OBJEXT) \
@ENABLE_TEST_TRUE@ src/audio_check.$(OBJEXT) \
@@ -2038,6 +2041,7 @@ SPARSE_CPPFLAGS = $(DEFAULT_INCLUDES) -I$(shell $(CC) \
@ENABLE_TEST_TRUE@ $(GLIB_LIBS)
@ENABLE_TEST_TRUE at test_run_input_SOURCES = test/run_input.c \
+ at ENABLE_TEST_TRUE@ test/stdbin.h \
@ENABLE_TEST_TRUE@ src/conf.c src/tokenizer.c src/utils.c \
@ENABLE_TEST_TRUE@ src/tag.c src/tag_pool.c src/tag_save.c \
@ENABLE_TEST_TRUE@ src/fd_util.c \
@@ -2077,6 +2081,7 @@ SPARSE_CPPFLAGS = $(DEFAULT_INCLUDES) -I$(shell $(CC) \
@ENABLE_TEST_TRUE@ $(GLIB_LIBS)
@ENABLE_TEST_TRUE at test_run_decoder_SOURCES = test/run_decoder.c \
+ at ENABLE_TEST_TRUE@ test/stdbin.h \
@ENABLE_TEST_TRUE@ src/conf.c src/tokenizer.c src/utils.c src/log.c \
@ENABLE_TEST_TRUE@ src/tag.c src/tag_pool.c \
@ENABLE_TEST_TRUE@ src/replay_gain_info.c \
@@ -2120,12 +2125,13 @@ SPARSE_CPPFLAGS = $(DEFAULT_INCLUDES) -I$(shell $(CC) \
@ENABLE_TEST_TRUE@ $(GLIB_LIBS)
@ENABLE_TEST_TRUE at test_run_filter_SOURCES = test/run_filter.c \
- at ENABLE_TEST_TRUE@ src/filter_plugin.c src/filter_registry.c \
- at ENABLE_TEST_TRUE@ src/conf.c src/tokenizer.c src/utils.c \
- at ENABLE_TEST_TRUE@ src/pcm_volume.c src/pcm_convert.c \
- at ENABLE_TEST_TRUE@ src/pcm_byteswap.c src/pcm_format.c \
- at ENABLE_TEST_TRUE@ src/pcm_channels.c src/pcm_dither.c \
- at ENABLE_TEST_TRUE@ src/pcm_pack.c src/pcm_resample.c \
+ at ENABLE_TEST_TRUE@ test/stdbin.h src/filter_plugin.c \
+ at ENABLE_TEST_TRUE@ src/filter_registry.c src/conf.c \
+ at ENABLE_TEST_TRUE@ src/tokenizer.c src/utils.c src/pcm_volume.c \
+ at ENABLE_TEST_TRUE@ src/pcm_convert.c src/pcm_byteswap.c \
+ at ENABLE_TEST_TRUE@ src/pcm_format.c src/pcm_channels.c \
+ at ENABLE_TEST_TRUE@ src/pcm_dither.c src/pcm_pack.c \
+ at ENABLE_TEST_TRUE@ src/pcm_resample.c \
@ENABLE_TEST_TRUE@ src/pcm_resample_fallback.c \
@ENABLE_TEST_TRUE@ src/audio_check.c src/audio_format.c \
@ENABLE_TEST_TRUE@ src/audio_parser.c src/replay_gain_config.c \
@@ -2133,6 +2139,7 @@ SPARSE_CPPFLAGS = $(DEFAULT_INCLUDES) -I$(shell $(CC) \
@ENABLE_TEST_TRUE@ src/AudioCompress/compress.c $(FILTER_SRC) \
@ENABLE_TEST_TRUE@ $(am__append_69)
@ENABLE_ENCODER_TRUE@@ENABLE_TEST_TRUE at test_run_encoder_SOURCES = test/run_encoder.c \
+ at ENABLE_ENCODER_TRUE@@ENABLE_TEST_TRUE@ test/stdbin.h \
@ENABLE_ENCODER_TRUE@@ENABLE_TEST_TRUE@ src/conf.c src/tokenizer.c \
@ENABLE_ENCODER_TRUE@@ENABLE_TEST_TRUE@ src/utils.c \
@ENABLE_ENCODER_TRUE@@ENABLE_TEST_TRUE@ src/tag.c src/tag_pool.c \
@@ -2141,11 +2148,15 @@ SPARSE_CPPFLAGS = $(DEFAULT_INCLUDES) -I$(shell $(CC) \
@ENABLE_ENCODER_TRUE@@ENABLE_TEST_TRUE@ src/audio_parser.c \
@ENABLE_ENCODER_TRUE@@ENABLE_TEST_TRUE@ $(ENCODER_SRC)
+ at ENABLE_ENCODER_TRUE@@ENABLE_TEST_TRUE at test_run_encoder_CPPFLAGS = $(AM_CPPFLAGS) \
+ at ENABLE_ENCODER_TRUE@@ENABLE_TEST_TRUE@ $(ENCODER_CFLAGS)
+
@ENABLE_ENCODER_TRUE@@ENABLE_TEST_TRUE at test_run_encoder_LDADD = $(MPD_LIBS) \
@ENABLE_ENCODER_TRUE@@ENABLE_TEST_TRUE@ $(ENCODER_LIBS) \
@ENABLE_ENCODER_TRUE@@ENABLE_TEST_TRUE@ $(GLIB_LIBS)
@ENABLE_TEST_TRUE at test_software_volume_SOURCES = test/software_volume.c \
+ at ENABLE_TEST_TRUE@ test/stdbin.h \
@ENABLE_TEST_TRUE@ src/audio_check.c \
@ENABLE_TEST_TRUE@ src/audio_parser.c \
@ENABLE_TEST_TRUE@ src/pcm_volume.c
@@ -2154,6 +2165,7 @@ SPARSE_CPPFLAGS = $(DEFAULT_INCLUDES) -I$(shell $(CC) \
@ENABLE_TEST_TRUE@ $(GLIB_LIBS)
@ENABLE_TEST_TRUE at test_run_normalize_SOURCES = test/run_normalize.c \
+ at ENABLE_TEST_TRUE@ test/stdbin.h \
@ENABLE_TEST_TRUE@ src/audio_check.c \
@ENABLE_TEST_TRUE@ src/audio_parser.c \
@ENABLE_TEST_TRUE@ src/AudioCompress/compress.c
@@ -2185,6 +2197,7 @@ SPARSE_CPPFLAGS = $(DEFAULT_INCLUDES) -I$(shell $(CC) \
@ENABLE_TEST_TRUE@ $(GLIB_LIBS)
@ENABLE_TEST_TRUE at test_run_output_SOURCES = test/run_output.c \
+ at ENABLE_TEST_TRUE@ test/stdbin.h \
@ENABLE_TEST_TRUE@ src/conf.c src/tokenizer.c src/utils.c src/log.c \
@ENABLE_TEST_TRUE@ src/audio_check.c \
@ENABLE_TEST_TRUE@ src/audio_format.c \
@@ -3425,34 +3438,43 @@ src/cue/test_run_decoder-cue_tag.$(OBJEXT): src/cue/$(am__dirstamp) \
test/run_decoder$(EXEEXT): $(test_run_decoder_OBJECTS) $(test_run_decoder_DEPENDENCIES) test/$(am__dirstamp)
@rm -f test/run_decoder$(EXEEXT)
$(CXXLINK) $(test_run_decoder_OBJECTS) $(test_run_decoder_LDADD) $(LIBS)
-test/run_encoder.$(OBJEXT): test/$(am__dirstamp) \
+test/test_run_encoder-run_encoder.$(OBJEXT): test/$(am__dirstamp) \
test/$(DEPDIR)/$(am__dirstamp)
-src/conf.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
-src/tokenizer.$(OBJEXT): src/$(am__dirstamp) \
+src/test_run_encoder-conf.$(OBJEXT): src/$(am__dirstamp) \
src/$(DEPDIR)/$(am__dirstamp)
-src/utils.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
-src/tag.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
-src/tag_pool.$(OBJEXT): src/$(am__dirstamp) \
+src/test_run_encoder-tokenizer.$(OBJEXT): src/$(am__dirstamp) \
src/$(DEPDIR)/$(am__dirstamp)
-src/audio_check.$(OBJEXT): src/$(am__dirstamp) \
+src/test_run_encoder-utils.$(OBJEXT): src/$(am__dirstamp) \
src/$(DEPDIR)/$(am__dirstamp)
-src/audio_format.$(OBJEXT): src/$(am__dirstamp) \
+src/test_run_encoder-tag.$(OBJEXT): src/$(am__dirstamp) \
src/$(DEPDIR)/$(am__dirstamp)
-src/audio_parser.$(OBJEXT): src/$(am__dirstamp) \
+src/test_run_encoder-tag_pool.$(OBJEXT): src/$(am__dirstamp) \
+ src/$(DEPDIR)/$(am__dirstamp)
+src/test_run_encoder-audio_check.$(OBJEXT): src/$(am__dirstamp) \
src/$(DEPDIR)/$(am__dirstamp)
-src/encoder_list.$(OBJEXT): src/$(am__dirstamp) \
+src/test_run_encoder-audio_format.$(OBJEXT): src/$(am__dirstamp) \
src/$(DEPDIR)/$(am__dirstamp)
-src/encoder/null_encoder.$(OBJEXT): src/encoder/$(am__dirstamp) \
+src/test_run_encoder-audio_parser.$(OBJEXT): src/$(am__dirstamp) \
+ src/$(DEPDIR)/$(am__dirstamp)
+src/test_run_encoder-encoder_list.$(OBJEXT): src/$(am__dirstamp) \
+ src/$(DEPDIR)/$(am__dirstamp)
+src/encoder/test_run_encoder-null_encoder.$(OBJEXT): \
+ src/encoder/$(am__dirstamp) \
src/encoder/$(DEPDIR)/$(am__dirstamp)
-src/encoder/wave_encoder.$(OBJEXT): src/encoder/$(am__dirstamp) \
+src/encoder/test_run_encoder-wave_encoder.$(OBJEXT): \
+ src/encoder/$(am__dirstamp) \
src/encoder/$(DEPDIR)/$(am__dirstamp)
-src/encoder/vorbis_encoder.$(OBJEXT): src/encoder/$(am__dirstamp) \
+src/encoder/test_run_encoder-vorbis_encoder.$(OBJEXT): \
+ src/encoder/$(am__dirstamp) \
src/encoder/$(DEPDIR)/$(am__dirstamp)
-src/encoder/lame_encoder.$(OBJEXT): src/encoder/$(am__dirstamp) \
+src/encoder/test_run_encoder-lame_encoder.$(OBJEXT): \
+ src/encoder/$(am__dirstamp) \
src/encoder/$(DEPDIR)/$(am__dirstamp)
-src/encoder/twolame_encoder.$(OBJEXT): src/encoder/$(am__dirstamp) \
+src/encoder/test_run_encoder-twolame_encoder.$(OBJEXT): \
+ src/encoder/$(am__dirstamp) \
src/encoder/$(DEPDIR)/$(am__dirstamp)
-src/encoder/flac_encoder.$(OBJEXT): src/encoder/$(am__dirstamp) \
+src/encoder/test_run_encoder-flac_encoder.$(OBJEXT): \
+ src/encoder/$(am__dirstamp) \
src/encoder/$(DEPDIR)/$(am__dirstamp)
test/run_encoder$(EXEEXT): $(test_run_encoder_OBJECTS) $(test_run_encoder_DEPENDENCIES) test/$(am__dirstamp)
@rm -f test/run_encoder$(EXEEXT)
@@ -3596,6 +3618,10 @@ test/run_input$(EXEEXT): $(test_run_input_OBJECTS) $(test_run_input_DEPENDENCIES
$(LINK) $(test_run_input_OBJECTS) $(test_run_input_LDADD) $(LIBS)
test/run_normalize.$(OBJEXT): test/$(am__dirstamp) \
test/$(DEPDIR)/$(am__dirstamp)
+src/audio_check.$(OBJEXT): src/$(am__dirstamp) \
+ src/$(DEPDIR)/$(am__dirstamp)
+src/audio_parser.$(OBJEXT): src/$(am__dirstamp) \
+ src/$(DEPDIR)/$(am__dirstamp)
src/AudioCompress/compress.$(OBJEXT): \
src/AudioCompress/$(am__dirstamp) \
src/AudioCompress/$(DEPDIR)/$(am__dirstamp)
@@ -3794,9 +3820,7 @@ mostlyclean-compile:
-rm -f src/archive/test_run_input-iso9660_archive_plugin.$(OBJEXT)
-rm -f src/archive/test_run_input-zzip_archive_plugin.$(OBJEXT)
-rm -f src/audio_check.$(OBJEXT)
- -rm -f src/audio_format.$(OBJEXT)
-rm -f src/audio_parser.$(OBJEXT)
- -rm -f src/conf.$(OBJEXT)
-rm -f src/cue/src_mpd-cue_tag.$(OBJEXT)
-rm -f src/cue/test_dump_playlist-cue_tag.$(OBJEXT)
-rm -f src/cue/test_read_tags-cue_tag.$(OBJEXT)
@@ -3866,25 +3890,24 @@ mostlyclean-compile:
-rm -f src/decoder/test_run_decoder-vorbis_decoder_plugin.$(OBJEXT)
-rm -f src/decoder/test_run_decoder-wavpack_decoder_plugin.$(OBJEXT)
-rm -f src/decoder/test_run_decoder-wildmidi_decoder_plugin.$(OBJEXT)
- -rm -f src/encoder/flac_encoder.$(OBJEXT)
- -rm -f src/encoder/lame_encoder.$(OBJEXT)
- -rm -f src/encoder/null_encoder.$(OBJEXT)
-rm -f src/encoder/src_mpd-flac_encoder.$(OBJEXT)
-rm -f src/encoder/src_mpd-lame_encoder.$(OBJEXT)
-rm -f src/encoder/src_mpd-null_encoder.$(OBJEXT)
-rm -f src/encoder/src_mpd-twolame_encoder.$(OBJEXT)
-rm -f src/encoder/src_mpd-vorbis_encoder.$(OBJEXT)
-rm -f src/encoder/src_mpd-wave_encoder.$(OBJEXT)
+ -rm -f src/encoder/test_run_encoder-flac_encoder.$(OBJEXT)
+ -rm -f src/encoder/test_run_encoder-lame_encoder.$(OBJEXT)
+ -rm -f src/encoder/test_run_encoder-null_encoder.$(OBJEXT)
+ -rm -f src/encoder/test_run_encoder-twolame_encoder.$(OBJEXT)
+ -rm -f src/encoder/test_run_encoder-vorbis_encoder.$(OBJEXT)
+ -rm -f src/encoder/test_run_encoder-wave_encoder.$(OBJEXT)
-rm -f src/encoder/test_run_output-flac_encoder.$(OBJEXT)
-rm -f src/encoder/test_run_output-lame_encoder.$(OBJEXT)
-rm -f src/encoder/test_run_output-null_encoder.$(OBJEXT)
-rm -f src/encoder/test_run_output-twolame_encoder.$(OBJEXT)
-rm -f src/encoder/test_run_output-vorbis_encoder.$(OBJEXT)
-rm -f src/encoder/test_run_output-wave_encoder.$(OBJEXT)
- -rm -f src/encoder/twolame_encoder.$(OBJEXT)
- -rm -f src/encoder/vorbis_encoder.$(OBJEXT)
- -rm -f src/encoder/wave_encoder.$(OBJEXT)
- -rm -f src/encoder_list.$(OBJEXT)
-rm -f src/fd_util.$(OBJEXT)
-rm -f src/fifo_buffer.$(OBJEXT)
-rm -f src/filter/src_mpd-autoconvert_filter_plugin.$(OBJEXT)
@@ -4162,8 +4185,6 @@ mostlyclean-compile:
-rm -f src/src_mpd-zeroconf-avahi.$(OBJEXT)
-rm -f src/src_mpd-zeroconf-bonjour.$(OBJEXT)
-rm -f src/src_mpd-zeroconf.$(OBJEXT)
- -rm -f src/tag.$(OBJEXT)
- -rm -f src/tag_pool.$(OBJEXT)
-rm -f src/test_dump_playlist-archive_api.$(OBJEXT)
-rm -f src/test_dump_playlist-archive_list.$(OBJEXT)
-rm -f src/test_dump_playlist-archive_plugin.$(OBJEXT)
@@ -4265,6 +4286,15 @@ mostlyclean-compile:
-rm -f src/test_run_decoder-tokenizer.$(OBJEXT)
-rm -f src/test_run_decoder-uri.$(OBJEXT)
-rm -f src/test_run_decoder-utils.$(OBJEXT)
+ -rm -f src/test_run_encoder-audio_check.$(OBJEXT)
+ -rm -f src/test_run_encoder-audio_format.$(OBJEXT)
+ -rm -f src/test_run_encoder-audio_parser.$(OBJEXT)
+ -rm -f src/test_run_encoder-conf.$(OBJEXT)
+ -rm -f src/test_run_encoder-encoder_list.$(OBJEXT)
+ -rm -f src/test_run_encoder-tag.$(OBJEXT)
+ -rm -f src/test_run_encoder-tag_pool.$(OBJEXT)
+ -rm -f src/test_run_encoder-tokenizer.$(OBJEXT)
+ -rm -f src/test_run_encoder-utils.$(OBJEXT)
-rm -f src/test_run_filter-audio_check.$(OBJEXT)
-rm -f src/test_run_filter-audio_format.$(OBJEXT)
-rm -f src/test_run_filter-audio_parser.$(OBJEXT)
@@ -4326,9 +4356,6 @@ mostlyclean-compile:
-rm -f src/test_run_output-timer.$(OBJEXT)
-rm -f src/test_run_output-tokenizer.$(OBJEXT)
-rm -f src/test_run_output-utils.$(OBJEXT)
- -rm -f src/tokenizer.$(OBJEXT)
- -rm -f src/utils.$(OBJEXT)
- -rm -f test/run_encoder.$(OBJEXT)
-rm -f test/run_inotify.$(OBJEXT)
-rm -f test/run_normalize.$(OBJEXT)
-rm -f test/software_volume.$(OBJEXT)
@@ -4338,6 +4365,7 @@ mostlyclean-compile:
-rm -f test/test_read_tags-read_tags.$(OBJEXT)
-rm -f test/test_run_convert-run_convert.$(OBJEXT)
-rm -f test/test_run_decoder-run_decoder.$(OBJEXT)
+ -rm -f test/test_run_encoder-run_encoder.$(OBJEXT)
-rm -f test/test_run_filter-run_filter.$(OBJEXT)
-rm -f test/test_run_input-run_input.$(OBJEXT)
-rm -f test/test_run_output-run_output.$(OBJEXT)
@@ -4346,10 +4374,7 @@ distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/audio_check.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/audio_format.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/audio_parser.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/conf.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/encoder_list.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/fd_util.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/fifo_buffer.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/inotify_source.Po at am__quote@
@@ -4505,8 +4530,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/src_mpd-zeroconf-avahi.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/src_mpd-zeroconf-bonjour.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/src_mpd-zeroconf.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/tag.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/tag_pool.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/test_dump_playlist-archive_api.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/test_dump_playlist-archive_list.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/test_dump_playlist-archive_plugin.Po at am__quote@
@@ -4608,6 +4631,15 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/test_run_decoder-tokenizer.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/test_run_decoder-uri.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/test_run_decoder-utils.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/test_run_encoder-audio_check.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/test_run_encoder-audio_format.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/test_run_encoder-audio_parser.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/test_run_encoder-conf.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/test_run_encoder-encoder_list.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/test_run_encoder-tag.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/test_run_encoder-tag_pool.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/test_run_encoder-tokenizer.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/test_run_encoder-utils.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/test_run_filter-audio_check.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/test_run_filter-audio_format.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/test_run_filter-audio_parser.Po at am__quote@
@@ -4669,8 +4701,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/test_run_output-timer.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/test_run_output-tokenizer.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/test_run_output-utils.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/tokenizer.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/utils.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at src/AudioCompress/$(DEPDIR)/compress.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at src/AudioCompress/$(DEPDIR)/src_mpd-compress.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at src/AudioCompress/$(DEPDIR)/test_run_filter-compress.Po at am__quote@
@@ -4759,24 +4789,24 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at src/decoder/$(DEPDIR)/test_run_decoder-vorbis_decoder_plugin.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at src/decoder/$(DEPDIR)/test_run_decoder-wavpack_decoder_plugin.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at src/decoder/$(DEPDIR)/test_run_decoder-wildmidi_decoder_plugin.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at src/encoder/$(DEPDIR)/flac_encoder.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at src/encoder/$(DEPDIR)/lame_encoder.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at src/encoder/$(DEPDIR)/null_encoder.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at src/encoder/$(DEPDIR)/src_mpd-flac_encoder.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at src/encoder/$(DEPDIR)/src_mpd-lame_encoder.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at src/encoder/$(DEPDIR)/src_mpd-null_encoder.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at src/encoder/$(DEPDIR)/src_mpd-twolame_encoder.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at src/encoder/$(DEPDIR)/src_mpd-vorbis_encoder.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at src/encoder/$(DEPDIR)/src_mpd-wave_encoder.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at src/encoder/$(DEPDIR)/test_run_encoder-flac_encoder.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at src/encoder/$(DEPDIR)/test_run_encoder-lame_encoder.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at src/encoder/$(DEPDIR)/test_run_encoder-null_encoder.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at src/encoder/$(DEPDIR)/test_run_encoder-twolame_encoder.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at src/encoder/$(DEPDIR)/test_run_encoder-vorbis_encoder.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at src/encoder/$(DEPDIR)/test_run_encoder-wave_encoder.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at src/encoder/$(DEPDIR)/test_run_output-flac_encoder.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at src/encoder/$(DEPDIR)/test_run_output-lame_encoder.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at src/encoder/$(DEPDIR)/test_run_output-null_encoder.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at src/encoder/$(DEPDIR)/test_run_output-twolame_encoder.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at src/encoder/$(DEPDIR)/test_run_output-vorbis_encoder.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at src/encoder/$(DEPDIR)/test_run_output-wave_encoder.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at src/encoder/$(DEPDIR)/twolame_encoder.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at src/encoder/$(DEPDIR)/vorbis_encoder.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at src/encoder/$(DEPDIR)/wave_encoder.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at src/filter/$(DEPDIR)/src_mpd-autoconvert_filter_plugin.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at src/filter/$(DEPDIR)/src_mpd-chain_filter_plugin.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at src/filter/$(DEPDIR)/src_mpd-convert_filter_plugin.Po at am__quote@
@@ -4899,7 +4929,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at src/playlist/$(DEPDIR)/test_dump_playlist-pls_playlist_plugin.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at src/playlist/$(DEPDIR)/test_dump_playlist-rss_playlist_plugin.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at src/playlist/$(DEPDIR)/test_dump_playlist-xspf_playlist_plugin.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at test/$(DEPDIR)/run_encoder.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at test/$(DEPDIR)/run_inotify.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at test/$(DEPDIR)/run_normalize.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at test/$(DEPDIR)/software_volume.Po at am__quote@
@@ -4909,6 +4938,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at test/$(DEPDIR)/test_read_tags-read_tags.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at test/$(DEPDIR)/test_run_convert-run_convert.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at test/$(DEPDIR)/test_run_decoder-run_decoder.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at test/$(DEPDIR)/test_run_encoder-run_encoder.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at test/$(DEPDIR)/test_run_filter-run_filter.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at test/$(DEPDIR)/test_run_input-run_input.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at test/$(DEPDIR)/test_run_output-run_output.Po at am__quote@
@@ -10837,6 +10867,230 @@ src/cue/test_run_decoder-cue_tag.obj: src/cue/cue_tag.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_decoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/cue/test_run_decoder-cue_tag.obj `if test -f 'src/cue/cue_tag.c'; then $(CYGPATH_W) 'src/cue/cue_tag.c'; else $(CYGPATH_W) '$(srcdir)/src/cue/cue_tag.c'; fi`
+test/test_run_encoder-run_encoder.o: test/run_encoder.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test/test_run_encoder-run_encoder.o -MD -MP -MF test/$(DEPDIR)/test_run_encoder-run_encoder.Tpo -c -o test/test_run_encoder-run_encoder.o `test -f 'test/run_encoder.c' || echo '$(srcdir)/'`test/run_encoder.c
+ at am__fastdepCC_TRUE@ $(am__mv) test/$(DEPDIR)/test_run_encoder-run_encoder.Tpo test/$(DEPDIR)/test_run_encoder-run_encoder.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='test/run_encoder.c' object='test/test_run_encoder-run_encoder.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_run_encoder-run_encoder.o `test -f 'test/run_encoder.c' || echo '$(srcdir)/'`test/run_encoder.c
+
+test/test_run_encoder-run_encoder.obj: test/run_encoder.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test/test_run_encoder-run_encoder.obj -MD -MP -MF test/$(DEPDIR)/test_run_encoder-run_encoder.Tpo -c -o test/test_run_encoder-run_encoder.obj `if test -f 'test/run_encoder.c'; then $(CYGPATH_W) 'test/run_encoder.c'; else $(CYGPATH_W) '$(srcdir)/test/run_encoder.c'; fi`
+ at am__fastdepCC_TRUE@ $(am__mv) test/$(DEPDIR)/test_run_encoder-run_encoder.Tpo test/$(DEPDIR)/test_run_encoder-run_encoder.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='test/run_encoder.c' object='test/test_run_encoder-run_encoder.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_run_encoder-run_encoder.obj `if test -f 'test/run_encoder.c'; then $(CYGPATH_W) 'test/run_encoder.c'; else $(CYGPATH_W) '$(srcdir)/test/run_encoder.c'; fi`
+
+src/test_run_encoder-conf.o: src/conf.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/test_run_encoder-conf.o -MD -MP -MF src/$(DEPDIR)/test_run_encoder-conf.Tpo -c -o src/test_run_encoder-conf.o `test -f 'src/conf.c' || echo '$(srcdir)/'`src/conf.c
+ at am__fastdepCC_TRUE@ $(am__mv) src/$(DEPDIR)/test_run_encoder-conf.Tpo src/$(DEPDIR)/test_run_encoder-conf.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/conf.c' object='src/test_run_encoder-conf.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/test_run_encoder-conf.o `test -f 'src/conf.c' || echo '$(srcdir)/'`src/conf.c
+
+src/test_run_encoder-conf.obj: src/conf.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/test_run_encoder-conf.obj -MD -MP -MF src/$(DEPDIR)/test_run_encoder-conf.Tpo -c -o src/test_run_encoder-conf.obj `if test -f 'src/conf.c'; then $(CYGPATH_W) 'src/conf.c'; else $(CYGPATH_W) '$(srcdir)/src/conf.c'; fi`
+ at am__fastdepCC_TRUE@ $(am__mv) src/$(DEPDIR)/test_run_encoder-conf.Tpo src/$(DEPDIR)/test_run_encoder-conf.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/conf.c' object='src/test_run_encoder-conf.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/test_run_encoder-conf.obj `if test -f 'src/conf.c'; then $(CYGPATH_W) 'src/conf.c'; else $(CYGPATH_W) '$(srcdir)/src/conf.c'; fi`
+
+src/test_run_encoder-tokenizer.o: src/tokenizer.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/test_run_encoder-tokenizer.o -MD -MP -MF src/$(DEPDIR)/test_run_encoder-tokenizer.Tpo -c -o src/test_run_encoder-tokenizer.o `test -f 'src/tokenizer.c' || echo '$(srcdir)/'`src/tokenizer.c
+ at am__fastdepCC_TRUE@ $(am__mv) src/$(DEPDIR)/test_run_encoder-tokenizer.Tpo src/$(DEPDIR)/test_run_encoder-tokenizer.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/tokenizer.c' object='src/test_run_encoder-tokenizer.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/test_run_encoder-tokenizer.o `test -f 'src/tokenizer.c' || echo '$(srcdir)/'`src/tokenizer.c
+
+src/test_run_encoder-tokenizer.obj: src/tokenizer.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/test_run_encoder-tokenizer.obj -MD -MP -MF src/$(DEPDIR)/test_run_encoder-tokenizer.Tpo -c -o src/test_run_encoder-tokenizer.obj `if test -f 'src/tokenizer.c'; then $(CYGPATH_W) 'src/tokenizer.c'; else $(CYGPATH_W) '$(srcdir)/src/tokenizer.c'; fi`
+ at am__fastdepCC_TRUE@ $(am__mv) src/$(DEPDIR)/test_run_encoder-tokenizer.Tpo src/$(DEPDIR)/test_run_encoder-tokenizer.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/tokenizer.c' object='src/test_run_encoder-tokenizer.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/test_run_encoder-tokenizer.obj `if test -f 'src/tokenizer.c'; then $(CYGPATH_W) 'src/tokenizer.c'; else $(CYGPATH_W) '$(srcdir)/src/tokenizer.c'; fi`
+
+src/test_run_encoder-utils.o: src/utils.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/test_run_encoder-utils.o -MD -MP -MF src/$(DEPDIR)/test_run_encoder-utils.Tpo -c -o src/test_run_encoder-utils.o `test -f 'src/utils.c' || echo '$(srcdir)/'`src/utils.c
+ at am__fastdepCC_TRUE@ $(am__mv) src/$(DEPDIR)/test_run_encoder-utils.Tpo src/$(DEPDIR)/test_run_encoder-utils.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/utils.c' object='src/test_run_encoder-utils.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/test_run_encoder-utils.o `test -f 'src/utils.c' || echo '$(srcdir)/'`src/utils.c
+
+src/test_run_encoder-utils.obj: src/utils.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/test_run_encoder-utils.obj -MD -MP -MF src/$(DEPDIR)/test_run_encoder-utils.Tpo -c -o src/test_run_encoder-utils.obj `if test -f 'src/utils.c'; then $(CYGPATH_W) 'src/utils.c'; else $(CYGPATH_W) '$(srcdir)/src/utils.c'; fi`
+ at am__fastdepCC_TRUE@ $(am__mv) src/$(DEPDIR)/test_run_encoder-utils.Tpo src/$(DEPDIR)/test_run_encoder-utils.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/utils.c' object='src/test_run_encoder-utils.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/test_run_encoder-utils.obj `if test -f 'src/utils.c'; then $(CYGPATH_W) 'src/utils.c'; else $(CYGPATH_W) '$(srcdir)/src/utils.c'; fi`
+
+src/test_run_encoder-tag.o: src/tag.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/test_run_encoder-tag.o -MD -MP -MF src/$(DEPDIR)/test_run_encoder-tag.Tpo -c -o src/test_run_encoder-tag.o `test -f 'src/tag.c' || echo '$(srcdir)/'`src/tag.c
+ at am__fastdepCC_TRUE@ $(am__mv) src/$(DEPDIR)/test_run_encoder-tag.Tpo src/$(DEPDIR)/test_run_encoder-tag.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/tag.c' object='src/test_run_encoder-tag.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/test_run_encoder-tag.o `test -f 'src/tag.c' || echo '$(srcdir)/'`src/tag.c
+
+src/test_run_encoder-tag.obj: src/tag.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/test_run_encoder-tag.obj -MD -MP -MF src/$(DEPDIR)/test_run_encoder-tag.Tpo -c -o src/test_run_encoder-tag.obj `if test -f 'src/tag.c'; then $(CYGPATH_W) 'src/tag.c'; else $(CYGPATH_W) '$(srcdir)/src/tag.c'; fi`
+ at am__fastdepCC_TRUE@ $(am__mv) src/$(DEPDIR)/test_run_encoder-tag.Tpo src/$(DEPDIR)/test_run_encoder-tag.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/tag.c' object='src/test_run_encoder-tag.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/test_run_encoder-tag.obj `if test -f 'src/tag.c'; then $(CYGPATH_W) 'src/tag.c'; else $(CYGPATH_W) '$(srcdir)/src/tag.c'; fi`
+
+src/test_run_encoder-tag_pool.o: src/tag_pool.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/test_run_encoder-tag_pool.o -MD -MP -MF src/$(DEPDIR)/test_run_encoder-tag_pool.Tpo -c -o src/test_run_encoder-tag_pool.o `test -f 'src/tag_pool.c' || echo '$(srcdir)/'`src/tag_pool.c
+ at am__fastdepCC_TRUE@ $(am__mv) src/$(DEPDIR)/test_run_encoder-tag_pool.Tpo src/$(DEPDIR)/test_run_encoder-tag_pool.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/tag_pool.c' object='src/test_run_encoder-tag_pool.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/test_run_encoder-tag_pool.o `test -f 'src/tag_pool.c' || echo '$(srcdir)/'`src/tag_pool.c
+
+src/test_run_encoder-tag_pool.obj: src/tag_pool.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/test_run_encoder-tag_pool.obj -MD -MP -MF src/$(DEPDIR)/test_run_encoder-tag_pool.Tpo -c -o src/test_run_encoder-tag_pool.obj `if test -f 'src/tag_pool.c'; then $(CYGPATH_W) 'src/tag_pool.c'; else $(CYGPATH_W) '$(srcdir)/src/tag_pool.c'; fi`
+ at am__fastdepCC_TRUE@ $(am__mv) src/$(DEPDIR)/test_run_encoder-tag_pool.Tpo src/$(DEPDIR)/test_run_encoder-tag_pool.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/tag_pool.c' object='src/test_run_encoder-tag_pool.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/test_run_encoder-tag_pool.obj `if test -f 'src/tag_pool.c'; then $(CYGPATH_W) 'src/tag_pool.c'; else $(CYGPATH_W) '$(srcdir)/src/tag_pool.c'; fi`
+
+src/test_run_encoder-audio_check.o: src/audio_check.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/test_run_encoder-audio_check.o -MD -MP -MF src/$(DEPDIR)/test_run_encoder-audio_check.Tpo -c -o src/test_run_encoder-audio_check.o `test -f 'src/audio_check.c' || echo '$(srcdir)/'`src/audio_check.c
+ at am__fastdepCC_TRUE@ $(am__mv) src/$(DEPDIR)/test_run_encoder-audio_check.Tpo src/$(DEPDIR)/test_run_encoder-audio_check.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/audio_check.c' object='src/test_run_encoder-audio_check.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/test_run_encoder-audio_check.o `test -f 'src/audio_check.c' || echo '$(srcdir)/'`src/audio_check.c
+
+src/test_run_encoder-audio_check.obj: src/audio_check.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/test_run_encoder-audio_check.obj -MD -MP -MF src/$(DEPDIR)/test_run_encoder-audio_check.Tpo -c -o src/test_run_encoder-audio_check.obj `if test -f 'src/audio_check.c'; then $(CYGPATH_W) 'src/audio_check.c'; else $(CYGPATH_W) '$(srcdir)/src/audio_check.c'; fi`
+ at am__fastdepCC_TRUE@ $(am__mv) src/$(DEPDIR)/test_run_encoder-audio_check.Tpo src/$(DEPDIR)/test_run_encoder-audio_check.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/audio_check.c' object='src/test_run_encoder-audio_check.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/test_run_encoder-audio_check.obj `if test -f 'src/audio_check.c'; then $(CYGPATH_W) 'src/audio_check.c'; else $(CYGPATH_W) '$(srcdir)/src/audio_check.c'; fi`
+
+src/test_run_encoder-audio_format.o: src/audio_format.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/test_run_encoder-audio_format.o -MD -MP -MF src/$(DEPDIR)/test_run_encoder-audio_format.Tpo -c -o src/test_run_encoder-audio_format.o `test -f 'src/audio_format.c' || echo '$(srcdir)/'`src/audio_format.c
+ at am__fastdepCC_TRUE@ $(am__mv) src/$(DEPDIR)/test_run_encoder-audio_format.Tpo src/$(DEPDIR)/test_run_encoder-audio_format.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/audio_format.c' object='src/test_run_encoder-audio_format.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/test_run_encoder-audio_format.o `test -f 'src/audio_format.c' || echo '$(srcdir)/'`src/audio_format.c
+
+src/test_run_encoder-audio_format.obj: src/audio_format.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/test_run_encoder-audio_format.obj -MD -MP -MF src/$(DEPDIR)/test_run_encoder-audio_format.Tpo -c -o src/test_run_encoder-audio_format.obj `if test -f 'src/audio_format.c'; then $(CYGPATH_W) 'src/audio_format.c'; else $(CYGPATH_W) '$(srcdir)/src/audio_format.c'; fi`
+ at am__fastdepCC_TRUE@ $(am__mv) src/$(DEPDIR)/test_run_encoder-audio_format.Tpo src/$(DEPDIR)/test_run_encoder-audio_format.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/audio_format.c' object='src/test_run_encoder-audio_format.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/test_run_encoder-audio_format.obj `if test -f 'src/audio_format.c'; then $(CYGPATH_W) 'src/audio_format.c'; else $(CYGPATH_W) '$(srcdir)/src/audio_format.c'; fi`
+
+src/test_run_encoder-audio_parser.o: src/audio_parser.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/test_run_encoder-audio_parser.o -MD -MP -MF src/$(DEPDIR)/test_run_encoder-audio_parser.Tpo -c -o src/test_run_encoder-audio_parser.o `test -f 'src/audio_parser.c' || echo '$(srcdir)/'`src/audio_parser.c
+ at am__fastdepCC_TRUE@ $(am__mv) src/$(DEPDIR)/test_run_encoder-audio_parser.Tpo src/$(DEPDIR)/test_run_encoder-audio_parser.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/audio_parser.c' object='src/test_run_encoder-audio_parser.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/test_run_encoder-audio_parser.o `test -f 'src/audio_parser.c' || echo '$(srcdir)/'`src/audio_parser.c
+
+src/test_run_encoder-audio_parser.obj: src/audio_parser.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/test_run_encoder-audio_parser.obj -MD -MP -MF src/$(DEPDIR)/test_run_encoder-audio_parser.Tpo -c -o src/test_run_encoder-audio_parser.obj `if test -f 'src/audio_parser.c'; then $(CYGPATH_W) 'src/audio_parser.c'; else $(CYGPATH_W) '$(srcdir)/src/audio_parser.c'; fi`
+ at am__fastdepCC_TRUE@ $(am__mv) src/$(DEPDIR)/test_run_encoder-audio_parser.Tpo src/$(DEPDIR)/test_run_encoder-audio_parser.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/audio_parser.c' object='src/test_run_encoder-audio_parser.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/test_run_encoder-audio_parser.obj `if test -f 'src/audio_parser.c'; then $(CYGPATH_W) 'src/audio_parser.c'; else $(CYGPATH_W) '$(srcdir)/src/audio_parser.c'; fi`
+
+src/test_run_encoder-encoder_list.o: src/encoder_list.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/test_run_encoder-encoder_list.o -MD -MP -MF src/$(DEPDIR)/test_run_encoder-encoder_list.Tpo -c -o src/test_run_encoder-encoder_list.o `test -f 'src/encoder_list.c' || echo '$(srcdir)/'`src/encoder_list.c
+ at am__fastdepCC_TRUE@ $(am__mv) src/$(DEPDIR)/test_run_encoder-encoder_list.Tpo src/$(DEPDIR)/test_run_encoder-encoder_list.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/encoder_list.c' object='src/test_run_encoder-encoder_list.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/test_run_encoder-encoder_list.o `test -f 'src/encoder_list.c' || echo '$(srcdir)/'`src/encoder_list.c
+
+src/test_run_encoder-encoder_list.obj: src/encoder_list.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/test_run_encoder-encoder_list.obj -MD -MP -MF src/$(DEPDIR)/test_run_encoder-encoder_list.Tpo -c -o src/test_run_encoder-encoder_list.obj `if test -f 'src/encoder_list.c'; then $(CYGPATH_W) 'src/encoder_list.c'; else $(CYGPATH_W) '$(srcdir)/src/encoder_list.c'; fi`
+ at am__fastdepCC_TRUE@ $(am__mv) src/$(DEPDIR)/test_run_encoder-encoder_list.Tpo src/$(DEPDIR)/test_run_encoder-encoder_list.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/encoder_list.c' object='src/test_run_encoder-encoder_list.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/test_run_encoder-encoder_list.obj `if test -f 'src/encoder_list.c'; then $(CYGPATH_W) 'src/encoder_list.c'; else $(CYGPATH_W) '$(srcdir)/src/encoder_list.c'; fi`
+
+src/encoder/test_run_encoder-null_encoder.o: src/encoder/null_encoder.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/encoder/test_run_encoder-null_encoder.o -MD -MP -MF src/encoder/$(DEPDIR)/test_run_encoder-null_encoder.Tpo -c -o src/encoder/test_run_encoder-null_encoder.o `test -f 'src/encoder/null_encoder.c' || echo '$(srcdir)/'`src/encoder/null_encoder.c
+ at am__fastdepCC_TRUE@ $(am__mv) src/encoder/$(DEPDIR)/test_run_encoder-null_encoder.Tpo src/encoder/$(DEPDIR)/test_run_encoder-null_encoder.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/encoder/null_encoder.c' object='src/encoder/test_run_encoder-null_encoder.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/encoder/test_run_encoder-null_encoder.o `test -f 'src/encoder/null_encoder.c' || echo '$(srcdir)/'`src/encoder/null_encoder.c
+
+src/encoder/test_run_encoder-null_encoder.obj: src/encoder/null_encoder.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/encoder/test_run_encoder-null_encoder.obj -MD -MP -MF src/encoder/$(DEPDIR)/test_run_encoder-null_encoder.Tpo -c -o src/encoder/test_run_encoder-null_encoder.obj `if test -f 'src/encoder/null_encoder.c'; then $(CYGPATH_W) 'src/encoder/null_encoder.c'; else $(CYGPATH_W) '$(srcdir)/src/encoder/null_encoder.c'; fi`
+ at am__fastdepCC_TRUE@ $(am__mv) src/encoder/$(DEPDIR)/test_run_encoder-null_encoder.Tpo src/encoder/$(DEPDIR)/test_run_encoder-null_encoder.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/encoder/null_encoder.c' object='src/encoder/test_run_encoder-null_encoder.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/encoder/test_run_encoder-null_encoder.obj `if test -f 'src/encoder/null_encoder.c'; then $(CYGPATH_W) 'src/encoder/null_encoder.c'; else $(CYGPATH_W) '$(srcdir)/src/encoder/null_encoder.c'; fi`
+
+src/encoder/test_run_encoder-wave_encoder.o: src/encoder/wave_encoder.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/encoder/test_run_encoder-wave_encoder.o -MD -MP -MF src/encoder/$(DEPDIR)/test_run_encoder-wave_encoder.Tpo -c -o src/encoder/test_run_encoder-wave_encoder.o `test -f 'src/encoder/wave_encoder.c' || echo '$(srcdir)/'`src/encoder/wave_encoder.c
+ at am__fastdepCC_TRUE@ $(am__mv) src/encoder/$(DEPDIR)/test_run_encoder-wave_encoder.Tpo src/encoder/$(DEPDIR)/test_run_encoder-wave_encoder.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/encoder/wave_encoder.c' object='src/encoder/test_run_encoder-wave_encoder.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/encoder/test_run_encoder-wave_encoder.o `test -f 'src/encoder/wave_encoder.c' || echo '$(srcdir)/'`src/encoder/wave_encoder.c
+
+src/encoder/test_run_encoder-wave_encoder.obj: src/encoder/wave_encoder.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/encoder/test_run_encoder-wave_encoder.obj -MD -MP -MF src/encoder/$(DEPDIR)/test_run_encoder-wave_encoder.Tpo -c -o src/encoder/test_run_encoder-wave_encoder.obj `if test -f 'src/encoder/wave_encoder.c'; then $(CYGPATH_W) 'src/encoder/wave_encoder.c'; else $(CYGPATH_W) '$(srcdir)/src/encoder/wave_encoder.c'; fi`
+ at am__fastdepCC_TRUE@ $(am__mv) src/encoder/$(DEPDIR)/test_run_encoder-wave_encoder.Tpo src/encoder/$(DEPDIR)/test_run_encoder-wave_encoder.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/encoder/wave_encoder.c' object='src/encoder/test_run_encoder-wave_encoder.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/encoder/test_run_encoder-wave_encoder.obj `if test -f 'src/encoder/wave_encoder.c'; then $(CYGPATH_W) 'src/encoder/wave_encoder.c'; else $(CYGPATH_W) '$(srcdir)/src/encoder/wave_encoder.c'; fi`
+
+src/encoder/test_run_encoder-vorbis_encoder.o: src/encoder/vorbis_encoder.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/encoder/test_run_encoder-vorbis_encoder.o -MD -MP -MF src/encoder/$(DEPDIR)/test_run_encoder-vorbis_encoder.Tpo -c -o src/encoder/test_run_encoder-vorbis_encoder.o `test -f 'src/encoder/vorbis_encoder.c' || echo '$(srcdir)/'`src/encoder/vorbis_encoder.c
+ at am__fastdepCC_TRUE@ $(am__mv) src/encoder/$(DEPDIR)/test_run_encoder-vorbis_encoder.Tpo src/encoder/$(DEPDIR)/test_run_encoder-vorbis_encoder.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/encoder/vorbis_encoder.c' object='src/encoder/test_run_encoder-vorbis_encoder.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/encoder/test_run_encoder-vorbis_encoder.o `test -f 'src/encoder/vorbis_encoder.c' || echo '$(srcdir)/'`src/encoder/vorbis_encoder.c
+
+src/encoder/test_run_encoder-vorbis_encoder.obj: src/encoder/vorbis_encoder.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/encoder/test_run_encoder-vorbis_encoder.obj -MD -MP -MF src/encoder/$(DEPDIR)/test_run_encoder-vorbis_encoder.Tpo -c -o src/encoder/test_run_encoder-vorbis_encoder.obj `if test -f 'src/encoder/vorbis_encoder.c'; then $(CYGPATH_W) 'src/encoder/vorbis_encoder.c'; else $(CYGPATH_W) '$(srcdir)/src/encoder/vorbis_encoder.c'; fi`
+ at am__fastdepCC_TRUE@ $(am__mv) src/encoder/$(DEPDIR)/test_run_encoder-vorbis_encoder.Tpo src/encoder/$(DEPDIR)/test_run_encoder-vorbis_encoder.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/encoder/vorbis_encoder.c' object='src/encoder/test_run_encoder-vorbis_encoder.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/encoder/test_run_encoder-vorbis_encoder.obj `if test -f 'src/encoder/vorbis_encoder.c'; then $(CYGPATH_W) 'src/encoder/vorbis_encoder.c'; else $(CYGPATH_W) '$(srcdir)/src/encoder/vorbis_encoder.c'; fi`
+
+src/encoder/test_run_encoder-lame_encoder.o: src/encoder/lame_encoder.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/encoder/test_run_encoder-lame_encoder.o -MD -MP -MF src/encoder/$(DEPDIR)/test_run_encoder-lame_encoder.Tpo -c -o src/encoder/test_run_encoder-lame_encoder.o `test -f 'src/encoder/lame_encoder.c' || echo '$(srcdir)/'`src/encoder/lame_encoder.c
+ at am__fastdepCC_TRUE@ $(am__mv) src/encoder/$(DEPDIR)/test_run_encoder-lame_encoder.Tpo src/encoder/$(DEPDIR)/test_run_encoder-lame_encoder.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/encoder/lame_encoder.c' object='src/encoder/test_run_encoder-lame_encoder.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/encoder/test_run_encoder-lame_encoder.o `test -f 'src/encoder/lame_encoder.c' || echo '$(srcdir)/'`src/encoder/lame_encoder.c
+
+src/encoder/test_run_encoder-lame_encoder.obj: src/encoder/lame_encoder.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/encoder/test_run_encoder-lame_encoder.obj -MD -MP -MF src/encoder/$(DEPDIR)/test_run_encoder-lame_encoder.Tpo -c -o src/encoder/test_run_encoder-lame_encoder.obj `if test -f 'src/encoder/lame_encoder.c'; then $(CYGPATH_W) 'src/encoder/lame_encoder.c'; else $(CYGPATH_W) '$(srcdir)/src/encoder/lame_encoder.c'; fi`
+ at am__fastdepCC_TRUE@ $(am__mv) src/encoder/$(DEPDIR)/test_run_encoder-lame_encoder.Tpo src/encoder/$(DEPDIR)/test_run_encoder-lame_encoder.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/encoder/lame_encoder.c' object='src/encoder/test_run_encoder-lame_encoder.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/encoder/test_run_encoder-lame_encoder.obj `if test -f 'src/encoder/lame_encoder.c'; then $(CYGPATH_W) 'src/encoder/lame_encoder.c'; else $(CYGPATH_W) '$(srcdir)/src/encoder/lame_encoder.c'; fi`
+
+src/encoder/test_run_encoder-twolame_encoder.o: src/encoder/twolame_encoder.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/encoder/test_run_encoder-twolame_encoder.o -MD -MP -MF src/encoder/$(DEPDIR)/test_run_encoder-twolame_encoder.Tpo -c -o src/encoder/test_run_encoder-twolame_encoder.o `test -f 'src/encoder/twolame_encoder.c' || echo '$(srcdir)/'`src/encoder/twolame_encoder.c
+ at am__fastdepCC_TRUE@ $(am__mv) src/encoder/$(DEPDIR)/test_run_encoder-twolame_encoder.Tpo src/encoder/$(DEPDIR)/test_run_encoder-twolame_encoder.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/encoder/twolame_encoder.c' object='src/encoder/test_run_encoder-twolame_encoder.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/encoder/test_run_encoder-twolame_encoder.o `test -f 'src/encoder/twolame_encoder.c' || echo '$(srcdir)/'`src/encoder/twolame_encoder.c
+
+src/encoder/test_run_encoder-twolame_encoder.obj: src/encoder/twolame_encoder.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/encoder/test_run_encoder-twolame_encoder.obj -MD -MP -MF src/encoder/$(DEPDIR)/test_run_encoder-twolame_encoder.Tpo -c -o src/encoder/test_run_encoder-twolame_encoder.obj `if test -f 'src/encoder/twolame_encoder.c'; then $(CYGPATH_W) 'src/encoder/twolame_encoder.c'; else $(CYGPATH_W) '$(srcdir)/src/encoder/twolame_encoder.c'; fi`
+ at am__fastdepCC_TRUE@ $(am__mv) src/encoder/$(DEPDIR)/test_run_encoder-twolame_encoder.Tpo src/encoder/$(DEPDIR)/test_run_encoder-twolame_encoder.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/encoder/twolame_encoder.c' object='src/encoder/test_run_encoder-twolame_encoder.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/encoder/test_run_encoder-twolame_encoder.obj `if test -f 'src/encoder/twolame_encoder.c'; then $(CYGPATH_W) 'src/encoder/twolame_encoder.c'; else $(CYGPATH_W) '$(srcdir)/src/encoder/twolame_encoder.c'; fi`
+
+src/encoder/test_run_encoder-flac_encoder.o: src/encoder/flac_encoder.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/encoder/test_run_encoder-flac_encoder.o -MD -MP -MF src/encoder/$(DEPDIR)/test_run_encoder-flac_encoder.Tpo -c -o src/encoder/test_run_encoder-flac_encoder.o `test -f 'src/encoder/flac_encoder.c' || echo '$(srcdir)/'`src/encoder/flac_encoder.c
+ at am__fastdepCC_TRUE@ $(am__mv) src/encoder/$(DEPDIR)/test_run_encoder-flac_encoder.Tpo src/encoder/$(DEPDIR)/test_run_encoder-flac_encoder.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/encoder/flac_encoder.c' object='src/encoder/test_run_encoder-flac_encoder.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/encoder/test_run_encoder-flac_encoder.o `test -f 'src/encoder/flac_encoder.c' || echo '$(srcdir)/'`src/encoder/flac_encoder.c
+
+src/encoder/test_run_encoder-flac_encoder.obj: src/encoder/flac_encoder.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/encoder/test_run_encoder-flac_encoder.obj -MD -MP -MF src/encoder/$(DEPDIR)/test_run_encoder-flac_encoder.Tpo -c -o src/encoder/test_run_encoder-flac_encoder.obj `if test -f 'src/encoder/flac_encoder.c'; then $(CYGPATH_W) 'src/encoder/flac_encoder.c'; else $(CYGPATH_W) '$(srcdir)/src/encoder/flac_encoder.c'; fi`
+ at am__fastdepCC_TRUE@ $(am__mv) src/encoder/$(DEPDIR)/test_run_encoder-flac_encoder.Tpo src/encoder/$(DEPDIR)/test_run_encoder-flac_encoder.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/encoder/flac_encoder.c' object='src/encoder/test_run_encoder-flac_encoder.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_encoder_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/encoder/test_run_encoder-flac_encoder.obj `if test -f 'src/encoder/flac_encoder.c'; then $(CYGPATH_W) 'src/encoder/flac_encoder.c'; else $(CYGPATH_W) '$(srcdir)/src/encoder/flac_encoder.c'; fi`
+
test/test_run_filter-run_filter.o: test/run_filter.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_filter_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test/test_run_filter-run_filter.o -MD -MP -MF test/$(DEPDIR)/test_run_filter-run_filter.Tpo -c -o test/test_run_filter-run_filter.o `test -f 'test/run_filter.c' || echo '$(srcdir)/'`test/run_filter.c
@am__fastdepCC_TRUE@ $(am__mv) test/$(DEPDIR)/test_run_filter-run_filter.Tpo test/$(DEPDIR)/test_run_filter-run_filter.Po
diff --git a/NEWS b/NEWS
index 96ada59..7bbb0fc 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,19 @@
-ver 0.16.1 (2010/01/09)
+ver 0.16.2 (2011/03/18)
+* configure.ac:
+ - fix bashism in tremor test
+* decoder:
+ - tremor: fix configure test
+ - gme: detect end of song
+* encoder:
+ - vorbis: reset the Ogg stream after flush
+* output:
+ - httpd: fix uninitialized variable
+ - httpd: include sys/socket.h
+ - oss: AFMT_S24_PACKED is little-endian
+ - oss: disable 24 bit playback on FreeBSD
+
+
+ver 0.16.1 (2011/01/09)
* audio_check: fix parameter in prototype
* add void casts to suppress "result unused" warnings (clang)
* input:
@@ -128,9 +143,13 @@ ver 0.16 (2010/12/11)
* make single mode 'sticky'
-ver 0.15.16 (2010/??/??)
+ver 0.15.16 (2011/03/13)
+* output:
+ - ao: initialize the ao_sample_format struct
+ - jack: fix crash with mono playback
* encoders:
- lame: explicitly configure the output sample rate
+* update: log all file permission problems
ver 0.15.15 (2010/11/08)
diff --git a/config.h.in b/config.h.in
index 5ae3995..274aff0 100644
--- a/config.h.in
+++ b/config.h.in
@@ -187,6 +187,9 @@
/* Define to 1 if you have the `sidutils' library (-lsidutils). */
#undef HAVE_LIBSIDUTILS
+/* Define to 1 if you have the `vorbisidec' library (-lvorbisidec). */
+#undef HAVE_LIBVORBISIDEC
+
/* Define to 1 if you have the `WildMidi' library (-lWildMidi). */
#undef HAVE_LIBWILDMIDI
diff --git a/configure b/configure
index ff6cb68..cae36a5 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for mpd 0.16.1.
+# Generated by GNU Autoconf 2.67 for mpd 0.16.2.
#
# Report bugs to <musicpd-dev-team at lists.sourceforge.net>.
#
@@ -552,8 +552,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='mpd'
PACKAGE_TARNAME='mpd'
-PACKAGE_VERSION='0.16.1'
-PACKAGE_STRING='mpd 0.16.1'
+PACKAGE_VERSION='0.16.2'
+PACKAGE_STRING='mpd 0.16.2'
PACKAGE_BUGREPORT='musicpd-dev-team at lists.sourceforge.net'
PACKAGE_URL=''
@@ -1591,7 +1591,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures mpd 0.16.1 to adapt to many kinds of systems.
+\`configure' configures mpd 0.16.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1661,7 +1661,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of mpd 0.16.1:";;
+ short | recursive ) echo "Configuration of mpd 0.16.2:";;
esac
cat <<\_ACEOF
@@ -1932,7 +1932,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-mpd configure 0.16.1
+mpd configure 0.16.2
generated by GNU Autoconf 2.67
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2442,7 +2442,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by mpd $as_me 0.16.1, which was
+It was created by mpd $as_me 0.16.2, which was
generated by GNU Autoconf 2.67. Invocation command line was
$ $0 $@
@@ -3258,7 +3258,7 @@ fi
# Define the identity of the package.
PACKAGE='mpd'
- VERSION='0.16.1'
+ VERSION='0.16.2'
cat >>confdefs.h <<_ACEOF
@@ -7876,7 +7876,7 @@ else
fi
-if test x$with_tremor == xno || test -z $with_tremor; then
+if test x$with_tremor = xno || test -z $with_tremor; then
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OGG" >&5
@@ -10512,19 +10512,32 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_vorbisidec_ov_read" >&5
$as_echo "$ac_cv_lib_vorbisidec_ov_read" >&6; }
if test "x$ac_cv_lib_vorbisidec_ov_read" = x""yes; then :
- enable_vorbis=yes
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBVORBISIDEC 1
+_ACEOF
+
+ LIBS="-lvorbisidec $LIBS"
+
else
- enable_vorbis=no;
+ enable_tremor=no;
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: vorbisidec lib needed for ogg support with tremor -- disabling ogg support" >&5
$as_echo "$as_me: WARNING: vorbisidec lib needed for ogg support with tremor -- disabling ogg support" >&2;}
fi
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
+fi
+if test x$enable_tremor = xyes; then
$as_echo "#define HAVE_TREMOR 1" >>confdefs.h
+
+$as_echo "#define ENABLE_VORBIS_DECODER 1" >>confdefs.h
+,
+else
+ TREMOR_CFLAGS=
+ TREMOR_LIBS=
fi
@@ -10650,7 +10663,7 @@ $as_echo "$as_me: WARNING: \"Ogg not detected, could not enable Vorbis.\"" >&2;}
fi
fi
- if test x$enable_vorbis = xyes; then
+ if test x$enable_vorbis = xyes || test x$enable_tremor = xyes; then
ENABLE_VORBIS_DECODER_TRUE=
ENABLE_VORBIS_DECODER_FALSE='#'
else
@@ -14959,7 +14972,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by mpd $as_me 0.16.1, which was
+This file was extended by mpd $as_me 0.16.2, which was
generated by GNU Autoconf 2.67. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -15025,7 +15038,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-mpd config.status 0.16.1
+mpd config.status 0.16.2
configured by $0, generated by GNU Autoconf 2.67,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index c8a568a..6d0239f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ(2.60)
-AC_INIT(mpd, 0.16.1, musicpd-dev-team at lists.sourceforge.net)
+AC_INIT(mpd, 0.16.2, musicpd-dev-team at lists.sourceforge.net)
AC_CONFIG_SRCDIR([src/main.c])
AM_INIT_AUTOMAKE([foreign 1.10 dist-bzip2 subdir-objects])
AM_CONFIG_HEADER(config.h)
@@ -635,7 +635,7 @@ fi
AM_CONDITIONAL(ENABLE_LASTFM, test x$enable_lastfm = xyes)
dnl ---------------------------------- libogg ---------------------------------
-if test x$with_tremor == xno || test -z $with_tremor; then
+if test x$with_tremor = xno || test -z $with_tremor; then
PKG_CHECK_MODULES(OGG, [ogg], enable_ogg=yes, enable_ogg=no)
fi
@@ -934,13 +934,19 @@ if test x$enable_tremor = xyes; then
ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS $TREMOR_CFLAGS"
LIBS="$LIBS $TREMOR_LIBS"
- AC_CHECK_LIB(vorbisidec,ov_read,enable_vorbis=yes,enable_vorbis=no;
+ AC_CHECK_LIB(vorbisidec,ov_read,,enable_tremor=no;
AC_MSG_WARN([vorbisidec lib needed for ogg support with tremor -- disabling ogg support]))
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
+fi
+if test x$enable_tremor = xyes; then
AC_DEFINE(HAVE_TREMOR,1,
[Define to use tremor (libvorbisidec) for ogg support])
+ AC_DEFINE(ENABLE_VORBIS_DECODER, 1, [Define for Ogg Vorbis support]),
+else
+ TREMOR_CFLAGS=
+ TREMOR_LIBS=
fi
AC_SUBST(TREMOR_CFLAGS)
@@ -980,7 +986,7 @@ if test x$enable_vorbis = xyes; then
fi
fi
-AM_CONDITIONAL(ENABLE_VORBIS_DECODER, test x$enable_vorbis = xyes)
+AM_CONDITIONAL(ENABLE_VORBIS_DECODER, test x$enable_vorbis = xyes || test x$enable_tremor = xyes)
dnl --------------------------------- sidplay ---------------------------------
found_sidplay=$HAVE_CXX
diff --git a/src/AudioCompress/compress.c b/src/AudioCompress/compress.c
index d5c0837..36cdfd8 100644
--- a/src/AudioCompress/compress.c
+++ b/src/AudioCompress/compress.c
@@ -16,16 +16,16 @@
struct Compressor {
//! The compressor's preferences
struct CompressorConfig prefs;
-
+
//! History of the peak values
int *peaks;
-
+
//! History of the gain values
int *gain;
-
+
//! History of clip amounts
int *clipped;
-
+
unsigned int pos;
unsigned int bufsz;
};
@@ -41,9 +41,9 @@ struct Compressor *Compressor_new(unsigned int history)
obj->peaks = obj->gain = obj->clipped = NULL;
obj->bufsz = 0;
obj->pos = 0;
-
+
Compressor_setHistory(obj, history);
-
+
return obj;
}
@@ -70,7 +70,7 @@ void Compressor_setHistory(struct Compressor *obj, unsigned int history)
{
if (!history)
history = BUCKETS;
-
+
obj->peaks = resizeArray(obj->peaks, history, obj->bufsz);
obj->gain = resizeArray(obj->gain, history, obj->bufsz);
obj->clipped = resizeArray(obj->clipped, history, obj->bufsz);
@@ -82,7 +82,7 @@ struct CompressorConfig *Compressor_getConfig(struct Compressor *obj)
return &obj->prefs;
}
-void Compressor_Process_int16(struct Compressor *obj, int16_t *audio,
+void Compressor_Process_int16(struct Compressor *obj, int16_t *audio,
unsigned int count)
{
struct CompressorConfig *prefs = Compressor_getConfig(obj);
@@ -97,7 +97,7 @@ void Compressor_Process_int16(struct Compressor *obj, int16_t *audio,
int *clipped = obj->clipped + slot;
unsigned int ramp = count;
int delta;
-
+
ap = audio;
for (i = 0; i < count; i++)
{
@@ -124,15 +124,15 @@ void Compressor_Process_int16(struct Compressor *obj, int16_t *audio,
//! Determine target gain
newGain = (1 << 10)*prefs->target/peakVal;
-
+
//! Adjust the gain with inertia from the previous gain value
- newGain = (curGain*((1 << prefs->smooth) - 1) + newGain)
+ newGain = (curGain*((1 << prefs->smooth) - 1) + newGain)
>> prefs->smooth;
-
+
//! Make sure it's no more than the maximum gain value
if (newGain > (prefs->maxgain << 10))
newGain = prefs->maxgain << 10;
-
+
//! Make sure it's no less than 1:1
if (newGain < (1 << 10))
newGain = 1 << 10;
@@ -144,7 +144,7 @@ void Compressor_Process_int16(struct Compressor *obj, int16_t *audio,
//! Truncate the ramp time
ramp = peakPos;
}
-
+
//! Record the new gain
obj->gain[slot] = newGain;
diff --git a/src/audio_format.h b/src/audio_format.h
index dd32731..a4450ad 100644
--- a/src/audio_format.h
+++ b/src/audio_format.h
@@ -22,6 +22,7 @@
#include <stdint.h>
#include <stdbool.h>
+#include <assert.h>
enum sample_format {
SAMPLE_FORMAT_UNDEFINED = 0,
@@ -219,6 +220,9 @@ static inline void
audio_format_mask_apply(struct audio_format *af,
const struct audio_format *mask)
{
+ assert(audio_format_valid(af));
+ assert(audio_format_mask_valid(mask));
+
if (mask->sample_rate != 0)
af->sample_rate = mask->sample_rate;
@@ -227,6 +231,8 @@ audio_format_mask_apply(struct audio_format *af,
if (mask->channels != 0)
af->channels = mask->channels;
+
+ assert(audio_format_valid(af));
}
/**
diff --git a/src/audio_parser.c b/src/audio_parser.c
index 039ffa1..ca5182c 100644
--- a/src/audio_parser.c
+++ b/src/audio_parser.c
@@ -192,6 +192,7 @@ audio_format_parse(struct audio_format *dest, const char *src,
}
audio_format_init(dest, rate, sample_format, channels);
+ assert(audio_format_valid(dest));
return true;
}
diff --git a/src/command.c b/src/command.c
index 781547b..ce0aa97 100644
--- a/src/command.c
+++ b/src/command.c
@@ -749,7 +749,7 @@ handle_load(struct client *client, G_GNUC_UNUSED int argc, char *argv[])
result = playlist_open_into_queue(argv[1], &g_playlist);
if (result != PLAYLIST_RESULT_NO_SUCH_LIST)
- return result;
+ return print_playlist_result(client, result);
result = playlist_load_spl(&g_playlist, argv[1]);
return print_playlist_result(client, result);
diff --git a/src/decoder/audiofile_decoder_plugin.c b/src/decoder/audiofile_decoder_plugin.c
index 3026f3c..b099cf7 100644
--- a/src/decoder/audiofile_decoder_plugin.c
+++ b/src/decoder/audiofile_decoder_plugin.c
@@ -244,7 +244,7 @@ static const char *const audiofile_suffixes[] = {
static const char *const audiofile_mime_types[] = {
"audio/x-wav",
"audio/x-aiff",
- NULL
+ NULL
};
const struct decoder_plugin audiofile_decoder_plugin = {
diff --git a/src/decoder/gme_decoder_plugin.c b/src/decoder/gme_decoder_plugin.c
index 4a5220a..e14a52d 100644
--- a/src/decoder/gme_decoder_plugin.c
+++ b/src/decoder/gme_decoder_plugin.c
@@ -153,6 +153,9 @@ gme_file_decode(struct decoder *decoder, const char *path_fs)
if((gme_err = gme_start_track(emu, song_num)) != NULL)
g_warning("%s", gme_err);
+ if(ti->length > 0)
+ gme_set_fade(emu, ti->length);
+
/* play */
do {
gme_err = gme_play(emu, GME_BUFFER_SAMPLES, buf);
diff --git a/src/encoder/flac_encoder.c b/src/encoder/flac_encoder.c
index 73328fe..c34faad 100644
--- a/src/encoder/flac_encoder.c
+++ b/src/encoder/flac_encoder.c
@@ -55,7 +55,7 @@ static bool
flac_encoder_configure(struct flac_encoder *encoder,
const struct config_param *param, G_GNUC_UNUSED GError **error)
{
- encoder->compression = config_get_block_unsigned(param,
+ encoder->compression = config_get_block_unsigned(param,
"compression", 5);
return true;
@@ -218,7 +218,7 @@ flac_encoder_open(struct encoder *_encoder, struct audio_format *audio_format,
if (init_status != FLAC__STREAM_ENCODER_OK) {
g_set_error(error, flac_encoder_quark(), 0,
- "failed to initialize encoder: %s\n",
+ "failed to initialize encoder: %s\n",
FLAC__StreamEncoderStateString[init_status]);
flac_encoder_close(_encoder);
return false;
@@ -234,7 +234,7 @@ flac_encoder_open(struct encoder *_encoder, struct audio_format *audio_format,
if(init_status != FLAC__STREAM_ENCODER_INIT_STATUS_OK) {
g_set_error(error, flac_encoder_quark(), 0,
- "failed to initialize encoder: %s\n",
+ "failed to initialize encoder: %s\n",
FLAC__StreamEncoderInitStatusString[init_status]);
flac_encoder_close(_encoder);
return false;
diff --git a/src/encoder/vorbis_encoder.c b/src/encoder/vorbis_encoder.c
index 9dac356..08147be 100644
--- a/src/encoder/vorbis_encoder.c
+++ b/src/encoder/vorbis_encoder.c
@@ -276,6 +276,8 @@ vorbis_encoder_flush(struct encoder *_encoder, G_GNUC_UNUSED GError **error)
vorbis_analysis_init(&encoder->vd, &encoder->vi);
vorbis_block_init(&encoder->vd, &encoder->vb);
+ ogg_stream_reset(&encoder->os);
+
encoder->flush = true;
return true;
}
diff --git a/src/encoder/wave_encoder.c b/src/encoder/wave_encoder.c
index 7398b45..938be5e 100644
--- a/src/encoder/wave_encoder.c
+++ b/src/encoder/wave_encoder.c
@@ -58,7 +58,7 @@ wave_encoder_quark(void)
}
static void
-fill_wave_header(struct wave_header *header, int channels, int bits,
+fill_wave_header(struct wave_header *header, int channels, int bits,
int freq, int block_size)
{
int data_size = 0x0FFFFFFF;
@@ -142,7 +142,7 @@ wave_encoder_open(struct encoder *_encoder,
buffer = pcm_buffer_get(&encoder->buffer, sizeof(struct wave_header) );
/* create PCM wave header in initial buffer */
- fill_wave_header((struct wave_header *) buffer,
+ fill_wave_header((struct wave_header *) buffer,
audio_format->channels,
encoder->bits,
audio_format->sample_rate,
diff --git a/src/mixer/winmm_mixer_plugin.c b/src/mixer/winmm_mixer_plugin.c
index e1e8a7a..5ab3e75 100644
--- a/src/mixer/winmm_mixer_plugin.c
+++ b/src/mixer/winmm_mixer_plugin.c
@@ -58,11 +58,11 @@ winmm_mixer_init(void *ao, G_GNUC_UNUSED const struct config_param *param,
G_GNUC_UNUSED GError **error_r)
{
assert(ao != NULL);
-
+
struct winmm_mixer *wm = g_new(struct winmm_mixer, 1);
mixer_init(&wm->base, &winmm_mixer_plugin);
wm->output = (struct winmm_output *) ao;
-
+
return &wm->base;
}
@@ -79,13 +79,13 @@ winmm_mixer_get_volume(struct mixer *mixer, GError **error_r)
DWORD volume;
HWAVEOUT handle = winmm_output_get_handle(wm->output);
MMRESULT result = waveOutGetVolume(handle, &volume);
-
+
if (result != MMSYSERR_NOERROR) {
g_set_error(error_r, 0, winmm_mixer_quark(),
"Failed to get winmm volume");
return -1;
}
-
+
return winmm_volume_decode(volume);
}
@@ -102,7 +102,7 @@ winmm_mixer_set_volume(struct mixer *mixer, unsigned volume, GError **error_r)
"Failed to set winmm volume");
return false;
}
-
+
return true;
}
diff --git a/src/output/ao_plugin.c b/src/output/ao_plugin.c
index d5c9501..6fedbc6 100644
--- a/src/output/ao_plugin.c
+++ b/src/output/ao_plugin.c
@@ -26,6 +26,9 @@
#undef G_LOG_DOMAIN
#define G_LOG_DOMAIN "ao"
+/* An ao_sample_format, with all fields set to zero: */
+static const ao_sample_format OUR_AO_FORMAT_INITIALIZER;
+
static unsigned ao_output_ref;
struct ao_data {
@@ -167,7 +170,7 @@ static bool
ao_output_open(void *data, struct audio_format *audio_format,
GError **error)
{
- ao_sample_format format;
+ ao_sample_format format = OUR_AO_FORMAT_INITIALIZER;
struct ao_data *ad = (struct ao_data *)data;
switch (audio_format->format) {
diff --git a/src/output/httpd_internal.h b/src/output/httpd_internal.h
index fee72c0..277e70f 100644
--- a/src/output/httpd_internal.h
+++ b/src/output/httpd_internal.h
@@ -111,7 +111,7 @@ struct httpd_output {
char buffer[32768];
/**
- * The maximum and current number of clients connected
+ * The maximum and current number of clients connected
* at the same time.
*/
guint clients_max, clients_cnt;
diff --git a/src/output/httpd_output_plugin.c b/src/output/httpd_output_plugin.c
index 7299401..6650d89 100644
--- a/src/output/httpd_output_plugin.c
+++ b/src/output/httpd_output_plugin.c
@@ -36,6 +36,7 @@
#include <errno.h>
#ifdef HAVE_LIBWRAP
+#include <sys/socket.h> /* needed for AF_UNIX */
#include <tcpd.h>
#endif
@@ -123,6 +124,7 @@ httpd_output_init(G_GNUC_UNUSED const struct audio_format *audio_format,
/* initialize metadata */
httpd->metadata = NULL;
+ httpd->unflushed_input = 0;
/* initialize encoder */
diff --git a/src/output/jack_output_plugin.c b/src/output/jack_output_plugin.c
index 110ee5f..2767d4e 100644
--- a/src/output/jack_output_plugin.c
+++ b/src/output/jack_output_plugin.c
@@ -40,7 +40,7 @@ enum {
MAX_PORTS = 16,
};
-static const size_t sample_size = sizeof(jack_default_audio_sample_t);
+static const size_t jack_sample_size = sizeof(jack_default_audio_sample_t);
struct jack_data {
/**
@@ -103,9 +103,9 @@ mpd_jack_available(const struct jack_data *jd)
min = current;
}
- assert(min % sample_size == 0);
+ assert(min % jack_sample_size == 0);
- return min / sample_size;
+ return min / jack_sample_size;
}
static int
@@ -123,7 +123,7 @@ mpd_jack_process(jack_nframes_t nframes, void *arg)
const jack_nframes_t available = mpd_jack_available(jd);
for (unsigned i = 0; i < jd->audio_format.channels; ++i)
jack_ringbuffer_read_advance(jd->ringbuffer[i],
- available * sample_size);
+ available * jack_sample_size);
/* generate silence while MPD is paused */
@@ -144,7 +144,7 @@ mpd_jack_process(jack_nframes_t nframes, void *arg)
for (unsigned i = 0; i < jd->audio_format.channels; ++i) {
out = jack_port_get_buffer(jd->ports[i], nframes);
jack_ringbuffer_read(jd->ringbuffer[i],
- (char *)out, available * sample_size);
+ (char *)out, available * jack_sample_size);
for (jack_nframes_t f = available; f < nframes; ++f)
/* ringbuffer underrun, fill with silence */
@@ -675,7 +675,7 @@ mpd_jack_play(void *data, const void *chunk, size_t size, GError **error_r)
space = space1;
}
- if (space >= frame_size)
+ if (space >= jack_sample_size)
break;
/* XXX do something more intelligent to
@@ -683,7 +683,7 @@ mpd_jack_play(void *data, const void *chunk, size_t size, GError **error_r)
g_usleep(1000);
}
- space /= sample_size;
+ space /= jack_sample_size;
if (space < size)
size = space;
diff --git a/src/output/mvp_plugin.c b/src/output/mvp_plugin.c
index 20587f5..6cc8fa3 100644
--- a/src/output/mvp_plugin.c
+++ b/src/output/mvp_plugin.c
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-/*
+/*
* Media MVP audio output based on code from MVPMC project:
* http://mvpmc.sourceforge.net/
*/
diff --git a/src/output/oss_plugin.c b/src/output/oss_plugin.c
index bb41649..9261b42 100644
--- a/src/output/oss_plugin.c
+++ b/src/output/oss_plugin.c
@@ -41,6 +41,15 @@
# include <sys/soundcard.h>
#endif /* !(defined(__OpenBSD__) || defined(__NetBSD__) */
+/* We got bug reports from FreeBSD users who said that the two 24 bit
+ formats generate white noise on FreeBSD, but 32 bit works. This is
+ a workaround until we know what exactly is expected by the kernel
+ audio drivers. */
+#ifndef __linux__
+#undef AFMT_S24_PACKED
+#undef AFMT_S24_NE
+#endif
+
struct oss_data {
int fd;
const char *device;
@@ -347,7 +356,7 @@ oss_setup_sample_rate(int fd, struct audio_format *audio_format,
case SUCCESS:
if (!audio_valid_sample_rate(sample_rate))
break;
-
+
audio_format->sample_rate = sample_rate;
return true;
@@ -461,6 +470,12 @@ oss_setup_sample_format(int fd, struct audio_format *audio_format,
break;
audio_format->format = mpd_format;
+
+#ifdef AFMT_S24_PACKED
+ if (oss_format == AFMT_S24_PACKED)
+ audio_format->reverse_endian =
+ G_BYTE_ORDER != G_LITTLE_ENDIAN;
+#endif
return true;
case ERROR:
@@ -502,6 +517,12 @@ oss_setup_sample_format(int fd, struct audio_format *audio_format,
break;
audio_format->format = mpd_format;
+
+#ifdef AFMT_S24_PACKED
+ if (oss_format == AFMT_S24_PACKED)
+ audio_format->reverse_endian =
+ G_BYTE_ORDER != G_LITTLE_ENDIAN;
+#endif
return true;
case ERROR:
diff --git a/src/output_control.c b/src/output_control.c
index 161404f..0823b66 100644
--- a/src/output_control.c
+++ b/src/output_control.c
@@ -115,6 +115,7 @@ audio_output_open(struct audio_output *ao,
{
bool open;
+ assert(audio_format_valid(audio_format));
assert(mp != NULL);
if (ao->fail_timer != NULL) {
diff --git a/src/output_thread.c b/src/output_thread.c
index a5244c6..4e04467 100644
--- a/src/output_thread.c
+++ b/src/output_thread.c
@@ -95,6 +95,8 @@ ao_filter_open(struct audio_output *ao,
struct audio_format *audio_format,
GError **error_r)
{
+ assert(audio_format_valid(audio_format));
+
/* the replay_gain filter cannot fail here */
if (ao->replay_gain_filter != NULL)
filter_open(ao->replay_gain_filter, audio_format, error_r);
@@ -136,6 +138,7 @@ ao_open(struct audio_output *ao)
assert(!ao->open);
assert(ao->pipe != NULL);
assert(ao->chunk == NULL);
+ assert(audio_format_valid(&ao->in_audio_format));
if (ao->fail_timer != NULL) {
/* this can only happen when this
@@ -164,6 +167,8 @@ ao_open(struct audio_output *ao)
return;
}
+ assert(audio_format_valid(filter_audio_format));
+
ao->out_audio_format = *filter_audio_format;
audio_format_mask_apply(&ao->out_audio_format,
&ao->config_audio_format);
diff --git a/src/pcm_byteswap.c b/src/pcm_byteswap.c
index 967c574..6577319 100644
--- a/src/pcm_byteswap.c
+++ b/src/pcm_byteswap.c
@@ -49,7 +49,7 @@ const int16_t *pcm_byteswap_16(struct pcm_buffer *buffer,
static inline uint32_t swab32(uint32_t x)
{
- return (x << 24) |
+ return (x << 24) |
((x & 0xff00) << 8) |
((x & 0xff0000) >> 8) |
(x >> 24);
diff --git a/src/pipe.h b/src/pipe.h
index 7eabb6e..f9540a3 100644
--- a/src/pipe.h
+++ b/src/pipe.h
@@ -20,9 +20,9 @@
#ifndef MPD_PIPE_H
#define MPD_PIPE_H
-#ifndef NDEBUG
#include <stdbool.h>
+#ifndef NDEBUG
struct audio_format;
#endif
diff --git a/src/update_walk.c b/src/update_walk.c
index 95d5854..845f152 100644
--- a/src/update_walk.c
+++ b/src/update_walk.c
@@ -300,6 +300,9 @@ stat_directory(const struct directory *directory, struct stat *st)
if (path_fs == NULL)
return -1;
ret = stat(path_fs, st);
+ if (ret < 0)
+ g_warning("Failed to stat %s: %s", path_fs, g_strerror(errno));
+
g_free(path_fs);
return ret;
}
@@ -316,6 +319,9 @@ stat_directory_child(const struct directory *parent, const char *name,
return -1;
ret = stat(path_fs, st);
+ if (ret < 0)
+ g_warning("Failed to stat %s: %s", path_fs, g_strerror(errno));
+
g_free(path_fs);
return ret;
}
@@ -557,6 +563,7 @@ directory_child_access(const struct directory *directory,
/* access() is useless on WIN32 */
(void)directory;
(void)name;
+ (void)mode;
return true;
#else
char *path = map_directory_child_fs(directory, name);
diff --git a/src/archive/zzip_archive_plugin.h b/test/stdbin.h
similarity index 84%
copy from src/archive/zzip_archive_plugin.h
copy to test/stdbin.h
index 6d5037e..362605a 100644
--- a/src/archive/zzip_archive_plugin.h
+++ b/test/stdbin.h
@@ -17,9 +17,13 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef MPD_ARCHIVE_ZZIP_H
-#define MPD_ARCHIVE_ZZIP_H
+#ifndef MPD_STDBIN_H
+#define MPD_STDBIN_H
-extern const struct archive_plugin zzip_archive_plugin;
+#ifdef WIN32
+#include <fcntl.h>
+/** set binary mode on stdin/stdout */
+int _CRT_fmode = _O_BINARY;
+#endif
#endif
--
Git repository for pkg-mpd
More information about the Pkg-mpd-commits
mailing list