diff options
| -rw-r--r-- | Makefile.am | 20 | ||||
| -rw-r--r-- | configure.ac | 13 | ||||
| -rw-r--r-- | src/DecoderList.cxx | 2 |
3 files changed, 29 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index 147a15bf8..a96d69369 100644 --- a/Makefile.am +++ b/Makefile.am @@ -476,12 +476,6 @@ endif libdecoder_plugins_a_SOURCES = \ src/decoder/PcmDecoderPlugin.cxx \ src/decoder/PcmDecoderPlugin.hxx \ - src/decoder/DsdiffDecoderPlugin.cxx \ - src/decoder/DsdiffDecoderPlugin.hxx \ - src/decoder/DsfDecoderPlugin.cxx \ - src/decoder/DsfDecoderPlugin.hxx \ - src/decoder/DsdLib.cxx \ - src/decoder/DsdLib.hxx \ src/DecoderBuffer.cxx src/DecoderBuffer.hxx \ src/DecoderPlugin.cxx \ src/DecoderList.cxx src/DecoderList.hxx @@ -525,6 +519,16 @@ DECODER_LIBS = \ DECODER_SRC = +if ENABLE_DSD +libdecoder_plugins_a_SOURCES += \ + src/decoder/DsdiffDecoderPlugin.cxx \ + src/decoder/DsdiffDecoderPlugin.hxx \ + src/decoder/DsfDecoderPlugin.cxx \ + src/decoder/DsfDecoderPlugin.hxx \ + src/decoder/DsdLib.cxx \ + src/decoder/DsdLib.hxx +endif + if HAVE_MAD libdecoder_plugins_a_SOURCES += \ src/decoder/MadDecoderPlugin.cxx \ @@ -1559,6 +1563,8 @@ test_test_queue_priority_LDADD = \ libutil.a \ $(CPPUNIT_LIBS) +if ENABLE_DSD + noinst_PROGRAMS += src/pcm/dsd2pcm/dsd2pcm src_pcm_dsd2pcm_dsd2pcm_SOURCES = \ @@ -1571,6 +1577,8 @@ src_pcm_dsd2pcm_dsd2pcm_LDADD = libutil.a endif +endif + # # Documentation diff --git a/configure.ac b/configure.ac index 9c8d72e1f..53cbc303a 100644 --- a/configure.ac +++ b/configure.ac @@ -214,6 +214,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]),, @@ -846,6 +851,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(HAVE_DSD, 1, [Define for the DSD decoder]) +fi + +AM_CONDITIONAL(ENABLE_DSD, test x$enable_dsd = xyes) + dnl ----------------------------------- FAAD ---------------------------------- AM_PATH_FAAD() diff --git a/src/DecoderList.cxx b/src/DecoderList.cxx index 834178260..4546cac2f 100644 --- a/src/DecoderList.cxx +++ b/src/DecoderList.cxx @@ -73,8 +73,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 |