From 227da2377a80c66b755f0fa49770bb6234eb1ad2 Mon Sep 17 00:00:00 2001 From: Avuton Olrich Date: Sun, 6 Jan 2013 16:47:09 -0800 Subject: [PATCH 1/9] Modify version string to post-release version 0.17.4~git --- NEWS | 3 +++ configure.ac | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 65e9b4c8c..ea0aeeb00 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,6 @@ +ver 0.17.4 (2013/??/??) + + ver 0.17.3 (2013/01/06) * output: - osx: fix pops during playback diff --git a/configure.ac b/configure.ac index c246ddbb3..9a495b663 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ(2.60) -AC_INIT(mpd, 0.17.3, musicpd-dev-team@lists.sourceforge.net) +AC_INIT(mpd, 0.17.4~git, musicpd-dev-team@lists.sourceforge.net) VERSION_MAJOR=0 VERSION_MINOR=17 From 23b2b7144bd4115592b2d0d14f54650fd799ec29 Mon Sep 17 00:00:00 2001 From: Denis Krjuchkov Date: Tue, 8 Jan 2013 17:46:04 +0600 Subject: [PATCH 2/9] Makefile.am: distribute mpc.ico --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 89b643530..a0b32f8be 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1396,4 +1396,4 @@ endif EXTRA_DIST = $(doc_DATA) autogen.sh \ $(wildcard scripts/*.sh) \ $(man_MANS) $(DOCBOOK_FILES) doc/mpdconf.example doc/doxygen.conf \ - src/win/mpd_win32_rc.rc.in + src/win/mpd_win32_rc.rc.in src/win/mpd.ico From 78f4171a7ac923d2bf9be6b42ee9b1909ab59e86 Mon Sep 17 00:00:00 2001 From: Denis Krjuchkov Date: Wed, 9 Jan 2013 14:35:25 +0600 Subject: [PATCH 3/9] configure.ac: improve detection of libgme At least in my configuration libgme lacks .pc file thus could not be detected with pkg-config. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 9a495b663..05f288822 100644 --- a/configure.ac +++ b/configure.ac @@ -853,7 +853,7 @@ fi AM_CONDITIONAL(ENABLE_FLUIDSYNTH, test x$enable_fluidsynth = xyes) dnl ---------------------------------- libgme --------------------------------- -MPD_AUTO_PKG(gme, GME, [libgme], +MPD_AUTO_PKG_LIB(gme, GME, [libgme], gme, gme_open_file, [-lgme -lstdc++], [], [gme decoder plugin], [libgme not found]) AM_CONDITIONAL(HAVE_GME, test x$enable_gme = xyes) if test x$enable_gme = xyes; then From 43806d524da71dafdbedde88cdad57359b94d999 Mon Sep 17 00:00:00 2001 From: Denis Krjuchkov Date: Thu, 10 Jan 2013 15:34:25 +0600 Subject: [PATCH 4/9] mpdconf.example: improve documentation for replay gain - Added replaygain_missing_preamp and replaygain_limit settings - Added information about "auto" replay gain mode --- doc/mpdconf.example | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/doc/mpdconf.example b/doc/mpdconf.example index 8cae72e94..ad2444bac 100644 --- a/doc/mpdconf.example +++ b/doc/mpdconf.example @@ -321,8 +321,11 @@ input { # Normalization automatic volume adjustments ################################## # # This setting specifies the type of ReplayGain to use. This setting can have -# the argument "off", "album" or "track". See -# for more details. This setting is off by default. +# the argument "off", "album", "track" or "auto". "auto" is a special mode that +# chooses between "track" and "album" depending on the current state of +# random playback. If random playback is enabled then "track" mode is used. +# See for more details about ReplayGain. +# This setting is off by default. # #replaygain "album" # @@ -331,6 +334,20 @@ input { # #replaygain_preamp "0" # +# This setting sets the pre-amp used for files that do NOT have ReplayGain tags. +# By default this setting is disabled. +# +#replaygain_missing_preamp "0" +# +# This setting enables or disables ReplayGain limiting. +# MPD calculates actual amplification based on the ReplayGain tags +# and replaygain_preamp / replaygain_missing_preamp setting. +# If replaygain_limit is enabled MPD will never amplify audio signal +# above its original level. If replaygain_limit is disabled such amplification +# might occur. By default this setting is enabled. +# +#replaygain_limit "yes" +# # This setting enables on-the-fly normalization volume adjustment. This will # result in the volume of all playing audio to be adjusted so the output has # equal "loudness". This setting is disabled by default. From 10fc288c91b4266774eb19f9cce65ae8c9b50ab4 Mon Sep 17 00:00:00 2001 From: Denis Krjuchkov Date: Thu, 10 Jan 2013 15:46:30 +0600 Subject: [PATCH 5/9] mpdconf.example: provide an example of winmm output --- doc/mpdconf.example | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/doc/mpdconf.example b/doc/mpdconf.example index ad2444bac..d4cde2aa0 100644 --- a/doc/mpdconf.example +++ b/doc/mpdconf.example @@ -281,6 +281,16 @@ input { ## sink "remote_server_sink" # optional #} # +# An example of a winmm output (Windows multimedia API). +# +#audio_output { +# type "winmm" +## device "Digital Audio (S/PDIF) (High Definition Audio Device)" # optional +# or +## device "0" # optional +## mixer_type "hardware" # optional +#} +# ## Example "pipe" output: # #audio_output { From 7801ca86b987646fd4b6d531602ae7aba3b23581 Mon Sep 17 00:00:00 2001 From: Denis Krjuchkov Date: Thu, 10 Jan 2013 15:50:00 +0600 Subject: [PATCH 6/9] mpdconf.example: provide an example of openal output --- doc/mpdconf.example | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/doc/mpdconf.example b/doc/mpdconf.example index d4cde2aa0..c78cde8d3 100644 --- a/doc/mpdconf.example +++ b/doc/mpdconf.example @@ -291,6 +291,13 @@ input { ## mixer_type "hardware" # optional #} # +# An example of a openal output. +# +#audio_output { +# type "openal" +## device "Digital Audio (S/PDIF) (High Definition Audio Device)" # optional +#} +# ## Example "pipe" output: # #audio_output { From 5def2a09bd819a9c2ac25ece477706f0e144154e Mon Sep 17 00:00:00 2001 From: Denis Krjuchkov Date: Fri, 11 Jan 2013 15:22:53 +0600 Subject: [PATCH 7/9] mpdconf.example: example improvements - Add mandatory "name" setting for winmm/openal examples. - Fix the language in openal sample (a -> an) --- doc/mpdconf.example | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/mpdconf.example b/doc/mpdconf.example index c78cde8d3..390d26beb 100644 --- a/doc/mpdconf.example +++ b/doc/mpdconf.example @@ -285,16 +285,18 @@ input { # #audio_output { # type "winmm" +# name "My WinMM output" ## device "Digital Audio (S/PDIF) (High Definition Audio Device)" # optional # or ## device "0" # optional ## mixer_type "hardware" # optional #} # -# An example of a openal output. +# An example of an openal output. # #audio_output { # type "openal" +# name "My OpenAL output" ## device "Digital Audio (S/PDIF) (High Definition Audio Device)" # optional #} # From 905d493fd7ac156eb2c060faf35301d62be0cda5 Mon Sep 17 00:00:00 2001 From: Denis Krjuchkov Date: Fri, 11 Jan 2013 15:30:59 +0600 Subject: [PATCH 8/9] .gitignore: add src/win/mpd_win32_rc.rc This file is generated during configuration and should be ignored. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 9f4d606a9..11ac5f9a8 100644 --- a/.gitignore +++ b/.gitignore @@ -41,6 +41,7 @@ tags .#* .stgit* src/dsd2pcm/dsd2pcm +src/win/mpd_win32_rc.rc doc/doxygen.conf doc/protocol.html doc/protocol From 1105e61f292fd61a6316a4b83439dbaa29c102fd Mon Sep 17 00:00:00 2001 From: Brice Jaglin Date: Wed, 16 Jan 2013 18:02:58 +0100 Subject: [PATCH 9/9] decoder/ffmpeg: support float planar audio --- NEWS | 2 ++ src/decoder/ffmpeg_decoder_plugin.c | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/NEWS b/NEWS index ea0aeeb00..f57736b09 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,6 @@ ver 0.17.4 (2013/??/??) +* decoder: + - ffmpeg: support float planar audio (ffmpeg 1.1) ver 0.17.3 (2013/01/06) diff --git a/src/decoder/ffmpeg_decoder_plugin.c b/src/decoder/ffmpeg_decoder_plugin.c index 72a5ff341..4c4cb2b81 100644 --- a/src/decoder/ffmpeg_decoder_plugin.c +++ b/src/decoder/ffmpeg_decoder_plugin.c @@ -395,6 +395,11 @@ ffmpeg_sample_format(enum AVSampleFormat sample_fmt) #endif return SAMPLE_FORMAT_S32; +#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51,17,0) + case AV_SAMPLE_FMT_FLTP: + return SAMPLE_FORMAT_FLOAT; +#endif + default: break; }