diff options
| -rw-r--r-- | Makefile.am | 20 | ||||
| -rw-r--r-- | NEWS | 5 | ||||
| -rw-r--r-- | configure.ac | 56 | ||||
| -rw-r--r-- | src/decoder/DecoderList.cxx | 2 | ||||
| -rw-r--r-- | src/playlist/plugins/EmbeddedCuePlaylistPlugin.cxx | 2 | ||||
| -rw-r--r-- | test/test_protocol.cxx | 2 |
6 files changed, 35 insertions, 52 deletions
diff --git a/Makefile.am b/Makefile.am index 3c2f4214c..f07cca401 100644 --- a/Makefile.am +++ b/Makefile.am @@ -796,12 +796,6 @@ endif libdecoder_a_SOURCES = \ src/decoder/plugins/PcmDecoderPlugin.cxx \ src/decoder/plugins/PcmDecoderPlugin.hxx \ - src/decoder/plugins/DsdiffDecoderPlugin.cxx \ - src/decoder/plugins/DsdiffDecoderPlugin.hxx \ - src/decoder/plugins/DsfDecoderPlugin.cxx \ - src/decoder/plugins/DsfDecoderPlugin.hxx \ - src/decoder/plugins/DsdLib.cxx \ - src/decoder/plugins/DsdLib.hxx \ src/decoder/DecoderBuffer.cxx src/decoder/DecoderBuffer.hxx \ src/decoder/DecoderPlugin.cxx \ src/decoder/DecoderList.cxx src/decoder/DecoderList.hxx @@ -845,6 +839,16 @@ DECODER_LIBS = \ $(ADPLUG_LIBS) \ $(FAAD_LIBS) +if ENABLE_DSD +libdecoder_a_SOURCES += \ + src/decoder/plugins/DsdiffDecoderPlugin.cxx \ + src/decoder/plugins/DsdiffDecoderPlugin.hxx \ + src/decoder/plugins/DsfDecoderPlugin.cxx \ + src/decoder/plugins/DsfDecoderPlugin.hxx \ + src/decoder/plugins/DsdLib.cxx \ + src/decoder/plugins/DsdLib.hxx +endif + if HAVE_MAD libdecoder_a_SOURCES += \ src/decoder/plugins/MadDecoderPlugin.cxx \ @@ -2061,6 +2065,8 @@ test_test_queue_priority_LDADD = \ libutil.a \ $(CPPUNIT_LIBS) +if ENABLE_DSD + noinst_PROGRAMS += src/pcm/dsd2pcm/dsd2pcm src_pcm_dsd2pcm_dsd2pcm_SOURCES = \ @@ -2073,6 +2079,8 @@ src_pcm_dsd2pcm_dsd2pcm_LDADD = libutil.a endif +endif + # # Documentation @@ -72,7 +72,10 @@ ver 0.19 (not yet released) * install systemd unit for socket activation * Android port -ver 0.18.15 (not yet released) +ver 0.18.16 (2014/09/26) +* fix DSD breakage due to typo in configure.ac + +ver 0.18.15 (2014/09/26) * command - list: reset used size after the list has been processed * fix MixRamp diff --git a/configure.ac b/configure.ac index e3d4730f4..c7fa6d1c7 100644 --- a/configure.ac +++ b/configure.ac @@ -369,6 +369,11 @@ AC_ARG_ENABLE(documentation, [build documentation (default: disable)]),, [enable_documentation=no]) +AC_ARG_ENABLE(dsd, + AS_HELP_STRING([--enable-dsd], + [enable DSD decoder (default: enable)]),, + [enable_dsd=yes]) + AC_ARG_ENABLE(ffmpeg, AS_HELP_STRING([--enable-ffmpeg], [enable FFMPEG support]),, @@ -1133,6 +1138,14 @@ if test x$enable_audiofile = xyes; then AC_DEFINE(HAVE_AUDIOFILE, 1, [Define for audiofile support]) fi +dnl ----------------------------------- DSD ----------------------------------- + +if test x$enable_dsd = xyes; then + AC_DEFINE(ENABLE_DSD, 1, [Define for the DSD decoder]) +fi + +AM_CONDITIONAL(ENABLE_DSD, test x$enable_dsd = xyes) + dnl ----------------------------------- FAAD ---------------------------------- AM_PATH_FAAD() @@ -1386,28 +1399,6 @@ AM_CONDITIONAL(ENABLE_WILDMIDI, test x$enable_wildmidi = xyes) dnl ------------------------ Post Decoder Plugins Tests ----------------------- -if - test x$enable_aac = xno && - test x$enable_audiofile = xno && - test x$enable_ffmpeg = xno && - test x$enable_flac = xno && - test x$enable_fluidsynth = xno && - test x$enable_mad = xno && - test x$enable_mikmod = xno; then - test x$enable_modplug = xno && - test x$enable_mp4v2 = xno && - test x$enable_mpc = xno && - test x$enable_mpg123 = xno && - test x$enable_opus = xno && - test x$enable_sidplay = xno && - test x$enable_tremor = xno && - test x$enable_vorbis = xno && - test x$enable_wavpack = xno && - test x$enable_wildmidi = xno && - - AC_MSG_ERROR([No input plugins supported!]) -fi - AM_CONDITIONAL(HAVE_XIPH, test x$enable_vorbis = xyes || test x$enable_tremor = xyes || test x$enable_flac = xyes || test x$enable_opus = xyes) @@ -1713,27 +1704,6 @@ fi AM_CONDITIONAL(ENABLE_WINMM_OUTPUT, test x$enable_winmm_output = xyes) -dnl --------------------- Post Audio Output Plugins Tests --------------------- -if - test x$enable_alsa = xno && - test x$enable_roar = xno && - test x$enable_ao = xno && - test x$enable_fifo = xno && - test x$enable_httpd_output = xno && - test x$enable_jack = xno && - test x$enable_openal = xno && - test x$enable_oss = xno && - test x$enable_osx = xno && - test x$enable_pipe_output = xno && - test x$enable_pulse = xno && - test x$enable_recorder_output = xno && - test x$enable_shout = xno && - test x$enable_solaris_output = xno && - test x$enable_winmm_output = xno; then - - AC_MSG_ERROR([No Audio Output types configured!]) -fi - dnl --------------------------------------------------------------------------- dnl Documentation dnl --------------------------------------------------------------------------- diff --git a/src/decoder/DecoderList.cxx b/src/decoder/DecoderList.cxx index 5a13e6694..0a31d9eac 100644 --- a/src/decoder/DecoderList.cxx +++ b/src/decoder/DecoderList.cxx @@ -76,8 +76,10 @@ const struct DecoderPlugin *const decoder_plugins[] = { #ifdef HAVE_AUDIOFILE &audiofile_decoder_plugin, #endif +#ifdef ENABLE_DSD &dsdiff_decoder_plugin, &dsf_decoder_plugin, +#endif #ifdef HAVE_FAAD &faad_decoder_plugin, #endif diff --git a/src/playlist/plugins/EmbeddedCuePlaylistPlugin.cxx b/src/playlist/plugins/EmbeddedCuePlaylistPlugin.cxx index 2e903ae03..9e8f91e05 100644 --- a/src/playlist/plugins/EmbeddedCuePlaylistPlugin.cxx +++ b/src/playlist/plugins/EmbeddedCuePlaylistPlugin.cxx @@ -171,7 +171,7 @@ static const char *const embcue_playlist_suffixes[] = { }; const struct playlist_plugin embcue_playlist_plugin = { - "cue", + "embcue", nullptr, nullptr, diff --git a/test/test_protocol.cxx b/test/test_protocol.cxx index e80e4fe6d..fb35cbc66 100644 --- a/test/test_protocol.cxx +++ b/test/test_protocol.cxx @@ -8,7 +8,7 @@ #include <cppunit/ui/text/TestRunner.h> #include <cppunit/extensions/HelperMacros.h> -#include <unistd.h> +#include <stdlib.h> static enum ack last_error = ack(-1); |