release v0.19.5

Avoids crash because Close() invokes a call on a destructed
NfsConnection.

INSTALL

@@ -119,9 +119,6 @@ For AdLib playback.
 despotify - https://github.com/SimonKagstrom/despotify
 For Spotify playback.
 
-MP4v2 - https://code.google.com/p/mp4v2/
-For MP4 playback. You will need FAAD2.
-
 
 Optional Miscellaneous Dependencies
 -----------------------------------

Makefile.am

@@ -828,7 +828,6 @@ libdecoder_a_CPPFLAGS = $(AM_CPPFLAGS) \
 	$(WAVPACK_CFLAGS) \
 	$(MAD_CFLAGS) \
 	$(MPG123_CFLAGS) \
-	$(MP4V2_CFLAGS) \
 	$(OPUS_CFLAGS) \
 	$(FFMPEG_CFLAGS) \
 	$(MPCDEC_CFLAGS) \
@@ -848,7 +847,6 @@ DECODER_LIBS = \
 	$(WAVPACK_LIBS) \
 	$(MAD_LIBS) \
 	$(MPG123_LIBS) \
-	$(MP4V2_LIBS) \
 	$(OPUS_LIBS) \
 	$(FFMPEG_LIBS2) \
 	$(MPCDEC_LIBS) \
@@ -963,12 +961,6 @@ noinst_LIBRARIES += libmodplug_decoder_plugin.a
 DECODER_LIBS += libmodplug_decoder_plugin.a $(MODPLUG_LIBS)
 endif
 
-if HAVE_MP4V2
-libdecoder_a_SOURCES += \
-	src/decoder/plugins/Mp4v2DecoderPlugin.cxx \
-	src/decoder/plugins/Mp4v2DecoderPlugin.hxx
-endif
-
 if ENABLE_SIDPLAY
 libdecoder_a_SOURCES += \
 	src/decoder/plugins/SidplayDecoderPlugin.cxx \
@@ -1112,6 +1104,7 @@ endif
 #
 
 libinput_a_SOURCES = \
+	src/input/Domain.cxx src/input/Domain.hxx \
 	src/input/Init.cxx src/input/Init.hxx \
 	src/input/Registry.cxx src/input/Registry.hxx \
 	src/input/Open.cxx \
@@ -2186,4 +2179,11 @@ EXTRA_DIST = $(doc_DATA) autogen.sh \
 	$(wildcard scripts/*.sh) \
 	$(man_MANS) $(DOCBOOK_FILES) doc/mpdconf.example doc/doxygen.conf \
 	systemd/mpd.socket \
+	android/AndroidManifest.xml \
+	android/build.py \
+	android/custom_rules.xml \
+	android/res/values/strings.xml \
+	android/src/Bridge.java \
+	android/src/Loader.java \
+	android/src/Main.java \
 	src/win32/mpd_win32_rc.rc.in src/win32/mpd.ico

NEWS

@@ -1,3 +1,38 @@
+ver 0.19.5 (2014/11/26)
+* input
+  - nfs: fix crash on connection failure
+* archive
+  - zzip: fix crash after seeking
+* decoder
+  - dsdiff, dsf, opus: fix deadlock while seeking
+  - mp4v2: remove because of incompatible license
+
+ver 0.19.4 (2014/11/18)
+* protocol
+  - workaround for buggy clients that send "add /"
+* decoder
+  - ffmpeg: support opus
+  - opus: add MIME types audio/ogg and application/ogg
+* fix crash on failed filename charset conversion
+* fix local socket detection from uid=0 (root)
+
+ver 0.19.3 (2014/11/11)
+* protocol
+  - fix "(null)" result string to "list" when AlbumArtist is disabled
+* database
+  - upnp: fix breakage due to malformed URIs
+* input
+  - curl: another fix for redirected streams
+* decoder
+  - audiofile: fix crash while playing streams
+  - audiofile: fix bit rate calculation
+  - ffmpeg: support opus
+  - opus: fix bogus duration on streams
+  - opus: support chained streams
+  - opus: improved error logging
+* fix distorted audio with soxr resampler
+* fix build failure on Mac OS X with non-Apple compilers
+
 ver 0.19.2 (2014/11/02)
 * input
   - curl: fix redirected streams
@@ -103,6 +138,16 @@ ver 0.19 (2014/10/10)
 * install systemd unit for socket activation
 * Android port
 
+ver 0.18.19 (2014/11/26)
+* archive
+  - zzip: fix crash after seeking
+
+ver 0.18.18 (2014/11/18)
+* decoder
+  - ffmpeg: support opus
+* fix crash on failed filename charset conversion
+* fix local socket detection from uid=0 (root)
+
 ver 0.18.17 (2014/11/02)
 * playlist
   - don't allow empty playlist name

android/AndroidManifest.xml

@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="org.musicpd"
           android:installLocation="auto"
-          android:versionCode="7"
+          android:versionCode="9"
-          android:versionName="0.19.1">
+          android:versionName="0.19.5">
 
   <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="17"/>
 

android/build.py

@@ -40,8 +40,8 @@ build_arch = 'linux-x86_64'
 os.environ['PKG_CONFIG_LIBDIR'] = os.path.join(root_path, 'lib/pkgconfig')
 
 # select the NDK compiler
-gcc_version = '4.8'
+gcc_version = '4.9'
-llvm_version = '3.3'
+llvm_version = '3.5'
 
 # select the NDK target
 ndk_arch = 'arm'

configure.ac

@@ -1,10 +1,10 @@
 AC_PREREQ(2.60)
 
-AC_INIT(mpd, 0.19.2, musicpd-dev-team@lists.sourceforge.net)
+AC_INIT(mpd, 0.19.5, musicpd-dev-team@lists.sourceforge.net)
 
 VERSION_MAJOR=0
 VERSION_MINOR=19
-VERSION_REVISION=2
+VERSION_REVISION=5
 VERSION_EXTRA=0
 
 AC_CONFIG_SRCDIR([src/Main.cxx])
@@ -496,11 +496,6 @@ AC_ARG_ENABLE(modplug,
 		[enable modplug decoder plugin]),,
 	enable_modplug=auto)
 
-AC_ARG_ENABLE(mp4v2,
-	AS_HELP_STRING([--enable-mp4v2],
-		[enable libmp4v2 decoder plugin]),,
-	enable_mp4v2=auto)
-
 AC_ARG_ENABLE(mpc,
 	AS_HELP_STRING([--enable-mpc],
 		[disable musepack (MPC) support (default: auto)]),,
@@ -1264,24 +1259,6 @@ if test x$enable_modplug = xyes; then
 fi
 AM_CONDITIONAL(HAVE_MODPLUG, test x$enable_modplug = xyes)
 
-dnl -------------------------------- libmp4v2 ---------------------------------
-if test x$enable_aac = xyes; then
-        MPD_AUTO_LIB(mp4v2, MP4V2, mp4v2, MP4Create, [-lmp4v2], [],
-	                    [mp4v2], [libmp4v2 not found])
-
-        if test x$enable_mp4v2 = xyes; then
-	        AC_DEFINE(HAVE_MP4V2, 1, [Define to use libmp4v2 for MP4 decoding])
-        fi
-else
-     if test x$enable_mp4v2 = xyes; then
-        AC_MSG_ERROR([MP4V2 requires AAC!])
-     fi
-
-     enable_mp4v2=no
-fi
-
-AM_CONDITIONAL(HAVE_MP4V2, test x$enable_mp4v2 = xyes)
-
 dnl -------------------------------- libopus ----------------------------------
 MPD_AUTO_PKG(opus, OPUS, [opus ogg],
 	[opus decoder plugin], [libopus not found])
@@ -1868,7 +1845,6 @@ printf '\n\t'
 results(sndfile, [libsndfile])
 results(mikmod, [MikMod])
 results(modplug, [MODPLUG])
-results(mp4v2, [MP4V2])
 results(mad, [MAD])
 results(mpg123, [MPG123])
 results(mpc, [Musepack])

doc/protocol.xml

@@ -1533,6 +1533,7 @@ OK
               <command>count</command>
               <arg choice="req"><replaceable>TAG</replaceable></arg>
               <arg choice="req"><replaceable>NEEDLE</replaceable></arg>
+              <arg choice="opt"><replaceable>...</replaceable></arg>
               <arg choice="opt">group</arg>
               <arg choice="opt"><replaceable>GROUPTYPE</replaceable></arg>
             </cmdsynopsis>

src/Main.cxx

@@ -114,7 +114,7 @@
 #include <ws2tcpip.h>
 #endif
 
-#ifdef __APPLE__
+#ifdef __BLOCKS__
 #include <dispatch/dispatch.h>
 #endif
 
@@ -517,7 +517,7 @@ int mpd_main(int argc, char *argv[])
 	daemonize_begin(options.daemon);
 #endif
 
-#ifdef __APPLE__
+#ifdef __BLOCKS__
 	/* Runs the OS X native event loop in the main thread, and runs
 	   the rest of mpd_main on a new thread. This lets CoreAudio receive
 	   route change notifications (e.g. plugging or unplugging headphones).

src/archive/plugins/ZzipArchivePlugin.cxx

@@ -168,12 +168,13 @@ bool
 ZzipInputStream::Seek(offset_type new_offset, Error &error)
 {
 	zzip_off_t ofs = zzip_seek(file, new_offset, SEEK_SET);
-	if (ofs != -1) {
+	if (ofs < 0) {
 		error.Set(zzip_domain, "zzip_seek() has failed");
+		return false;
+	}
+
 	offset = ofs;
 	return true;
-	}
-	return false;
 }
 
 /* exported structures */

src/client/Client.hxx

@@ -127,7 +127,7 @@ public:
 	 * a local (UNIX domain) socket?
 	 */
 	bool IsLocal() const {
-		return uid > 0;
+		return uid >= 0;
 	}
 
 	unsigned GetPermission() const {

src/client/ClientFile.cxx

@@ -41,7 +41,7 @@ Client::AllowFile(Path path_fs, Error &error) const
 		   instance */
 		return true;
 
-	if (uid <= 0) {
+	if (uid < 0) {
 		/* unauthenticated client */
 		error.Set(ack_domain, ACK_ERROR_PERMISSION, "Access denied");
 		return false;

src/command/QueueCommands.cxx

@@ -61,7 +61,16 @@ translate_uri(Client &client, const char *uri)
 CommandResult
 handle_add(Client &client, gcc_unused unsigned argc, char *argv[])
 {
-	const char *const uri = translate_uri(client, argv[1]);
+	const char *uri = argv[1];
+	if (memcmp(uri, "/", 2) == 0)
+		/* this URI is malformed, but some clients are buggy
+		   and use "add /" to add the whole database, which
+		   was never intended to work, but once did; in order
+		   to retain backwards compatibility, work around this
+		   here */
+		uri = "";
+
+	uri = translate_uri(client, uri);
 	if (uri == nullptr)
 		return CommandResult::ERROR;
 

src/db/Count.cxx

@@ -23,7 +23,7 @@
 #include "Interface.hxx"
 #include "client/Client.hxx"
 #include "LightSong.hxx"
-#include "tag/Set.hxx"
+#include "tag/Tag.hxx"
 
 #include <functional>
 #include <map>

src/db/plugins/upnp/Directory.cxx

@@ -129,6 +129,7 @@ public:
 		 state(NONE),
 		 tag_type(TAG_NUM_OF_ITEM_TYPES)
 	{
+		m_tobj.clear();
 	}
 
 protected:

src/decoder/DecoderList.cxx

@@ -37,7 +37,6 @@
 #include "plugins/MadDecoderPlugin.hxx"
 #include "plugins/SndfileDecoderPlugin.hxx"
 #include "plugins/Mpg123DecoderPlugin.hxx"
-#include "plugins/Mp4v2DecoderPlugin.hxx"
 #include "plugins/WildmidiDecoderPlugin.hxx"
 #include "plugins/MikmodDecoderPlugin.hxx"
 #include "plugins/ModplugDecoderPlugin.hxx"
@@ -55,9 +54,6 @@ const struct DecoderPlugin *const decoder_plugins[] = {
 #ifdef HAVE_MPG123
 	&mpg123_decoder_plugin,
 #endif
-#ifdef HAVE_MP4V2
-	&mp4v2_decoder_plugin,
-#endif
 #ifdef ENABLE_VORBIS_DECODER
 	&vorbis_decoder_plugin,
 #endif

src/decoder/plugins/AudiofileDecoderPlugin.cxx

@@ -209,7 +209,7 @@ audiofile_stream_decode(Decoder &decoder, InputStream &is)
 	const auto total_time = audiofile_get_duration(fh);
 
 	const uint16_t kbit_rate = (uint16_t)
-		(is.GetSize() * uint64_t(8000) / total_time.ToMS());
+		(is.GetSize() * uint64_t(8) / total_time.ToMS());
 
 	const unsigned frame_size = (unsigned)
 		afGetVirtualFrameSize(fh, AF_DEFAULT_TRACK, true);

src/decoder/plugins/DsdLib.cxx

@@ -53,7 +53,7 @@ dsdlib_skip_to(Decoder *decoder, InputStream &is,
 	       offset_type offset)
 {
 	if (is.IsSeekable())
-		return is.Seek(offset, IgnoreError());
+		return is.LockSeek(offset, IgnoreError());
 
 	if (is.GetOffset() > offset)
 		return false;
@@ -72,7 +72,7 @@ dsdlib_skip(Decoder *decoder, InputStream &is,
 		return true;
 
 	if (is.IsSeekable())
-		return is.Seek(is.GetOffset() + delta, IgnoreError());
+		return is.LockSeek(is.GetOffset() + delta, IgnoreError());
 
 	if (delta > 1024 * 1024)
 		/* don't skip more than one megabyte; it would be too

src/decoder/plugins/FfmpegDecoderPlugin.cxx

@@ -657,7 +657,7 @@ static const char *const ffmpeg_suffixes[] = {
 	"mj2", "mjpeg", "mjpg", "mka", "mkv", "mlp", "mm", "mmf", "mov", "mp+",
 	"mp1", "mp2", "mp3", "mp4", "mpc", "mpeg", "mpg", "mpga", "mpp", "mpu",
 	"mve", "mvi", "mxf", "nc", "nsv", "nut", "nuv", "oga", "ogm", "ogv",
-	"ogx", "oma", "ogg", "omg", "psp", "pva", "qcp", "qt", "r3d", "ra",
+	"ogx", "oma", "ogg", "omg", "opus", "psp", "pva", "qcp", "qt", "r3d", "ra",
 	"ram", "rl2", "rm", "rmvb", "roq", "rpl", "rvc", "shn", "smk", "snd",
 	"sol", "son", "spx", "str", "swf", "tgi", "tgq", "tgv", "thp", "ts",
 	"tsp", "tta", "xa", "xvid", "uv", "uv2", "vb", "vid", "vob", "voc",
@@ -691,6 +691,7 @@ static const char *const ffmpeg_mime_types[] = {
 	"audio/mpeg",
 	"audio/musepack",
 	"audio/ogg",
+	"audio/opus",
 	"audio/qcelp",
 	"audio/vorbis",
 	"audio/vorbis+ogg",

src/decoder/plugins/Mp4v2DecoderPlugin.cxx

@@ -1,330 +0,0 @@
-/*
- * 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
- * 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 "config.h" /* must be first for large file support */
-#include "Mp4v2DecoderPlugin.hxx"
-#include "../DecoderAPI.hxx"
-#include "CheckAudioFormat.hxx"
-#include "tag/TagHandler.hxx"
-#include "fs/Path.hxx"
-#include "util/Error.hxx"
-#include "util/Domain.hxx"
-#include "Log.hxx"
-
-#include <mp4v2/mp4v2.h>
-#include <neaacdec.h>
-
-#include <cstdio>
-#include <cstdlib>
-
-static constexpr Domain mp4v2_decoder_domain("mp4v2");
-
-static MP4TrackId
-mp4_get_aac_track(MP4FileHandle handle, NeAACDecHandle decoder,
-		  AudioFormat &audio_format, Error &error)
-{
-	unsigned long sample_rate;
-
-	const MP4TrackId tracks = MP4GetNumberOfTracks(handle);
-
-	for (MP4TrackId id = 1; id <= tracks; id++) {
-		const char* track_type = MP4GetTrackType(handle, id);
-
-		if (track_type == 0)
-			continue;
-
-		const auto obj_type = MP4GetTrackEsdsObjectTypeId(handle, id);
-
-		if (obj_type == MP4_INVALID_AUDIO_TYPE)
-			continue;
-		if (obj_type == MP4_MPEG4_AUDIO_TYPE) {
-			const auto mpeg_type = MP4GetTrackAudioMpeg4Type(handle, id);
-			if (!MP4_IS_MPEG4_AAC_AUDIO_TYPE(mpeg_type))
-				continue;
-		} else if (!MP4_IS_AAC_AUDIO_TYPE(obj_type))
-			continue;
-
-		if (decoder == nullptr)
-			/* found audio track, no decoder */
-			return id;
-
-		unsigned char *buff = nullptr;
-		unsigned buff_size = 0;
-
-		if (!MP4GetTrackESConfiguration(handle, id, &buff, &buff_size))
-			continue;
-
-		uint8_t channels;
-		int32_t nbytes = NeAACDecInit(decoder, buff, buff_size,
-					      &sample_rate, &channels);
-
-		free(buff);
-
-		if (nbytes < 0)
-			/* invalid stream */
-			continue;
-
-		if (!audio_format_init_checked(audio_format, sample_rate,
-					       SampleFormat::S16,
-					       channels,
-					       error))
-			continue;
-
-		return id;
-	}
-
-	error.Set(mp4v2_decoder_domain, "no valid aac track found");
-
-	return MP4_INVALID_TRACK_ID;
-}
-
-static NeAACDecHandle
-mp4_faad_new(MP4FileHandle handle, AudioFormat &audio_format, Error &error)
-{
-	const NeAACDecHandle decoder = NeAACDecOpen();
-	const NeAACDecConfigurationPtr config =
-		NeAACDecGetCurrentConfiguration(decoder);
-	config->outputFormat = FAAD_FMT_16BIT;
-	config->downMatrix = 1;
-	config->dontUpSampleImplicitSBR = 0;
-	NeAACDecSetConfiguration(decoder, config);
-
-	const auto track = mp4_get_aac_track(handle, decoder, audio_format, error);
-
-	if (track == MP4_INVALID_TRACK_ID) {
-		NeAACDecClose(decoder);
-		return nullptr;
-	}
-
-	return decoder;
-}
-
-static void
-mp4_file_decode(Decoder &mpd_decoder, Path path_fs)
-{
-	const MP4FileHandle handle = MP4Read(path_fs.c_str());
-
-	if (handle == MP4_INVALID_FILE_HANDLE) {
-		FormatError(mp4v2_decoder_domain,
-			  "unable to open file");
-		return;
-	}
-
-	AudioFormat audio_format;
-	Error error;
-	const NeAACDecHandle decoder = mp4_faad_new(handle, audio_format, error);
-
-	if (decoder == nullptr) {
-		LogError(error);
-		MP4Close(handle);
-		return;
-	}
-
-	const MP4TrackId track = mp4_get_aac_track(handle, nullptr, audio_format, error);
-
-	/* initialize the MPD core */
-
-	const MP4Timestamp scale = MP4GetTrackTimeScale(handle, track);
-	const SongTime duration = SongTime::FromScale<uint64_t>(MP4GetTrackDuration(handle, track),
-								scale);
-	const MP4SampleId num_samples = MP4GetTrackNumberOfSamples(handle, track);
-
-	decoder_initialized(mpd_decoder, audio_format, true, duration);
-
-	/* the decoder loop */
-
-	DecoderCommand cmd = DecoderCommand::NONE;
-
-	for (MP4SampleId sample = 1;
-	     sample < num_samples && cmd != DecoderCommand::STOP;
-	     sample++) {
-		unsigned char *data = nullptr;
-		unsigned int data_length = 0;
-
-		if (cmd == DecoderCommand::SEEK) {
-			const MP4Timestamp offset =
-				decoder_seek_time(mpd_decoder).ToScale(scale);
-
-			sample = MP4GetSampleIdFromTime(handle, track, offset,
-							false);
-			decoder_command_finished(mpd_decoder);
-		}
-
-		/* read */
-		if (MP4ReadSample(handle, track, sample, &data, &data_length) == 0) {
-			FormatError(mp4v2_decoder_domain, "unable to read sample");
-			break;
-		}
-
-		/* decode it */
-		NeAACDecFrameInfo frame_info;
-		const void *const decoded = NeAACDecDecode(decoder, &frame_info, data, data_length);
-
-		if (frame_info.error > 0) {
-			FormatWarning(mp4v2_decoder_domain,
-				      "error decoding AAC stream: %s",
-				      NeAACDecGetErrorMessage(frame_info.error));
-			break;
-		}
-
-		if (frame_info.channels != audio_format.channels) {
-			FormatDefault(mp4v2_decoder_domain,
-				      "channel count changed from %u to %u",
-				      audio_format.channels, frame_info.channels);
-			break;
-		}
-
-		if (frame_info.samplerate != audio_format.sample_rate) {
-			FormatDefault(mp4v2_decoder_domain,
-				      "sample rate changed from %u to %lu",
-				      audio_format.sample_rate,
-				      (unsigned long)frame_info.samplerate);
-			break;
-		}
-
-		/* update bit rate and position */
-		unsigned bit_rate = 0;
-
-		if (frame_info.samples > 0) {
-			bit_rate = frame_info.bytesconsumed * 8.0 *
-			    frame_info.channels * audio_format.sample_rate /
-			    frame_info.samples / 1000 + 0.5;
-		}
-
-		/* send PCM samples to MPD */
-
-		cmd = decoder_data(mpd_decoder, nullptr, decoded,
-				   (size_t)frame_info.samples * 2,
-				   bit_rate);
-
-		free(data);
-	}
-
-	/* cleanup */
-	NeAACDecClose(decoder);
-	MP4Close(handle);
-}
-
-static inline void
-mp4_safe_invoke_tag(const struct tag_handler *handler, void *handler_ctx,
-		    TagType tag, const char *value)
-{
-	if (value != nullptr)
-		tag_handler_invoke_tag(handler, handler_ctx, tag, value);
-}
-
-static bool
-mp4_scan_file(Path path_fs,
-		 const struct tag_handler *handler, void *handler_ctx)
-{
-	const MP4FileHandle handle = MP4Read(path_fs.c_str());
-
-	if (handle == MP4_INVALID_FILE_HANDLE)
-		return false;
-
-	AudioFormat tmp_audio_format;
-	Error error;
-	const MP4TrackId id = mp4_get_aac_track(handle, nullptr, tmp_audio_format, error);
-
-	if (id == MP4_INVALID_TRACK_ID) {
-		LogError(error);
-		MP4Close(handle);
-		return false;
-	}
-
-	const MP4Timestamp scale = MP4GetTrackTimeScale(handle, id);
-	const SongTime dur =
-		SongTime::FromScale<uint64_t>(MP4GetTrackDuration(handle, id),
-					      scale);
-	tag_handler_invoke_duration(handler, handler_ctx, dur);
-
-	const MP4Tags* tags = MP4TagsAlloc();
-	MP4TagsFetch(tags, handle);
-
-	static constexpr struct {
-		const char *MP4Tags::*p;
-		TagType tag_type;
-	} mp4v2_tags[] = {
-		{ &MP4Tags::name, TAG_NAME },
-		{ &MP4Tags::artist, TAG_ARTIST },
-		{ &MP4Tags::albumArtist, TAG_ALBUM_ARTIST },
-		{ &MP4Tags::album, TAG_ALBUM },
-		{ &MP4Tags::composer, TAG_COMPOSER },
-		{ &MP4Tags::comments, TAG_COMMENT },
-		{ &MP4Tags::genre, TAG_GENRE },
-		{ &MP4Tags::releaseDate, TAG_DATE },
-		{ &MP4Tags::sortArtist, TAG_ARTIST_SORT },
-		{ &MP4Tags::sortAlbumArtist, TAG_ALBUM_ARTIST_SORT },
-	};
-
-	for (const auto &i : mp4v2_tags)
-		mp4_safe_invoke_tag(handler, handler_ctx,
-				    i.tag_type, tags->*i.p);
-
-	char buff[8]; /* tmp buffer for index to string. */
-	if (tags->track != nullptr) {
-		sprintf(buff, "%d", tags->track->index);
-		tag_handler_invoke_tag(handler, handler_ctx, TAG_TRACK, buff);
-	}
-
-	if (tags->disk != nullptr) {
-		sprintf(buff, "%d", tags->disk->index);
-		tag_handler_invoke_tag(handler, handler_ctx, TAG_DISC, buff);
-	}
-
-	MP4TagsFree(tags);
-	MP4Close(handle);
-
-	return true;
-}
-
-static const char *const mp4_suffixes[] = {
-	"mp4",
-	"m4a",
-	/* "m4p", encrypted */
-	/* "m4b", audio book */
-	/* "m4r", ring tones */
-	/* "m4v", video */
-	nullptr
-};
-
-static const char *const mp4_mime_types[] = {
-	"application/mp4",
-	"application/m4a",
-	"audio/mp4",
-	"audio/m4a",
-	/* "audio/m4p", */
-	/* "audio/m4b", */
-	/* "audio/m4r", */
-	/* "audio/m4v", */
-	nullptr
-};
-
-const struct DecoderPlugin mp4v2_decoder_plugin = {
-	"mp4v2",
-	nullptr,
-	nullptr,
-	nullptr,
-	mp4_file_decode,
-	mp4_scan_file,
-	nullptr,
-	nullptr,
-	mp4_suffixes,
-	mp4_mime_types
-};

src/decoder/plugins/OpusDecoderPlugin.cxx

@@ -40,6 +40,12 @@
 
 static constexpr opus_int32 opus_sample_rate = 48000;
 
+/**
+ * Allocate an output buffer for 16 bit PCM samples big enough to hold
+ * a quarter second, larger than 120ms required by libopus.
+ */
+static constexpr unsigned opus_output_buffer_frames = opus_sample_rate / 4;
+
 gcc_pure
 static bool
 IsOpusHead(const ogg_packet &packet)
@@ -70,10 +76,16 @@ class MPDOpusDecoder {
 
 	OpusDecoder *opus_decoder;
 	opus_int16 *output_buffer;
-	unsigned output_size;
+
+	/**
+	 * If non-zero, then a previous Opus stream has been found
+	 * already with this number of channels.  If opus_decoder is
+	 * nullptr, then its end-of-stream packet has been found
+	 * already.
+	 */
+	unsigned previous_channels;
 
 	bool os_initialized;
-	bool found_opus;
 
 	int opus_serialno;
 
@@ -86,8 +98,9 @@ public:
 		       InputStream &_input_stream)
 		:decoder(_decoder), input_stream(_input_stream),
 		 opus_decoder(nullptr),
-		 output_buffer(nullptr), output_size(0),
+		 output_buffer(nullptr),
-		 os_initialized(false), found_opus(false) {}
+		 previous_channels(0),
+		 os_initialized(false) {}
 	~MPDOpusDecoder();
 
 	bool ReadFirstPage(OggSyncState &oy);
@@ -96,6 +109,7 @@ public:
 	DecoderCommand HandlePackets();
 	DecoderCommand HandlePacket(const ogg_packet &packet);
 	DecoderCommand HandleBOS(const ogg_packet &packet);
+	DecoderCommand HandleEOS();
 	DecoderCommand HandleTags(const ogg_packet &packet);
 	DecoderCommand HandleAudio(const ogg_packet &packet);
 
@@ -159,12 +173,14 @@ inline DecoderCommand
 MPDOpusDecoder::HandlePacket(const ogg_packet &packet)
 {
 	if (packet.e_o_s)
-		return DecoderCommand::STOP;
+		return HandleEOS();
 
 	if (packet.b_o_s)
 		return HandleBOS(packet);
-	else if (!found_opus)
+	else if (opus_decoder == nullptr) {
+		LogDebug(opus_domain, "BOS packet expected");
 		return DecoderCommand::STOP;
+	}
 
 	if (IsOpusTags(packet))
 		return HandleTags(packet);
@@ -184,7 +200,7 @@ LoadEOSPacket(InputStream &is, Decoder *decoder, int serialno,
 		/* we do this for local files only, because seeking
 		   around remote files is expensive and not worth the
 		   troubl */
-		return -1;
+		return false;
 
 	const auto old_offset = is.GetOffset();
 
@@ -198,7 +214,7 @@ LoadEOSPacket(InputStream &is, Decoder *decoder, int serialno,
 	ogg_stream_clear(&os);
 
 	/* restore the previous file position */
-	is.Seek(old_offset, IgnoreError());
+	is.LockSeek(old_offset, IgnoreError());
 
 	return result;
 }
@@ -225,19 +241,29 @@ MPDOpusDecoder::HandleBOS(const ogg_packet &packet)
 {
 	assert(packet.b_o_s);
 
-	if (found_opus || !IsOpusHead(packet))
+	if (opus_decoder != nullptr || !IsOpusHead(packet)) {
+		LogDebug(opus_domain, "BOS packet must be OpusHead");
 		return DecoderCommand::STOP;
+	}
 
 	unsigned channels;
 	if (!ScanOpusHeader(packet.packet, packet.bytes, channels) ||
-	    !audio_valid_channel_count(channels))
+	    !audio_valid_channel_count(channels)) {
+		LogDebug(opus_domain, "Malformed BOS packet");
 		return DecoderCommand::STOP;
+	}
 
 	assert(opus_decoder == nullptr);
-	assert(output_buffer == nullptr);
+	assert((previous_channels == 0) == (output_buffer == nullptr));
+
+	if (previous_channels != 0 && channels != previous_channels) {
+		FormatWarning(opus_domain,
+			      "Next stream has different channels (%u -> %u)",
+			      previous_channels, channels);
+		return DecoderCommand::STOP;
+	}
 
 	opus_serialno = os.serialno;
-	found_opus = true;
 
 	/* TODO: parse attributes from the OpusHead (sample rate,
 	   channels, ...) */
@@ -251,6 +277,13 @@ MPDOpusDecoder::HandleBOS(const ogg_packet &packet)
 		return DecoderCommand::STOP;
 	}
 
+	if (previous_channels != 0) {
+		/* decoder was already initialized by the previous
+		   stream; skip the rest of this method */
+		LogDebug(opus_domain, "Found another stream");
+		return decoder_get_command(decoder);
+	}
+
 	eos_granulepos = LoadEOSGranulePos(input_stream, &decoder,
 					   opus_serialno);
 	const auto duration = eos_granulepos >= 0
@@ -258,21 +291,36 @@ MPDOpusDecoder::HandleBOS(const ogg_packet &packet)
 						      opus_sample_rate)
 		: SignedSongTime::Negative();
 
+	previous_channels = channels;
 	const AudioFormat audio_format(opus_sample_rate,
 				       SampleFormat::S16, channels);
 	decoder_initialized(decoder, audio_format,
 			    eos_granulepos > 0, duration);
 	frame_size = audio_format.GetFrameSize();
 
-	/* allocate an output buffer for 16 bit PCM samples big enough
+	output_buffer = new opus_int16[opus_output_buffer_frames
-	   to hold a quarter second, larger than 120ms required by
+				       * audio_format.channels];
-	   libopus */
-	output_size = audio_format.sample_rate / 4;
-	output_buffer = new opus_int16[output_size * audio_format.channels];
 
 	return decoder_get_command(decoder);
 }
 
+inline DecoderCommand
+MPDOpusDecoder::HandleEOS()
+{
+	if (eos_granulepos < 0 && previous_channels != 0) {
+		/* allow chaining of (unseekable) streams */
+		assert(opus_decoder != nullptr);
+		assert(output_buffer != nullptr);
+
+		opus_decoder_destroy(opus_decoder);
+		opus_decoder = nullptr;
+
+		return decoder_get_command(decoder);
+	}
+
+	return DecoderCommand::STOP;
+}
+
 inline DecoderCommand
 MPDOpusDecoder::HandleTags(const ogg_packet &packet)
 {
@@ -304,10 +352,11 @@ MPDOpusDecoder::HandleAudio(const ogg_packet &packet)
 	int nframes = opus_decode(opus_decoder,
 				  (const unsigned char*)packet.packet,
 				  packet.bytes,
-				  output_buffer, output_size,
+				  output_buffer, opus_output_buffer_frames,
 				  0);
 	if (nframes < 0) {
-		LogError(opus_domain, opus_strerror(nframes));
+		FormatError(opus_domain, "libopus error: %s",
+			    opus_strerror(nframes));
 		return DecoderCommand::STOP;
 	}
 
@@ -461,6 +510,13 @@ static const char *const opus_suffixes[] = {
 };
 
 static const char *const opus_mime_types[] = {
+	/* the official MIME type (RFC 5334) */
+	"audio/ogg",
+
+	/* deprecated (RFC 5334) */
+	"application/ogg",
+
+	/* deprecated; from an early draft */
 	"audio/opus",
 	nullptr
 };

src/event/DeferredMonitor.hxx

@@ -21,9 +21,6 @@
 #define MPD_SOCKET_DEFERRED_MONITOR_HXX
 
 #include "check.h"
-#include "Compiler.h"
-
-#include <atomic>
 
 class EventLoop;
 

src/event/ServerSocket.cxx

@@ -130,7 +130,7 @@ get_remote_uid(int fd)
 	socklen_t len = sizeof (cred);
 
 	if (getsockopt(fd, SOL_SOCKET, SO_PEERCRED, &cred, &len) < 0)
-		return 0;
+		return -1;
 
 	return cred.uid;
 #else

src/fs/AllocatedPath.cxx

@@ -46,7 +46,11 @@ AllocatedPath
 AllocatedPath::FromUTF8(const char *path_utf8)
 {
 #ifdef HAVE_GLIB
-	return AllocatedPath(Donate(), ::PathFromUTF8(path_utf8));
+	char *path = ::PathFromUTF8(path_utf8);
+	if (path == nullptr)
+		return AllocatedPath::Null();
+
+	return AllocatedPath(Donate(), path);
 #else
 	return FromFS(path_utf8);
 #endif

src/input/AsyncInputStream.cxx

@@ -19,6 +19,7 @@
 
 #include "config.h"
 #include "AsyncInputStream.hxx"
+#include "Domain.hxx"
 #include "tag/Tag.hxx"
 #include "event/Call.hxx"
 #include "thread/Cond.hxx"
@@ -113,8 +114,10 @@ AsyncInputStream::Seek(offset_type new_offset, Error &error)
 		/* no-op */
 		return true;
 
-	if (!IsSeekable())
+	if (!IsSeekable()) {
+		error.Set(input_domain, "Not seekable");
 		return false;
+	}
 
 	/* check if we can fast-forward the buffer */
 

src/input/Domain.cxx

@@ -0,0 +1,24 @@
+/*
+ * 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
+ * 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 "config.h"
+#include "Domain.hxx"
+#include "util/Domain.hxx"
+
+const Domain input_domain("input");

src/input/Domain.hxx

@@ -17,9 +17,11 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef MPD_DECODER_MP4V2_HXX
+#ifndef MPD_INPUT_DOMAIN_HXX
-#define MPD_DECODER_MP4V2_HXX
+#define MPD_INPUT_DOMAIN_HXX
 
-extern const struct DecoderPlugin mp4v2_decoder_plugin;
+class Domain;
+
+extern const Domain input_domain;
 
 #endif

src/input/Open.cxx

@@ -22,14 +22,13 @@
 #include "Registry.hxx"
 #include "InputPlugin.hxx"
 #include "LocalOpen.hxx"
+#include "Domain.hxx"
 #include "plugins/RewindInputPlugin.hxx"
 #include "fs/Traits.hxx"
 #include "fs/Path.hxx"
 #include "util/Error.hxx"
 #include "util/Domain.hxx"
 
-static constexpr Domain input_domain("input");
-
 InputStream *
 InputStream::Open(const char *url,
 		  Mutex &mutex, Cond &cond,

src/input/plugins/AlsaInputPlugin.cxx

@@ -43,6 +43,8 @@
 
 #include <alsa/asoundlib.h>
 
+#include <atomic>
+
 #include <assert.h>
 #include <string.h>
 

src/input/plugins/CurlInputPlugin.cxx

@@ -610,6 +610,10 @@ CurlInputStream::ResponseBoundary()
 	/* undo all effects of HeaderReceived() because the previous
 	   response was not applicable for this stream */
 
+	if (IsSeekPending())
+		/* don't update metadata while seeking */
+		return;
+
 	seekable = false;
 	size = UNKNOWN_SIZE;
 	ClearMimeType();

src/java/File.hxx

@@ -28,7 +28,7 @@
  */
 
 #ifndef JAVA_FILE_HXX
-#define JAVA_FILE_HPP
+#define JAVA_FILE_HXX
 
 #include "Object.hxx"
 

src/lib/nfs/Connection.cxx

@@ -327,6 +327,10 @@ NfsConnection::DestroyContext()
 	assert(GetEventLoop().IsInside());
 	assert(context != nullptr);
 
+	/* cancel pending DeferredMonitor that was scheduled to notify
+	   new leases */
+	DeferredMonitor::Cancel();
+
 	if (SocketMonitor::IsDefined())
 		SocketMonitor::Cancel();
 
@@ -405,10 +409,10 @@ NfsConnection::OnSocketReady(unsigned flags)
 		error.Format(nfs_domain, "NFS connection has failed: %s",
 			     nfs_get_error(context));
 
+		BroadcastError(std::move(error));
+
 		DestroyContext();
 		closed = true;
-
-		BroadcastError(std::move(error));
 	} else if (SocketMonitor::IsDefined() && nfs_get_fd(context) < 0) {
 		/* this happens when rpc_reconnect_requeue() is called
 		   after the connection broke, but autoreconnet was
@@ -421,10 +425,10 @@ NfsConnection::OnSocketReady(unsigned flags)
 			error.Format(nfs_domain,
 				     "NFS socket disappeared: %s", msg);
 
+		BroadcastError(std::move(error));
+
 		DestroyContext();
 		closed = true;
-
-		BroadcastError(std::move(error));
 	}
 
 	assert(in_event);

src/lib/nfs/FileReader.cxx

@@ -56,8 +56,18 @@ NfsFileReader::Close()
 		return;
 	}
 
+	/* this cancels State::MOUNT */
 	connection->RemoveLease(*this);
 
+	CancelOrClose();
+}
+
+void
+NfsFileReader::CancelOrClose()
+{
+	assert(state != State::INITIAL &&
+	       state != State::DEFER);
+
 	if (state == State::IDLE)
 		/* no async operation in progress: can close
 		   immediately */
@@ -164,6 +174,8 @@ NfsFileReader::OnNfsConnectionFailed(const Error &error)
 {
 	assert(state == State::MOUNT);
 
+	state = State::INITIAL;
+
 	Error copy;
 	copy.Set(error);
 	OnNfsFileError(std::move(copy));
@@ -174,7 +186,7 @@ NfsFileReader::OnNfsConnectionDisconnected(const Error &error)
 {
 	assert(state > State::MOUNT);
 
-	state = State::INITIAL;
+	CancelOrClose();
 
 	Error copy;
 	copy.Set(error);
@@ -246,6 +258,30 @@ NfsFileReader::OnNfsCallback(unsigned status, void *data)
 void
 NfsFileReader::OnNfsError(Error &&error)
 {
+	switch (state) {
+	case State::INITIAL:
+	case State::DEFER:
+	case State::MOUNT:
+	case State::IDLE:
+		assert(false);
+		gcc_unreachable();
+
+	case State::OPEN:
+		connection->RemoveLease(*this);
+		state = State::INITIAL;
+		break;
+
+	case State::STAT:
+		connection->RemoveLease(*this);
+		connection->Close(fh);
+		state = State::INITIAL;
+		break;
+
+	case State::READ:
+		state = State::IDLE;
+		break;
+	}
+
 	OnNfsFileError(std::move(error));
 }
 

src/lib/nfs/FileReader.hxx

@@ -24,6 +24,7 @@
 #include "Lease.hxx"
 #include "Callback.hxx"
 #include "event/DeferredMonitor.hxx"
+#include "Compiler.h"
 
 #include <string>
 
@@ -75,6 +76,12 @@ protected:
 	virtual void OnNfsFileError(Error &&error) = 0;
 
 private:
+	/**
+	 * Cancel the current operation, if any.  The NfsLease must be
+	 * unregistered already.
+	 */
+	void CancelOrClose();
+
 	void OpenCallback(nfsfh *_fh);
 	void StatCallback(const struct stat *st);
 

src/lib/nfs/Manager.cxx

@@ -29,8 +29,10 @@ NfsManager::ManagedConnection::OnNfsConnectionError(Error &&error)
 {
 	FormatError(error, "NFS error on %s:%s", GetServer(), GetExportName());
 
-	manager.connections.erase(manager.connections.iterator_to(*this));
+	/* defer deletion so the caller
-	delete this;
+	   (i.e. NfsConnection::OnSocketReady()) can still use this
+	   object */
+	manager.ScheduleDelete(*this);
 }
 
 inline bool
@@ -59,7 +61,9 @@ NfsManager::Compare::operator()(const ManagedConnection &a,
 
 NfsManager::~NfsManager()
 {
-	assert(loop.IsInside());
+	assert(GetEventLoop().IsInside());
+
+	CollectGarbage();
 
 	connections.clear_and_dispose([](ManagedConnection *c){
 			delete c;
@@ -71,13 +75,13 @@ NfsManager::GetConnection(const char *server, const char *export_name)
 {
 	assert(server != nullptr);
 	assert(export_name != nullptr);
-	assert(loop.IsInside());
+	assert(GetEventLoop().IsInside());
 
 	Map::insert_commit_data hint;
 	auto result = connections.insert_check(LookupKey{server, export_name},
 					       Compare(), hint);
 	if (result.second) {
-		auto c = new ManagedConnection(*this, loop,
+		auto c = new ManagedConnection(*this, GetEventLoop(),
 					       server, export_name);
 		connections.insert_commit(*c, hint);
 		return *c;
@@ -85,3 +89,19 @@ NfsManager::GetConnection(const char *server, const char *export_name)
 		return *result.first;
 	}
 }
+
+void
+NfsManager::CollectGarbage()
+{
+	assert(GetEventLoop().IsInside());
+
+	garbage.clear_and_dispose([](ManagedConnection *c){
+			delete c;
+		});
+}
+
+void
+NfsManager::OnIdle()
+{
+	CollectGarbage();
+}

src/lib/nfs/Manager.hxx

@@ -23,14 +23,16 @@
 #include "check.h"
 #include "Connection.hxx"
 #include "Compiler.h"
+#include "event/IdleMonitor.hxx"
 
 #include <boost/intrusive/set.hpp>
+#include <boost/intrusive/slist.hpp>
 
 /**
  * A manager for NFS connections.  Handles multiple connections to
  * multiple NFS servers.
  */
-class NfsManager {
+class NfsManager final : IdleMonitor {
 	struct LookupKey {
 		const char *server;
 		const char *export_name;
@@ -38,6 +40,7 @@ class NfsManager {
 
 	class ManagedConnection final
 		: public NfsConnection,
+		  public boost::intrusive::slist_base_hook<boost::intrusive::link_mode<boost::intrusive::normal_link>>,
 		  public boost::intrusive::set_base_hook<boost::intrusive::link_mode<boost::intrusive::normal_link>> {
 		NfsManager &manager;
 
@@ -63,8 +66,6 @@ class NfsManager {
 				const LookupKey b) const;
 	};
 
-	EventLoop &loop;
-
 	/**
 	 * Maps server and export_name to #ManagedConnection.
 	 */
@@ -74,9 +75,18 @@ class NfsManager {
 
 	Map connections;
 
+	typedef boost::intrusive::slist<ManagedConnection> List;
+
+	/**
+	 * A list of "garbage" connection objects.  Their destruction
+	 * is postponed because they were thrown into the garbage list
+	 * when callers on the stack were still using them.
+	 */
+	List garbage;
+
 public:
 	NfsManager(EventLoop &_loop)
-		:loop(_loop) {}
+		:IdleMonitor(_loop) {}
 
 	/**
 	 * Must be run from EventLoop's thread.
@@ -86,6 +96,21 @@ public:
 	gcc_pure
 	NfsConnection &GetConnection(const char *server,
 				     const char *export_name);
+
+private:
+	void ScheduleDelete(ManagedConnection &c) {
+		connections.erase(connections.iterator_to(c));
+		garbage.push_front(c);
+		IdleMonitor::Schedule();
+	}
+
+	/**
+	 * Delete all connections on the #garbage list.
+	 */
+	void CollectGarbage();
+
+	/* virtual methods from IdleMonitor */
+	void OnIdle() override;
 };
 
 #endif

src/lib/upnp/ContentDirectoryService.cxx

@@ -29,7 +29,7 @@
 
 ContentDirectoryService::ContentDirectoryService(const UPnPDevice &device,
 						 const UPnPService &service)
-	:m_actionURL(uri_apply_base(device.URLBase, service.controlURL)),
+	:m_actionURL(uri_apply_base(service.controlURL, device.URLBase)),
 	 m_serviceType(service.serviceType),
 	 m_deviceId(device.UDN),
 	 m_friendlyName(device.friendlyName),

src/pcm/SoxrResampler.cxx

@@ -147,7 +147,8 @@ SoxrPcmResampler::Resample(ConstBuffer<void> src, Error &error)
 
 	const size_t n_frames = src.size / frame_size;
 
-	const size_t o_frames = size_t(n_frames * ratio + 0.5);
+	/* always round up: worst case output buffer size */
+	const size_t o_frames = size_t(n_frames * ratio) + 1;
 
 	float *output_buffer = (float *)buffer.Get(o_frames * frame_size);
 

src/tag/Set.cxx

@@ -19,6 +19,7 @@
 
 #include "Set.hxx"
 #include "TagBuilder.hxx"
+#include "TagSettings.h"
 
 #include <assert.h>
 
@@ -109,6 +110,7 @@ TagSet::InsertUnique(const Tag &tag,
 
 	if (!CheckUnique(type, tag, type, group_mask) &&
 	    (type != TAG_ALBUM_ARTIST ||
+	     ignore_tag_items[TAG_ALBUM_ARTIST] ||
 	     /* fall back to "Artist" if no "AlbumArtist" was found */
 	     !CheckUnique(type, tag, TAG_ARTIST, group_mask)))
 		InsertUnique(tag, type, nullptr, group_mask);

test/FakeDecoderAPI.cxx

@@ -132,6 +132,12 @@ decoder_data(gcc_unused Decoder &decoder,
 	     const void *data, size_t datalen,
 	     gcc_unused uint16_t kbit_rate)
 {
+	static uint16_t prev_kbit_rate;
+	if (kbit_rate != prev_kbit_rate) {
+		prev_kbit_rate = kbit_rate;
+		fprintf(stderr, "%u kbit/s\n", kbit_rate);
+	}
+
 	gcc_unused ssize_t nbytes = write(1, data, datalen);
 	return DecoderCommand::NONE;
 }

test/run_input.cxx

@@ -54,11 +54,6 @@ tag_save(FILE *file, const Tag &tag)
 static int
 dump_input_stream(InputStream *is)
 {
-	Error error;
-	char buffer[4096];
-	size_t num_read;
-	ssize_t num_written;
-
 	is->Lock();
 
 	/* print meta data */
@@ -76,7 +71,9 @@ dump_input_stream(InputStream *is)
 			delete tag;
 		}
 
-		num_read = is->Read(buffer, sizeof(buffer), error);
+		Error error;
+		char buffer[4096];
+		size_t num_read = is->Read(buffer, sizeof(buffer), error);
 		if (num_read == 0) {
 			if (error.IsDefined())
 				LogError(error);
@@ -84,11 +81,12 @@ dump_input_stream(InputStream *is)
 			break;
 		}
 
-		num_written = write(1, buffer, num_read);
+		ssize_t num_written = write(1, buffer, num_read);
 		if (num_written <= 0)
 			break;
 	}
 
+	Error error;
 	if (!is->Check(error)) {
 		LogError(error);
 		is->Unlock();
@@ -102,10 +100,6 @@ dump_input_stream(InputStream *is)
 
 int main(int argc, char **argv)
 {
-	Error error;
-	InputStream *is;
-	int ret;
-
 	if (argc != 2) {
 		fprintf(stderr, "Usage: run_input URI\n");
 		return EXIT_FAILURE;
@@ -129,6 +123,7 @@ int main(int argc, char **argv)
 	archive_plugin_init_all();
 #endif
 
+	Error error;
 	if (!input_stream_global_init(error)) {
 		LogError(error);
 		return 2;
@@ -139,7 +134,8 @@ int main(int argc, char **argv)
 	Mutex mutex;
 	Cond cond;
 
-	is = InputStream::OpenReady(argv[1], mutex, cond, error);
+	InputStream *is = InputStream::OpenReady(argv[1], mutex, cond, error);
+	int ret;
 	if (is != NULL) {
 		ret = dump_input_stream(is);
 		delete is;