From 87268c2297f68580d0227126c50be5547460922e Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 24 Sep 2014 23:03:28 +0200 Subject: [PATCH 01/10] test/test_protocol: add missing stdlib.h include EXIT_SUCCESS and EXIT_FAILURE are defined in stdlib.h, not unistd.h. D'oh! --- test/test_protocol.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 #include -#include +#include static enum ack last_error = ack(-1); From c4fca2aa614741f3d5bfef4eff039ae52c1a0a15 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 26 Sep 2014 08:53:19 +0200 Subject: [PATCH 02/10] playlist/embcue: change name string to "embcue" The name "cue" was listed twice in "mpd --version". --- src/playlist/EmbeddedCuePlaylistPlugin.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/playlist/EmbeddedCuePlaylistPlugin.cxx b/src/playlist/EmbeddedCuePlaylistPlugin.cxx index d758650eb..2734fa59e 100644 --- a/src/playlist/EmbeddedCuePlaylistPlugin.cxx +++ b/src/playlist/EmbeddedCuePlaylistPlugin.cxx @@ -171,7 +171,7 @@ static const char *const embcue_playlist_suffixes[] = { }; const struct playlist_plugin embcue_playlist_plugin = { - "cue", + "embcue", nullptr, nullptr, From 8bf46a665e4b4bd9d663351fbfb8ff47b59dfdd6 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 26 Sep 2014 09:00:58 +0200 Subject: [PATCH 03/10] configure.ac: add option to disable the DSD decoders Allow building a smaller MPD binary for people who don't need DSD. --- Makefile.am | 20 ++++++++++++++------ configure.ac | 13 +++++++++++++ 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 From ef02b20811d362898285e4e48edc795684ae0ec7 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 26 Sep 2014 09:06:21 +0200 Subject: [PATCH 04/10] CommandLine: update copyright year --- src/CommandLine.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/CommandLine.cxx b/src/CommandLine.cxx index 05f0a358c..4bed5d531 100644 --- a/src/CommandLine.cxx +++ b/src/CommandLine.cxx @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003-2013 The Music Player Daemon Project + * Copyright (C) 2003-2014 The Music Player Daemon Project * http://www.musicpd.org * * This program is free software; you can redistribute it and/or modify @@ -69,7 +69,7 @@ static void version(void) puts("Music Player Daemon " VERSION "\n" "\n" "Copyright (C) 2003-2007 Warren Dukes \n" - "Copyright (C) 2008-2013 Max Kellermann \n" + "Copyright (C) 2008-2014 Max Kellermann \n" "This is free software; see the source for copying conditions. There is NO\n" "warranty; not even MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" "\n" From d6c08fb79fb67427c8c208e3dde87212b3a4006f Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 26 Sep 2014 09:09:00 +0200 Subject: [PATCH 05/10] configure.ac: allow building MPD without output plugin MPD can easily be used as a database provider for the proxy database plugin. In that case, it needs only one "null" output, and no real output plugin. --- configure.ac | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/configure.ac b/configure.ac index 53cbc303a..aba8e33f4 100644 --- a/configure.ac +++ b/configure.ac @@ -1423,27 +1423,6 @@ esac 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 --------------------------------------------------------------------------- From 3d17c0677789947a0c62544b15aeb7e99e04868f Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 26 Sep 2014 09:10:34 +0200 Subject: [PATCH 06/10] configure.ac: allow building MPD without decoder plugin There's always the "PCM" decoder plugin, which was never checked by configure.ac. --- configure.ac | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/configure.ac b/configure.ac index aba8e33f4..38836ed81 100644 --- a/configure.ac +++ b/configure.ac @@ -1094,27 +1094,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_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) From 79b6f9e89e994e964eb61b749a926558b3995fa5 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 26 Sep 2014 09:41:40 +0200 Subject: [PATCH 07/10] release v0.18.15 --- NEWS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 80d5da21c..939e89b49 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -ver 0.18.15 (not yet released) +ver 0.18.15 (2014/09/26) * command - list: reset used size after the list has been processed * fix MixRamp From 7eca8866082a3c9182ed7c42cfbe383041135d9e Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 26 Sep 2014 10:55:43 +0200 Subject: [PATCH 08/10] configure.ac: prepare for 0.18.16 --- NEWS | 2 ++ configure.ac | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 939e89b49..22b564567 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,5 @@ +ver 0.18.16 (not yet released) + ver 0.18.15 (2014/09/26) * command - list: reset used size after the list has been processed diff --git a/configure.ac b/configure.ac index 38836ed81..ddcc54548 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ(2.60) -AC_INIT(mpd, 0.18.15, mpd-devel@musicpd.org) +AC_INIT(mpd, 0.18.16, mpd-devel@musicpd.org) VERSION_MAJOR=0 VERSION_MINOR=18 From 861067412f0860d00dbb60f5fa05fbe4beeb7a2b Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 26 Sep 2014 10:55:53 +0200 Subject: [PATCH 09/10] configure.ac: fix DSD breakage due to typo --- NEWS | 1 + configure.ac | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 22b564567..ac7d05bed 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,5 @@ ver 0.18.16 (not yet released) +* fix DSD breakage due to typo in configure.ac ver 0.18.15 (2014/09/26) * command diff --git a/configure.ac b/configure.ac index ddcc54548..3d6b8526c 100644 --- a/configure.ac +++ b/configure.ac @@ -854,7 +854,7 @@ fi dnl ----------------------------------- DSD ----------------------------------- if test x$enable_dsd = xyes; then - AC_DEFINE(HAVE_DSD, 1, [Define for the DSD decoder]) + AC_DEFINE(ENABLE_DSD, 1, [Define for the DSD decoder]) fi AM_CONDITIONAL(ENABLE_DSD, test x$enable_dsd = xyes) From fe45f282044c3500894f65b94a514ebe799da6a1 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 26 Sep 2014 10:57:04 +0200 Subject: [PATCH 10/10] release v0.18.16 --- NEWS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS b/NEWS index ac7d05bed..2e8c2dcdb 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -ver 0.18.16 (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)