diff --git a/Makefile.am b/Makefile.am index 70be090b9..d34b81f01 100644 --- a/Makefile.am +++ b/Makefile.am @@ -934,6 +934,7 @@ libtag_a_SOURCES =\ src/tag/ReplayGain.cxx src/tag/ReplayGain.hxx \ src/tag/MixRamp.cxx src/tag/MixRamp.hxx \ src/tag/Generic.cxx src/tag/Generic.hxx \ + src/tag/Id3MusicBrainz.cxx src/tag/Id3MusicBrainz.hxx \ src/tag/ApeLoader.cxx src/tag/ApeLoader.hxx \ src/tag/ApeReplayGain.cxx src/tag/ApeReplayGain.hxx \ src/tag/ApeTag.cxx src/tag/ApeTag.hxx diff --git a/NEWS b/NEWS index 9dcc2e15b..5e8b6febd 100644 --- a/NEWS +++ b/NEWS @@ -10,6 +10,10 @@ ver 0.21 (not yet released) - alsa: non-blocking mode ver 0.20.10 (not yet released) +* decoder + - ffmpeg: support MusicBrainz ID3v2 tags +* tags + - aiff: fix FORM chunk size endianess (is big-endian) ver 0.20.9 (2017/06/04) * decoder diff --git a/android/build.py b/android/build.py index a37432e13..3ec3d9ba3 100755 --- a/android/build.py +++ b/android/build.py @@ -154,5 +154,9 @@ configure = [ ] + configure_args +from build.cmdline import concatenate_cmdline_variables +configure = concatenate_cmdline_variables(configure, + set(('CFLAGS', 'CXXFLAGS', 'CPPFLAGS', 'LDFLAGS', 'LIBS'))) + subprocess.check_call(configure, env=toolchain.env) subprocess.check_call(['/usr/bin/make', '--quiet', '-j12'], env=toolchain.env) diff --git a/doc/protocol.xml b/doc/protocol.xml index 6819a2abc..692edaded 100644 --- a/doc/protocol.xml +++ b/doc/protocol.xml @@ -402,6 +402,15 @@ + + + Change events accumulate, even while the connection is + not in "idle" mode; no events gets lost while the client + is doing something else with the connection. If an + event had already occurred since the last call, the new + idle command will return immediately. + + While a client is waiting for idle results, the server disables timeouts, allowing a client diff --git a/python/build/cmdline.py b/python/build/cmdline.py new file mode 100644 index 000000000..50245f597 --- /dev/null +++ b/python/build/cmdline.py @@ -0,0 +1,29 @@ +def concatenate_cmdline_variables(src, names): + """Find duplicate variable declarations on the given source list, and + concatenate the values of those in the 'names' list.""" + + # the result list being constructed + dest = [] + + # a map of variable name to destination list index + positions = {} + + for item in src: + i = item.find('=') + if i > 0: + # it's a variable + name = item[:i] + if name in names: + # it's a known variable + if name in positions: + # already specified: concatenate instead of + # appending it + dest[positions[name]] += ' ' + item[i + 1:] + continue + else: + # not yet seen: append it and remember the list + # index + positions[name] = len(dest) + dest.append(item) + + return dest diff --git a/python/build/libs.py b/python/build/libs.py index bdcfeb3d3..1bc22639e 100644 --- a/python/build/libs.py +++ b/python/build/libs.py @@ -57,6 +57,17 @@ libmad = AutotoolsProject( autogen=True, ) +liblame = AutotoolsProject( + 'http://downloads.sourceforge.net/project/lame/lame/3.99/lame-3.99.5.tar.gz', + '24346b4158e4af3bd9f2e194bb23eb473c75fb7377011523353196b19b9a23ff', + 'lib/libmp3lame.a', + [ + '--disable-shared', '--enable-static', + '--disable-gtktest', '--disable-analyzer-hooks', + '--disable-decoder', '--disable-frontend', + ], +) + ffmpeg = FfmpegProject( 'http://ffmpeg.org/releases/ffmpeg-3.3.2.tar.xz', '1998de1ab32616cbf2ff86efc3f1f26e76805ec5dc51e24c041c79edd8262785', diff --git a/src/decoder/plugins/FfmpegMetaData.cxx b/src/decoder/plugins/FfmpegMetaData.cxx index 74052160e..07be3cad3 100644 --- a/src/decoder/plugins/FfmpegMetaData.cxx +++ b/src/decoder/plugins/FfmpegMetaData.cxx @@ -24,6 +24,7 @@ #include "FfmpegMetaData.hxx" #include "tag/Table.hxx" #include "tag/Handler.hxx" +#include "tag/Id3MusicBrainz.hxx" extern "C" { #include @@ -75,6 +76,11 @@ FfmpegScanDictionary(AVDictionary *dict, i->name != nullptr; ++i) FfmpegScanTag(i->type, dict, i->name, handler, handler_ctx); + + for (const struct tag_table *i = musicbrainz_txxx_tags; + i->name != nullptr; ++i) + FfmpegScanTag(i->type, dict, i->name, + handler, handler_ctx); } if (handler.pair != nullptr) diff --git a/src/tag/Aiff.cxx b/src/tag/Aiff.cxx index faa47f6b2..b6a7aa7ed 100644 --- a/src/tag/Aiff.cxx +++ b/src/tag/Aiff.cxx @@ -49,7 +49,7 @@ aiff_seek_id3(InputStream &is) aiff_header header; is.ReadFull(&header, sizeof(header)); if (memcmp(header.id, "FORM", 4) != 0 || - (is.KnownSize() && FromLE32(header.size) > is.GetSize()) || + (is.KnownSize() && FromBE32(header.size) > is.GetSize()) || (memcmp(header.format, "AIFF", 4) != 0 && memcmp(header.format, "AIFC", 4) != 0)) throw std::runtime_error("Not an AIFF file"); diff --git a/src/tag/Id3MusicBrainz.cxx b/src/tag/Id3MusicBrainz.cxx new file mode 100644 index 000000000..b1f747cf2 --- /dev/null +++ b/src/tag/Id3MusicBrainz.cxx @@ -0,0 +1,34 @@ +/* + * Copyright 2003-2017 The Music Player Daemon Project + * http://www.musicpd.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include "Id3MusicBrainz.hxx" +#include "Table.hxx" +#include "Type.h" + +const struct tag_table musicbrainz_txxx_tags[] = { + { "ALBUMARTISTSORT", TAG_ALBUM_ARTIST_SORT }, + { "MusicBrainz Artist Id", TAG_MUSICBRAINZ_ARTISTID }, + { "MusicBrainz Album Id", TAG_MUSICBRAINZ_ALBUMID }, + { "MusicBrainz Album Artist Id", + TAG_MUSICBRAINZ_ALBUMARTISTID }, + { "MusicBrainz Track Id", TAG_MUSICBRAINZ_TRACKID }, + { "MusicBrainz Release Track Id", + TAG_MUSICBRAINZ_RELEASETRACKID }, + { nullptr, TAG_NUM_OF_ITEM_TYPES } +}; diff --git a/src/tag/Id3MusicBrainz.hxx b/src/tag/Id3MusicBrainz.hxx new file mode 100644 index 000000000..bbdfc4b26 --- /dev/null +++ b/src/tag/Id3MusicBrainz.hxx @@ -0,0 +1,25 @@ +/* + * Copyright 2003-2017 The Music Player Daemon Project + * http://www.musicpd.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef MPD_TAG_ID3MUSICBRAINZ_HXX +#define MPD_TAG_ID3MUSICBRAINZ_HXX + +extern const struct tag_table musicbrainz_txxx_tags[]; + +#endif diff --git a/src/tag/Id3Scan.cxx b/src/tag/Id3Scan.cxx index 670eadaf6..d36762845 100644 --- a/src/tag/Id3Scan.cxx +++ b/src/tag/Id3Scan.cxx @@ -23,6 +23,7 @@ #include "Handler.hxx" #include "Table.hxx" #include "Builder.hxx" +#include "Id3MusicBrainz.hxx" #include "util/Alloc.hxx" #include "util/ScopeExit.hxx" #include "util/StringStrip.hxx" @@ -209,19 +210,8 @@ gcc_pure static TagType tag_id3_parse_txxx_name(const char *name) noexcept { - static constexpr struct tag_table txxx_tags[] = { - { "ALBUMARTISTSORT", TAG_ALBUM_ARTIST_SORT }, - { "MusicBrainz Artist Id", TAG_MUSICBRAINZ_ARTISTID }, - { "MusicBrainz Album Id", TAG_MUSICBRAINZ_ALBUMID }, - { "MusicBrainz Album Artist Id", - TAG_MUSICBRAINZ_ALBUMARTISTID }, - { "MusicBrainz Track Id", TAG_MUSICBRAINZ_TRACKID }, - { "MusicBrainz Release Track Id", - TAG_MUSICBRAINZ_RELEASETRACKID }, - { nullptr, TAG_NUM_OF_ITEM_TYPES } - }; - return tag_table_lookup(txxx_tags, name); + return tag_table_lookup(musicbrainz_txxx_tags, name); } /** diff --git a/win32/build.py b/win32/build.py index 1a08ba97f..c6dd7005e 100755 --- a/win32/build.py +++ b/win32/build.py @@ -76,6 +76,7 @@ thirdparty_libs = [ flac, zlib, libid3tag, + liblame, ffmpeg, curl, boost, @@ -112,5 +113,9 @@ configure = [ ] + configure_args +from build.cmdline import concatenate_cmdline_variables +configure = concatenate_cmdline_variables(configure, + set(('CFLAGS', 'CXXFLAGS', 'CPPFLAGS', 'LDFLAGS', 'LIBS'))) + subprocess.check_call(configure, env=toolchain.env) subprocess.check_call(['/usr/bin/make', '--quiet', '-j12'], env=toolchain.env)