release v0.23.7

Fixes regression from commit 85f9863e0a

.github/workflows/build.yml

@@ -12,7 +12,7 @@ on:
       - 'win32/**'
     branches:
       - master
-      - actions
+      - v0.23.x
   pull_request:
     paths-ignore:
       - 'android/**'
@@ -24,6 +24,7 @@ on:
       - 'win32/**'
     branches:
       - master
+      - v0.23.x
 
 jobs:
   build-linux:

NEWS

@@ -1,3 +1,27 @@
+ver 0.23.7 (2022/05/09)
+* database
+  - upnp: support pupnp 1.14
+* decoder
+  - ffmpeg: fix HLS seeking
+  - opus: fix missing song length on high-latency files
+* output
+  - shout: require at least libshout 2.4.0
+* mixer
+  - pipewire: fix volume restore
+  - software: update volume of disabled outputs
+* support libiconv
+
+ver 0.23.6 (2022/03/14)
+* protocol
+  - support filename "cover.webp" for "albumart" command
+  - support "readcomments" and "readpicture" on CUE tracks
+* decoder
+  - ffmpeg: fix end-of-file check (update stuck at empty files)
+  - opus: fix "readpicture" on Opus files
+* output
+  - pipewire: fix crash bug if setting volume before playback starts
+  - wasapi: fix resume after pause
+
 ver 0.23.5 (2021/12/01)
 * protocol
   - support relative offsets for "searchadd"

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="65"
-          android:versionName="0.23.5">
+          android:versionCode="66"
+          android:versionName="0.23.7">
 
   <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29"/>
 
@@ -17,10 +17,9 @@
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
   <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-  <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
-  <uses-permission android:name="android.permission.BLUETOOTH" />
 
   <application android:allowBackup="true"
+               android:debuggable="true"
                android:requestLegacyExternalStorage="true"
                android:icon="@drawable/icon"
                android:banner="@drawable/icon"
@@ -43,7 +42,6 @@
     <receiver android:name=".Receiver">
       <intent-filter>
         <action android:name="android.intent.action.BOOT_COMPLETED" />
-        <action android:name="android.intent.action.HEADSET_PLUG" />
       </intent-filter>
     </receiver>
     <service android:name=".Main" android:process=":main"/>

android/build.py

@@ -13,7 +13,7 @@ android_abi = sys.argv[3]
 configure_args = sys.argv[4:]
 
 if not os.path.isfile(os.path.join(sdk_path, 'tools', 'android')):
-    print("SDK not found in", ndk_path, file=sys.stderr)
+    print("SDK not found in", sdk_path, file=sys.stderr)
     sys.exit(1)
 
 if not os.path.isdir(ndk_path):

android/gdb.sh

@@ -0,0 +1,54 @@
+#!/bin/sh
+
+# This script need the following modification in ANDROID_NDK in order to attach
+# to the good :main pid
+#--- a/prebuilt/linux-x86_64/bin/ndk-gdb.py
+#+++ b/prebuilt/linux-x86_64/bin/ndk-gdb.py
+#@@ -669,7 +669,7 @@
+#             log("Sleeping for {} seconds.".format(args.delay))
+#             time.sleep(args.delay)
+#
+#-    pids = gdbrunner.get_pids(device, pkg_name)
+#+    pids = gdbrunner.get_pids(device, pkg_name + ":main")
+#     if len(pids) == 0:
+#         error("Failed to find running process '{}'".format(pkg_name))
+#     if len(pids) > 1:
+
+SCRIPT_PATH=$(dirname $0)
+BUILD_PATH="`pwd`"
+TMP_PATH="$BUILD_PATH/gdb"
+NDK_GDB_ARGS="--force"
+ANDROID_NDK=$1
+
+if [ ! -f $ANDROID_NDK/source.properties ];then
+    echo "usage: $0 ANDROID_NDK"
+    exit 1
+fi
+
+if [ ! -f $BUILD_PATH/libmpd.so ];then
+    echo "This script need to be executed from the android build directory"
+    exit 1
+fi
+
+rm -rf "$TMP_PATH"
+mkdir -p "$TMP_PATH"
+
+ANDROID_MANIFEST="$SCRIPT_PATH/AndroidManifest.xml"
+ABI=`ls "$BUILD_PATH/android/apk/apk/lib" --sort=time | head -n 1`
+
+if [ ! -f "$ANDROID_MANIFEST" -o "$ABI" = "" ]; then
+    echo "Invalid manifest/ABI, did you try building first ?"
+    exit 1
+fi
+
+mkdir -p "$TMP_PATH"/jni
+touch "$TMP_PATH"/jni/Android.mk
+echo "APP_ABI := $ABI" > "$TMP_PATH"/jni/Application.mk
+
+DEST=obj/local/$ABI
+mkdir -p "$TMP_PATH/$DEST"
+
+cp "$BUILD_PATH/libmpd.so" "$TMP_PATH/$DEST"
+cp "$ANDROID_MANIFEST" "$TMP_PATH"
+
+(cd "$TMP_PATH" && bash $ANDROID_NDK/ndk-gdb $NDK_GDB_ARGS)

android/src/Main.java

@@ -24,14 +24,13 @@ import android.app.Notification;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.app.Service;
-import android.bluetooth.BluetoothDevice;
-import android.bluetooth.BluetoothClass;
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.ServiceConnection;
+import android.media.AudioManager;
 import android.os.Build;
 import android.os.IBinder;
 import android.os.PowerManager;
@@ -200,24 +199,14 @@ public class Main extends Service implements Runnable {
 			return;
 
 		IntentFilter filter = new IntentFilter();
-		filter.addAction(Intent.ACTION_HEADSET_PLUG);
-		filter.addAction(BluetoothDevice.ACTION_ACL_DISCONNECT_REQUESTED);
-		filter.addAction(BluetoothDevice.ACTION_ACL_DISCONNECTED);
+		filter.addAction(AudioManager.ACTION_AUDIO_BECOMING_NOISY);
 		registerReceiver(new BroadcastReceiver() {
 			@Override
 			public void onReceive(Context context, Intent intent) {
-				if (!mPauseOnHeadphonesDisconnect) {
+				if (!mPauseOnHeadphonesDisconnect)
 					return;
-				}
-
-				if (intent.getAction().equals(Intent.ACTION_HEADSET_PLUG)) {
-					if (intent.hasExtra("state") && intent.getIntExtra("state", 0) == 0)
-						pause();
-				} else {
-					BluetoothDevice device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
-					if (device.getBluetoothClass().hasService(BluetoothClass.Service.AUDIO))
-						pause();
-				}
+				if (intent.getAction() == AudioManager.ACTION_AUDIO_BECOMING_NOISY)
+					pause();
 			}
 		}, filter);
 

android/src/Receiver.java

@@ -25,16 +25,18 @@ import android.content.Intent;
 import android.util.Log;
 
 public class Receiver extends BroadcastReceiver {
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        Log.d("Receiver", "onReceive: " + intent);
-        if (intent.getAction() == "android.intent.action.BOOT_COMPLETED") {
-        	if (Settings.Preferences.getBoolean(context,
-        			Settings.Preferences.KEY_RUN_ON_BOOT, false)) {
-        		final boolean wakelock = Settings.Preferences.getBoolean(context,
-        				Settings.Preferences.KEY_WAKELOCK, false);
-        		Main.start(context, wakelock);
-        	}
-        }
-    }
+	@Override
+	public void onReceive(Context context, Intent intent) {
+		Log.d("Receiver", "onReceive: " + intent);
+		if (intent.getAction() == "android.intent.action.BOOT_COMPLETED") {
+			if (Settings.Preferences.getBoolean(context,
+							    Settings.Preferences.KEY_RUN_ON_BOOT,
+							    false)) {
+				final boolean wakelock =
+					Settings.Preferences.getBoolean(context,
+									Settings.Preferences.KEY_WAKELOCK, false);
+				Main.start(context, wakelock);
+			}
+		}
+	}
 }

doc/conf.py

@@ -38,7 +38,7 @@ author = 'Max Kellermann'
 # built documents.
 #
 # The short X.Y version.
-version = '0.23.5'
+version = '0.23.7'
 # The full version, including alpha/beta/rc tags.
 #release = version + '~git'
 

doc/mpdconf.example

@@ -79,7 +79,7 @@
 # This setting sets the address for the daemon to listen on. Careful attention
 # should be paid if this is assigned to anything other than the default, any.
 # This setting can deny access to control of the daemon. Not effective if
-# systemd socket activiation is in use.
+# systemd socket activation is in use.
 #
 # For network
 #bind_to_address		"any"
@@ -185,7 +185,7 @@
 #       cache_directory "~/.local/share/mpd/cache"
 #}
 #
-# An example of database config for a sattelite setup
+# An example of database config for a satellite setup
 #
 #music_directory "nfs://fileserver.local/srv/mp3"
 #database {

doc/protocol.rst

@@ -479,7 +479,7 @@ Querying :program:`MPD`'s status
       current song in seconds, but with higher resolution.
     - ``duration`` [#since_0_20]_: Duration of the current song in seconds.
     - ``bitrate``: instantaneous bitrate in kbps
-    - ``xfade``: ``crossfade`` in seconds
+    - ``xfade``: ``crossfade`` in seconds (see :ref:`crossfading`)
     - ``mixrampdb``: ``mixramp`` threshold in dB
     - ``mixrampdelay``: ``mixrampdelay`` in seconds
     - ``audio``: The format emitted by the decoder plugin during
@@ -519,17 +519,19 @@ Playback options
 .. _command_crossfade:
 
 :command:`crossfade {SECONDS}`
-    Sets crossfading between songs.
+    Sets crossfading between songs.  See :ref:`crossfading`.
 
 .. _command_mixrampdb:
 
 :command:`mixrampdb {deciBels}`
-    Sets the threshold at which songs will be overlapped. Like crossfading but doesn't fade the track volume, just overlaps. The songs need to have MixRamp tags added by an external tool. 0dB is the normalized maximum volume so use negative values, I prefer -17dB. In the absence of mixramp tags crossfading will be used. See http://sourceforge.net/projects/mixramp
+    Sets the threshold at which songs will be overlapped.
+    See :ref:`mixramp`.
 
 .. _command_mixrampdelay:
 
 :command:`mixrampdelay {SECONDS}`
     Additional time subtracted from the overlap calculated by mixrampdb. A value of "nan" disables MixRamp overlapping and falls back to crossfading.
+    See :ref:`mixramp`.
 
 .. _command_random:
 
@@ -543,6 +545,13 @@ Playback options
     Sets repeat state to ``STATE``,
     ``STATE`` should be 0 or 1.
 
+    If enabled, MPD keeps repeating the whole queue (:ref:`single mode
+    <command_single>` disabled) or the current song (:ref:`single mode
+    <command_single>` enabled).
+
+    If :ref:`random mode <command_random>` is also enabled, the
+    playback order will be shuffled each time the queue gets repeated.
+
 .. _command_setvol:
 
 :command:`setvol {VOL}`
@@ -771,8 +780,8 @@ Whenever possible, ids should be used.
 .. _command_playlistfind:
 
 :command:`playlistfind {FILTER}`
-    Finds songs in the queue with strict
-    matching.
+    Search the queue for songs matching
+    ``FILTER`` (see :ref:`Filters <filter_syntax>`).
 
 .. _command_playlistid:
 
@@ -792,8 +801,10 @@ Whenever possible, ids should be used.
 .. _command_playlistsearch:
 
 :command:`playlistsearch {FILTER}`
-    Searches case-insensitively for partial matches in the
-    queue.
+    Search the queue for songs matching
+    ``FILTER`` (see :ref:`Filters <filter_syntax>`).
+    Parameters have the same meaning as for :ref:`find
+    <command_playlistfind>`, except that search is not case sensitive.
 
 .. _command_plchanges:
 

doc/user.rst

@@ -622,6 +622,51 @@ enabled by setting ``volume_normalization`` to ``yes``.  It supports
 16 bit PCM only.
 
 
+.. _crossfading:
+
+Cross-Fading
+------------
+
+If ``crossfade`` is set to a positive number, then adjacent songs are
+cross-faded by this number of seconds.  This is a run-time setting
+:ref:`which can be controlled by clients <command_crossfade>`,
+e.g. with :program:`mpc`::
+
+  mpc crossfade 10
+  mpc crossfade 0
+
+Zero means cross-fading is disabled.
+
+Cross-fading is only possible if both songs have the same audio
+format.  At the cost of quality loss and higher CPU usage, you can
+make sure this is always given by configuring
+:ref:`audio_output_format`.
+
+.. _mixramp:
+
+MixRamp
+^^^^^^^
+
+MixRamp tags describe the loudness levels at start and end of a song
+and can be used by MPD to find the best time to begin cross-fading.
+MPD enables MixRamp if:
+
+- Cross-fade is enabled
+- :ref:`mixrampdelay <command_mixrampdelay>` is set to a positive
+  value, e.g.::
+    mpc mixrampdelay 1
+- :ref:`mixrampdb <command_mixrampdb>` is set to a reasonable value,
+  e.g.::
+    mpc mixrampdb -17
+- both songs have MixRamp tags
+- both songs have the same audio format (or :ref:`audio_output_format`
+  is configured)
+
+The `MixRamp <http://sourceforge.net/projects/mixramp>`__ tool can be
+used to add MixRamp tags to your song files.
+
+
+
 Client Connections
 ------------------
 
@@ -1058,6 +1103,15 @@ See :ref:`tags` for a list of supported tags.
 The :ref:`metadata_to_use <metadata_to_use>` setting can be used to
 enable or disable certain tags.
 
+Note that :program:`MPD` may not necessarily read metadata itself,
+instead relying on data reported by the decoder that was used to read
+a file. For example, this is the case for the FFmpeg decoder: both
+:program:`MPD` and FFmpeg need to support a given metadata format in
+order for metadata to be picked up correctly.
+
+Only if a decoder does not have metadata support will :program:`MPD`
+attempt to parse a song's metadata itself.
+
 The queue
 ---------
 

meson.build

@@ -1,7 +1,7 @@
 project(
   'mpd',
   ['c', 'cpp'],
-  version: '0.23.5',
+  version: '0.23.7',
   meson_version: '>= 0.56.0',
   default_options: [
     'c_std=c11',

python/build/libs.py

@@ -12,14 +12,14 @@ from build.boost import BoostProject
 from build.jack import JackProject
 
 libmpdclient = MesonProject(
-    'https://www.musicpd.org/download/libmpdclient/2/libmpdclient-2.19.tar.xz',
-    '158aad4c2278ab08e76a3f2b0166c99b39fae00ee17231bd225c5a36e977a189',
+    'https://www.musicpd.org/download/libmpdclient/2/libmpdclient-2.20.tar.xz',
+    '18793f68e939c3301e34d8fcadea1f7daa24143941263cecadb80126194e277d',
     'lib/libmpdclient.a',
 )
 
 libogg = CmakeProject(
-    'http://downloads.xiph.org/releases/ogg/libogg-1.3.4.tar.xz',
-    'c163bc12bc300c401b6aa35907ac682671ea376f13ae0969a220f7ddf71893fe',
+    'http://downloads.xiph.org/releases/ogg/libogg-1.3.5.tar.xz',
+    'c4d91be36fc8e54deae7575241e03f4211eb102afb3fc0775fbbc1b740016705',
     'lib/libogg.a',
     [
         '-DBUILD_SHARED_LIBS=OFF',
@@ -43,8 +43,8 @@ opus = AutotoolsProject(
 )
 
 flac = AutotoolsProject(
-    'http://downloads.xiph.org/releases/flac/flac-1.3.3.tar.xz',
-    '213e82bd716c9de6db2f98bcadbc4c24c7e2efe8c75939a1a84e28539c4e1748',
+    'http://downloads.xiph.org/releases/flac/flac-1.3.4.tar.xz',
+    '8ff0607e75a322dd7cd6ec48f4f225471404ae2730d0ea945127b1355155e737',
     'lib/libFLAC.a',
     [
         '--disable-shared', '--enable-static',
@@ -55,8 +55,8 @@ flac = AutotoolsProject(
 )
 
 zlib = ZlibProject(
-    'http://zlib.net/zlib-1.2.11.tar.xz',
-    '4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066',
+    'http://zlib.net/zlib-1.2.12.tar.xz',
+    '7db46b8d7726232a621befaab4a1c870f00a90805511c0e0090441dac57def18',
     'lib/libz.a',
 )
 
@@ -151,8 +151,8 @@ gme = CmakeProject(
 )
 
 ffmpeg = FfmpegProject(
-    'http://ffmpeg.org/releases/ffmpeg-4.4.1.tar.xz',
-    'eadbad9e9ab30b25f5520fbfde99fae4a92a1ae3c0257a8d68569a4651e30e02',
+    'http://ffmpeg.org/releases/ffmpeg-5.0.1.tar.xz',
+    'ef2efae259ce80a240de48ec85ecb062cecca26e4352ffb3fda562c21a93007b',
     'lib/libavcodec.a',
     [
         '--disable-shared', '--enable-static',
@@ -380,14 +380,14 @@ ffmpeg = FfmpegProject(
 )
 
 openssl = OpenSSLProject(
-    'https://www.openssl.org/source/openssl-3.0.0.tar.gz',
-    '59eedfcb46c25214c9bd37ed6078297b4df01d012267fe9e9eee31f61bc70536',
+    'https://www.openssl.org/source/openssl-3.0.3.tar.gz',
+    '9384a2b0570dd80358841464677115df785edb941c71211f75076d72fe6b438f',
     'include/openssl/ossl_typ.h',
 )
 
 curl = CmakeProject(
-    'https://curl.se/download/curl-7.79.1.tar.xz',
-    '0606f74b1182ab732a17c11613cbbaf7084f2e6cca432642d0e3ad7c224c3689',
+    'https://curl.se/download/curl-7.83.0.tar.xz',
+    'bbff0e6b5047e773f3c3b084d80546cc1be4e354c09e419c2d0ef6116253511a',
     'lib/libcurl.a',
     [
         '-DBUILD_CURL_EXE=OFF',
@@ -415,14 +415,14 @@ curl = CmakeProject(
         '-DBUILD_TESTING=OFF',
     ],
     windows_configure_args=[
-        '-DCMAKE_USE_SCHANNEL=ON',
+        '-DCURL_USE_SCHANNEL=ON',
     ],
     patches='src/lib/curl/patches',
 )
 
 libnfs = AutotoolsProject(
-    'https://github.com/sahlberg/libnfs/archive/libnfs-4.0.0.tar.gz',
-    '6ee77e9fe220e2d3e3b1f53cfea04fb319828cc7dbb97dd9df09e46e901d797d',
+    'https://github.com/sahlberg/libnfs/archive/libnfs-5.0.1.tar.gz',
+    '7ef445410b42f36b9bad426608b53ccb9ccca4101e545c383f564c11db672ca8',
     'lib/libnfs.a',
     [
         '--disable-shared', '--enable-static',
@@ -433,8 +433,7 @@ libnfs = AutotoolsProject(
 
         '--disable-utils', '--disable-examples',
     ],
-    base='libnfs-libnfs-4.0.0',
-    patches='src/lib/nfs/patches',
+    base='libnfs-libnfs-5.0.1',
     autoreconf=True,
 )
 
@@ -445,7 +444,7 @@ jack = JackProject(
 )
 
 boost = BoostProject(
-    'https://boostorg.jfrog.io/artifactory/main/release/1.77.0/source/boost_1_77_0.tar.bz2',
-    'fc9f85fc030e233142908241af7a846e60630aa7388de9a5fafb1f3a26840854',
+    'https://boostorg.jfrog.io/artifactory/main/release/1.79.0/source/boost_1_79_0.tar.bz2',
+    '475d589d51a7f8b3ba2ba4eda022b170e562ca3b760ee922c146b6c65856ef39',
     'include/boost/version.hpp',
 )

python/build/meson.py

@@ -53,19 +53,21 @@ pkgconfig = '{toolchain.pkg_config}'
         f.write(f"""
 [properties]
 root = '{toolchain.install_prefix}'
-
-[built-in options]
-c_args = {repr((toolchain.cppflags + ' ' + toolchain.cflags).split())}
-c_link_args = {repr(toolchain.ldflags.split() + toolchain.libs.split())}
-
-cpp_args = {repr((toolchain.cppflags + ' ' + toolchain.cxxflags).split())}
-cpp_link_args = {repr(toolchain.ldflags.split() + toolchain.libs.split())}
 """)
 
         if 'android' in toolchain.arch:
             f.write("""
 # Keep Meson from executing Android-x86 test binariees
 needs_exe_wrapper = true
+""")
+
+        f.write(f"""
+[built-in options]
+c_args = {repr((toolchain.cppflags + ' ' + toolchain.cflags).split())}
+c_link_args = {repr(toolchain.ldflags.split() + toolchain.libs.split())}
+
+cpp_args = {repr((toolchain.cppflags + ' ' + toolchain.cxxflags).split())}
+cpp_link_args = {repr(toolchain.ldflags.split() + toolchain.libs.split())}
 """)
 
         f.write(f"""

src/LocateUri.cxx

@@ -48,15 +48,14 @@ LocateFileUri(const char *uri, const Client *client
 			/* this path was relative to the music
 			   directory */
 			// TODO: don't use suffix.data() (ok for now because we know it's null-terminated)
-			return LocatedUri(LocatedUri::Type::RELATIVE,
-					  suffix.data());
+			return {LocatedUri::Type::RELATIVE, suffix.data()};
 	}
 #endif
 
 	if (client != nullptr)
 		client->AllowFile(path);
 
-	return LocatedUri(LocatedUri::Type::PATH, uri, std::move(path));
+	return {LocatedUri::Type::PATH, uri, std::move(path)};
 }
 
 static LocatedUri
@@ -90,8 +89,7 @@ LocateAbsoluteUri(UriPluginKind kind, const char *uri
 		const auto suffix = storage->MapToRelativeUTF8(uri);
 		if (suffix.data() != nullptr)
 			// TODO: don't use suffix.data() (ok for now because we know it's null-terminated)
-			return LocatedUri(LocatedUri::Type::RELATIVE,
-					  suffix.data());
+			return {LocatedUri::Type::RELATIVE, suffix.data()};
 	}
 
 	if (kind == UriPluginKind::STORAGE &&
@@ -99,7 +97,7 @@ LocateAbsoluteUri(UriPluginKind kind, const char *uri
 		throw std::invalid_argument("Unsupported URI scheme");
 #endif
 
-	return LocatedUri(LocatedUri::Type::ABSOLUTE, uri);
+	return {LocatedUri::Type::ABSOLUTE, uri};
 }
 
 LocatedUri

src/PlaylistDatabase.cxx

@@ -19,8 +19,8 @@
 
 #include "PlaylistDatabase.hxx"
 #include "db/PlaylistVector.hxx"
-#include "fs/io/TextFile.hxx"
-#include "fs/io/BufferedOutputStream.hxx"
+#include "io/LineReader.hxx"
+#include "io/BufferedOutputStream.hxx"
 #include "time/ChronoUtil.hxx"
 #include "util/StringStrip.hxx"
 #include "util/RuntimeError.hxx"
@@ -42,7 +42,7 @@ playlist_vector_save(BufferedOutputStream &os, const PlaylistVector &pv)
 }
 
 void
-playlist_metadata_load(TextFile &file, PlaylistVector &pv, const char *name)
+playlist_metadata_load(LineReader &file, PlaylistVector &pv, const char *name)
 {
 	PlaylistInfo pm(name);
 

src/PlaylistDatabase.hxx

@@ -24,7 +24,7 @@
 
 class PlaylistVector;
 class BufferedOutputStream;
-class TextFile;
+class LineReader;
 
 void
 playlist_vector_save(BufferedOutputStream &os, const PlaylistVector &pv);
@@ -33,6 +33,7 @@ playlist_vector_save(BufferedOutputStream &os, const PlaylistVector &pv);
  * Throws #std::runtime_error on error.
  */
 void
-playlist_metadata_load(TextFile &file, PlaylistVector &pv, const char *name);
+playlist_metadata_load(LineReader &file, PlaylistVector &pv,
+		       const char *name);
 
 #endif

src/PlaylistFile.cxx

@@ -28,8 +28,8 @@
 #include "Mapper.hxx"
 #include "protocol/RangeArg.hxx"
 #include "fs/io/TextFile.hxx"
-#include "fs/io/FileOutputStream.hxx"
-#include "fs/io/BufferedOutputStream.hxx"
+#include "io/FileOutputStream.hxx"
+#include "io/BufferedOutputStream.hxx"
 #include "config/Data.hxx"
 #include "config/Option.hxx"
 #include "config/Defaults.hxx"

src/PlaylistSave.cxx

@@ -28,8 +28,8 @@
 #include "fs/AllocatedPath.hxx"
 #include "fs/Traits.hxx"
 #include "fs/FileSystem.hxx"
-#include "fs/io/FileOutputStream.hxx"
-#include "fs/io/BufferedOutputStream.hxx"
+#include "io/FileOutputStream.hxx"
+#include "io/BufferedOutputStream.hxx"
 #include "util/UriExtract.hxx"
 
 static void

src/SingleMode.hxx

@@ -31,7 +31,7 @@ enum class SingleMode : uint8_t {
 /**
  * Return the string representation of a #SingleMode.
  */
-[[gnu::pure]]
+[[gnu::const]]
 const char *
 SingleToString(SingleMode mode) noexcept;
 

src/SongSave.cxx

@@ -22,8 +22,8 @@
 #include "db/plugins/simple/Song.hxx"
 #include "song/DetachedSong.hxx"
 #include "TagSave.hxx"
-#include "fs/io/TextFile.hxx"
-#include "fs/io/BufferedOutputStream.hxx"
+#include "io/LineReader.hxx"
+#include "io/BufferedOutputStream.hxx"
 #include "tag/ParseName.hxx"
 #include "tag/Tag.hxx"
 #include "tag/Builder.hxx"
@@ -85,7 +85,7 @@ song_save(BufferedOutputStream &os, const DetachedSong &song)
 }
 
 DetachedSong
-song_load(TextFile &file, const char *uri,
+song_load(LineReader &file, const char *uri,
 	  std::string *target_r)
 {
 	DetachedSong song(uri);

src/SongSave.hxx

@@ -28,7 +28,7 @@ struct Song;
 struct AudioFormat;
 class DetachedSong;
 class BufferedOutputStream;
-class TextFile;
+class LineReader;
 
 void
 song_save(BufferedOutputStream &os, const Song &song);
@@ -43,7 +43,7 @@ song_save(BufferedOutputStream &os, const DetachedSong &song);
  * Throws on error.
  */
 DetachedSong
-song_load(TextFile &file, const char *uri,
+song_load(LineReader &file, const char *uri,
 	  std::string *target_r=nullptr);
 
 #endif

src/StateFile.cxx

@@ -22,8 +22,8 @@
 #include "output/State.hxx"
 #include "queue/PlaylistState.hxx"
 #include "fs/io/TextFile.hxx"
-#include "fs/io/FileOutputStream.hxx"
-#include "fs/io/BufferedOutputStream.hxx"
+#include "io/FileOutputStream.hxx"
+#include "io/BufferedOutputStream.hxx"
 #include "storage/StorageState.hxx"
 #include "Partition.hxx"
 #include "Instance.hxx"

src/TagAny.cxx

@@ -21,12 +21,16 @@
 #include "TagStream.hxx"
 #include "TagFile.hxx"
 #include "tag/Generic.hxx"
+#include "song/LightSong.hxx"
+#include "db/Interface.hxx"
 #include "storage/StorageInterface.hxx"
 #include "client/Client.hxx"
 #include "protocol/Ack.hxx"
 #include "fs/AllocatedPath.hxx"
 #include "input/InputStream.hxx"
 #include "util/Compiler.h"
+#include "util/ScopeExit.hxx"
+#include "util/StringCompare.hxx"
 #include "util/UriExtract.hxx"
 #include "LocateUri.hxx"
 
@@ -51,10 +55,67 @@ TagScanFile(const Path path_fs, TagHandler &handler)
 	ScanGenericTags(path_fs, handler);
 }
 
+#ifdef ENABLE_DATABASE
+
+/**
+ * Collapse "../" prefixes in a URI relative to the specified base
+ * URI.
+ */
+static std::string
+ResolveUri(std::string_view base, const char *relative)
+{
+	while (true) {
+		const char *rest = StringAfterPrefix(relative, "../");
+		if (rest == nullptr)
+			break;
+
+		if (base == ".")
+			throw ProtocolError(ACK_ERROR_NO_EXIST, "Bad real URI");
+
+		base = PathTraitsUTF8::GetParent(base);
+		relative = rest;
+	}
+
+	return PathTraitsUTF8::Build(base, relative);
+}
+
+/**
+ * Look up the specified song in the database and return its
+ * (resolved) "real" URI.
+ */
+static std::string
+GetRealSongUri(Client &client, std::string_view uri)
+{
+	const auto &db = client.GetDatabaseOrThrow();
+
+	const auto *song = db.GetSong(uri);
+	if (song == nullptr)
+		throw ProtocolError(ACK_ERROR_NO_EXIST, "No such song");
+
+	AtScopeExit(&db, song) { db.ReturnSong(song); };
+
+	if (song->real_uri == nullptr)
+		return {};
+
+	return ResolveUri(PathTraitsUTF8::GetParent(uri), song->real_uri);
+}
+
+#endif
+
 static void
 TagScanDatabase(Client &client, const char *uri, TagHandler &handler)
 {
 #ifdef ENABLE_DATABASE
+	const auto real_uri = GetRealSongUri(client, uri);
+
+	if (!real_uri.empty()) {
+		uri = real_uri.c_str();
+
+		// TODO: support absolute paths?
+		if (uri_has_scheme(uri))
+			return TagScanStream(uri, handler);
+	}
+
 	const Storage *storage = client.GetStorage();
 	if (storage == nullptr) {
 #else

src/TagSave.cxx

@@ -19,7 +19,7 @@
 
 #include "TagSave.hxx"
 #include "tag/Tag.hxx"
-#include "fs/io/BufferedOutputStream.hxx"
+#include "io/BufferedOutputStream.hxx"
 
 #define SONG_TIME "Time: "
 

src/command/FileCommands.cxx

@@ -160,8 +160,7 @@ find_stream_art(std::string_view directory, Mutex &mutex)
 	static constexpr auto art_names = std::array {
 		"cover.png",
 		"cover.jpg",
-		"cover.tiff",
-		"cover.bmp",
+		"cover.webp",
 	};
 
 	for(const auto name : art_names) {

src/config/File.cxx

@@ -31,8 +31,8 @@
 #include "fs/FileSystem.hxx"
 #include "fs/List.hxx"
 #include "fs/Path.hxx"
-#include "fs/io/FileReader.hxx"
-#include "fs/io/BufferedReader.hxx"
+#include "io/FileReader.hxx"
+#include "io/BufferedReader.hxx"
 #include "Log.hxx"
 
 #include <cassert>

src/db/plugins/simple/DatabaseSave.cxx

@@ -20,8 +20,8 @@
 #include "DatabaseSave.hxx"
 #include "db/DatabaseLock.hxx"
 #include "DirectorySave.hxx"
-#include "fs/io/BufferedOutputStream.hxx"
-#include "fs/io/TextFile.hxx"
+#include "io/BufferedOutputStream.hxx"
+#include "io/LineReader.hxx"
 #include "tag/ParseName.hxx"
 #include "tag/Settings.hxx"
 #include "fs/Charset.hxx"
@@ -64,7 +64,7 @@ db_save_internal(BufferedOutputStream &os, const Directory &music_root)
 }
 
 void
-db_load_internal(TextFile &file, Directory &music_root)
+db_load_internal(LineReader &file, Directory &music_root)
 {
 	char *line;
 	unsigned format = 0;

src/db/plugins/simple/DatabaseSave.hxx

@@ -22,7 +22,7 @@
 
 struct Directory;
 class BufferedOutputStream;
-class TextFile;
+class LineReader;
 
 void
 db_save_internal(BufferedOutputStream &os, const Directory &root);
@@ -31,6 +31,6 @@ db_save_internal(BufferedOutputStream &os, const Directory &root);
  * Throws #std::runtime_error on error.
  */
 void
-db_load_internal(TextFile &file, Directory &root);
+db_load_internal(LineReader &file, Directory &root);
 
 #endif

src/db/plugins/simple/DirectorySave.cxx

@@ -23,8 +23,8 @@
 #include "SongSave.hxx"
 #include "song/DetachedSong.hxx"
 #include "PlaylistDatabase.hxx"
-#include "fs/io/TextFile.hxx"
-#include "fs/io/BufferedOutputStream.hxx"
+#include "io/LineReader.hxx"
+#include "io/BufferedOutputStream.hxx"
 #include "time/ChronoUtil.hxx"
 #include "util/StringAPI.hxx"
 #include "util/StringCompare.hxx"
@@ -121,7 +121,7 @@ ParseLine(Directory &directory, const char *line)
 }
 
 static Directory *
-directory_load_subdir(TextFile &file, Directory &parent, std::string_view name)
+directory_load_subdir(LineReader &file, Directory &parent, std::string_view name)
 {
 	if (parent.FindChild(name) != nullptr)
 		throw FormatRuntimeError("Duplicate subdirectory '%.*s'",
@@ -152,7 +152,7 @@ directory_load_subdir(TextFile &file, Directory &parent, std::string_view name)
 }
 
 void
-directory_load(TextFile &file, Directory &directory)
+directory_load(LineReader &file, Directory &directory)
 {
 	const char *line;
 

src/db/plugins/simple/DirectorySave.hxx

@@ -21,7 +21,7 @@
 #define MPD_DIRECTORY_SAVE_HXX
 
 struct Directory;
-class TextFile;
+class LineReader;
 class BufferedOutputStream;
 
 void
@@ -31,6 +31,6 @@ directory_save(BufferedOutputStream &os, const Directory &directory);
  * Throws #std::runtime_error on error.
  */
 void
-directory_load(TextFile &file, Directory &directory);
+directory_load(LineReader &file, Directory &directory);
 
 #endif

src/db/plugins/simple/SimpleDatabasePlugin.cxx

@@ -34,8 +34,8 @@
 #include "db/DatabaseLock.hxx"
 #include "db/DatabaseError.hxx"
 #include "fs/io/TextFile.hxx"
-#include "fs/io/BufferedOutputStream.hxx"
-#include "fs/io/FileOutputStream.hxx"
+#include "io/BufferedOutputStream.hxx"
+#include "io/FileOutputStream.hxx"
 #include "fs/FileInfo.hxx"
 #include "config/Block.hxx"
 #include "fs/FileSystem.hxx"
@@ -46,7 +46,7 @@
 #include "Log.hxx"
 
 #ifdef ENABLE_ZLIB
-#include "fs/io/GzipOutputStream.hxx"
+#include "lib/zlib/GzipOutputStream.hxx"
 #endif
 
 #include <cerrno>

src/decoder/Reader.hxx

@@ -20,7 +20,7 @@
 #ifndef MPD_DECODER_READER_HXX
 #define MPD_DECODER_READER_HXX
 
-#include "fs/io/Reader.hxx"
+#include "io/Reader.hxx"
 
 class DecoderClient;
 class InputStream;

src/decoder/plugins/FfmpegDecoderPlugin.cxx

@@ -384,7 +384,8 @@ static void
 FfmpegParseMetaData(const AVStream &stream,
 		    ReplayGainInfo &rg, MixRampInfo &mr)
 {
-	FfmpegParseMetaData(*stream.metadata, rg, mr);
+	if (stream.metadata != nullptr)
+		FfmpegParseMetaData(*stream.metadata, rg, mr);
 }
 
 static void
@@ -393,7 +394,9 @@ FfmpegParseMetaData(const AVFormatContext &format_context, int audio_stream,
 {
 	assert(audio_stream >= 0);
 
-	FfmpegParseMetaData(*format_context.metadata, rg, mr);
+	if (format_context.metadata != nullptr)
+		FfmpegParseMetaData(*format_context.metadata, rg, mr);
+
 	FfmpegParseMetaData(*format_context.streams[audio_stream],
 				    rg, mr);
 }
@@ -468,7 +471,7 @@ static bool
 IsSeekable(const AVFormatContext &format_context) noexcept
 {
 #if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(58, 6, 100)
-	return (format_context.ctx_flags & AVFMTCTX_UNSEEKABLE) != 0;
+	return (format_context.ctx_flags & AVFMTCTX_UNSEEKABLE) == 0;
 #else
 	(void)format_context;
 	return false;
@@ -530,9 +533,8 @@ FfmpegDecode(DecoderClient &client, InputStream *input,
 		: FromFfmpegTimeChecked(format_context.duration, AV_TIME_BASE_Q);
 
 	client.Ready(audio_format,
-		     input
-		     ? input->IsSeekable()
-		     : IsSeekable(format_context),
+		     (input ? input->IsSeekable() : false)
+		     || IsSeekable(format_context),
 		     total_time);
 
 	FfmpegParseMetaData(client, format_context, audio_stream);

src/decoder/plugins/FfmpegIo.cxx

@@ -21,6 +21,7 @@
 #define __STDC_CONSTANT_MACROS
 
 #include "FfmpegIo.hxx"
+#include "libavutil/mem.h"
 #include "../DecoderAPI.hxx"
 #include "input/InputStream.hxx"
 
@@ -35,7 +36,11 @@ AvioStream::~AvioStream()
 inline int
 AvioStream::Read(void *dest, int size)
 {
-	return decoder_read(client, input, dest, size);
+	const auto nbytes = decoder_read(client, input, dest, size);
+	if (nbytes == 0)
+		return AVERROR_EOF;
+
+	return nbytes;
 }
 
 inline int64_t

src/decoder/plugins/OpusTags.cxx

@@ -91,7 +91,8 @@ ScanOpusTags(const void *data, size_t size,
 	if (!r.Expect("OpusTags", 8))
 		return false;
 
-	if (!handler.WantPair() && !handler.WantTag())
+	if (!handler.WantPair() && !handler.WantTag() &&
+	    !handler.WantPicture())
 		return true;
 
 	if (!r.SkipString())

src/decoder/plugins/SidplayDecoderPlugin.cxx

@@ -27,7 +27,7 @@
 #include "fs/AllocatedPath.hxx"
 #include "lib/icu/Converter.hxx"
 #ifdef HAVE_SIDPLAYFP
-#include "fs/io/FileReader.hxx"
+#include "io/FileReader.hxx"
 #include "util/RuntimeError.hxx"
 #endif
 #include "util/StringFormat.hxx"

src/encoder/ToOutputStream.cxx

@@ -19,7 +19,7 @@
 
 #include "ToOutputStream.hxx"
 #include "EncoderInterface.hxx"
-#include "fs/io/OutputStream.hxx"
+#include "io/OutputStream.hxx"
 
 void
 EncoderToOutputStream(OutputStream &os, Encoder &encoder)

src/encoder/meson.build

@@ -3,6 +3,23 @@ encoder_features = configuration_data()
 encoder_features.set('ENABLE_ENCODER', need_encoder)
 
 if not need_encoder
+  if need_wave_encoder
+    # Special case for the Snapcast output plugin which only needs the
+    # PCM wave encoder encoder plugin
+    encoder_glue = static_library(
+      'encoder_glue',
+      'plugins/WaveEncoderPlugin.cxx',
+      include_directories: inc,
+    )
+
+    encoder_glue_dep = declare_dependency(
+      link_with: encoder_glue,
+    )
+
+    configure_file(output: 'Features.h', configuration: encoder_features)
+    subdir_done()
+  endif
+
   encoder_glue_dep = dependency('', required: false)
   configure_file(output: 'Features.h', configuration: encoder_features)
   subdir_done()

src/encoder/plugins/meson.build

@@ -35,7 +35,7 @@ if libshine_dep.found()
 endif
 
 encoder_features.set('ENABLE_WAVE_ENCODER', get_option('wave_encoder'))
-if get_option('wave_encoder')
+if get_option('wave_encoder') or need_wave_encoder
   encoder_plugins_sources += 'WaveEncoderPlugin.cxx'
 endif
 

src/filter/plugins/NormalizeFilterPlugin.cxx

@@ -23,7 +23,7 @@
 #include "filter/Prepared.hxx"
 #include "pcm/Buffer.hxx"
 #include "pcm/AudioFormat.hxx"
-#include "AudioCompress/compress.h"
+#include "pcm/AudioCompress/compress.h"
 #include "util/ConstBuffer.hxx"
 
 #include <string.h>

src/filter/plugins/meson.build

@@ -12,7 +12,6 @@ endif
 
 filter_plugins = static_library(
   'filter_plugins',
-  '../../AudioCompress/compress.c',
   'NullFilterPlugin.cxx',
   'TwoFilters.cxx',
   'AutoConvertFilterPlugin.cxx',

src/fs/StandardDirectory.cxx

@@ -41,7 +41,7 @@
 #ifdef USE_XDG
 #include "util/StringStrip.hxx"
 #include "util/StringCompare.hxx"
-#include "io/TextFile.hxx"
+#include "fs/io/TextFile.hxx"
 #include <string.h>
 #include <utility>
 #endif

src/fs/io/TextFile.cxx

@@ -18,9 +18,9 @@
  */
 
 #include "TextFile.hxx"
-#include "FileReader.hxx"
-#include "AutoGunzipReader.hxx"
-#include "BufferedReader.hxx"
+#include "io/FileReader.hxx"
+#include "io/BufferedReader.hxx"
+#include "lib/zlib/AutoGunzipReader.hxx"
 #include "fs/Path.hxx"
 
 #include <cassert>

src/fs/io/TextFile.hxx

@@ -20,6 +20,7 @@
 #ifndef MPD_TEXT_FILE_HXX
 #define MPD_TEXT_FILE_HXX
 
+#include "io/LineReader.hxx"
 #include "config.h"
 
 #include <memory>
@@ -29,7 +30,7 @@ class FileReader;
 class AutoGunzipReader;
 class BufferedReader;
 
-class TextFile {
+class TextFile final : public LineReader {
 	const std::unique_ptr<FileReader> file_reader;
 
 #ifdef ENABLE_ZLIB
@@ -45,14 +46,8 @@ public:
 
 	~TextFile() noexcept;
 
-	/**
-	 * Reads a line from the input file, and strips trailing
-	 * space.  There is a reasonable maximum line length, only to
-	 * prevent denial of service.
-	 *
-	 * @return a pointer to the line, or nullptr on end-of-file
-	 */
-	char *ReadLine();
+	/* virtual methods from class LineReader */
+	char *ReadLine() override;
 };
 
 #endif

src/fs/meson.build

@@ -14,12 +14,7 @@ fs_sources = [
   'CheckFile.cxx',
   'LookupFile.cxx',
   'DirectoryReader.cxx',
-  'io/PeekReader.cxx',
-  'io/FileReader.cxx',
-  'io/BufferedReader.cxx',
   'io/TextFile.cxx',
-  'io/FileOutputStream.cxx',
-  'io/BufferedOutputStream.cxx',
 ]
 
 if is_windows
@@ -28,14 +23,6 @@ else
   shlwapi_dep = dependency('', required: false)
 endif
 
-if zlib_dep.found()
-  fs_sources += [
-    'io/GunzipReader.cxx',
-    'io/AutoGunzipReader.cxx',
-    'io/GzipOutputStream.cxx',
-  ]
-endif
-
 fs = static_library(
   'fs',
   fs_sources,

src/input/IcyInputStream.cxx

@@ -18,7 +18,7 @@
  */
 
 #include "IcyInputStream.hxx"
-#include "IcyMetaDataParser.hxx"
+#include "tag/IcyMetaDataParser.hxx"
 #include "tag/Tag.hxx"
 #include "util/UriExtract.hxx"
 #include "util/UriQueryParser.hxx"

src/input/Reader.hxx

@@ -20,7 +20,7 @@
 #ifndef MPD_INPUT_READER_HXX
 #define MPD_INPUT_READER_HXX
 
-#include "fs/io/Reader.hxx"
+#include "io/Reader.hxx"
 
 class InputStream;
 

src/input/plugins/CurlInputPlugin.cxx

@@ -27,7 +27,7 @@
 #include "../MaybeBufferedInputStream.hxx"
 #include "../AsyncInputStream.hxx"
 #include "../IcyInputStream.hxx"
-#include "IcyMetaDataParser.hxx"
+#include "tag/IcyMetaDataParser.hxx"
 #include "../InputPlugin.hxx"
 #include "config/Block.hxx"
 #include "tag/Builder.hxx"

src/input/plugins/FileInputPlugin.cxx

@@ -21,7 +21,7 @@
 #include "../InputStream.hxx"
 #include "fs/Path.hxx"
 #include "fs/FileInfo.hxx"
-#include "fs/io/FileReader.hxx"
+#include "io/FileReader.hxx"
 #include "io/FileDescriptor.hxx"
 #include "util/RuntimeError.hxx"
 

src/input/plugins/meson.build

@@ -20,7 +20,7 @@ if curl_dep.found()
   input_plugins_sources += [
     'CurlInputPlugin.cxx',
     '../IcyInputStream.cxx',
-    '../../IcyMetaDataParser.cxx',
+    '../../tag/IcyMetaDataParser.cxx',
   ]
 endif
 

src/io/LineReader.hxx

@@ -0,0 +1,33 @@
+/*
+ * Copyright 2003-2021 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.
+ */
+
+#pragma once
+
+class LineReader
+{
+public:
+	/**
+	 * Reads a line from the input file, and strips trailing
+	 * space.  There is a reasonable maximum line length, only to
+	 * prevent denial of service.
+	 *
+	 * @return a pointer to the line, or nullptr on end-of-file
+	 */
+	virtual char *ReadLine() = 0;
+};

src/io/meson.build

@@ -2,6 +2,11 @@ io = static_library(
   'io',
   'FileDescriptor.cxx',
   'Open.cxx',
+  'PeekReader.cxx',
+  'FileReader.cxx',
+  'BufferedReader.cxx',
+  'FileOutputStream.cxx',
+  'BufferedOutputStream.cxx',
   include_directories: inc,
 )
 

src/io/uring/Operation.hxx

@@ -45,10 +45,15 @@ class Operation {
 	CancellableOperation *cancellable = nullptr;
 
 public:
+	Operation() noexcept = default;
+
 	~Operation() noexcept {
 		CancelUring();
 	}
 
+	Operation(const Operation &) = delete;
+	Operation &operator=(const Operation &) = delete;
+
 	/**
 	 * Are we waiting for the operation to complete?
 	 */

src/io/uring/Queue.cxx

@@ -34,6 +34,8 @@
 #include "CancellableOperation.hxx"
 #include "util/DeleteDisposer.hxx"
 
+#include <stdexcept>
+
 namespace Uring {
 
 Queue::Queue(unsigned entries, unsigned flags)
@@ -46,6 +48,23 @@ Queue::~Queue() noexcept
 	operations.clear_and_dispose(DeleteDisposer{});
 }
 
+struct io_uring_sqe &
+Queue::RequireSubmitEntry()
+{
+	auto *sqe = GetSubmitEntry();
+	if (sqe == nullptr) {
+		/* the submit queue is full; submit it to the kernel
+		   and try again */
+		Submit();
+
+		sqe = GetSubmitEntry();
+		if (sqe == nullptr)
+			throw std::runtime_error{"io_uring_get_sqe() failed"};
+	}
+
+	return *sqe;
+}
+
 void
 Queue::AddPending(struct io_uring_sqe &sqe,
 		  Operation &operation) noexcept

src/io/uring/Queue.hxx

@@ -63,6 +63,14 @@ public:
 		return ring.GetSubmitEntry();
 	}
 
+	/**
+	 * Like GetSubmitEntry(), but call Submit() if the submit
+	 * queue is full.
+	 *
+	 * May throw exceptions if Submit() fails.
+	 */
+	struct io_uring_sqe &RequireSubmitEntry();
+
 	bool HasPending() const noexcept {
 		return !operations.empty();
 	}

src/io/uring/ReadOperation.cxx

@@ -45,14 +45,13 @@ ReadOperation::Start(Queue &queue, FileDescriptor fd, off_t offset,
 
 	buffer = std::make_unique<std::byte[]>(size);
 
-	auto *s = queue.GetSubmitEntry();
-	assert(s != nullptr); // TODO: what if the submit queue is full?
+	auto &s = queue.RequireSubmitEntry();
 
 	iov.iov_base = buffer.get();
 	iov.iov_len = size;
 
-	io_uring_prep_readv(s, fd.Get(), &iov, 1, offset);
-	queue.Push(*s, *this);
+	io_uring_prep_readv(&s, fd.Get(), &iov, 1, offset);
+	queue.Push(s, *this);
 }
 
 void

src/lib/alsa/Error.cxx

@@ -29,6 +29,7 @@
 
 #include "Error.hxx"
 
+#include <stdarg.h>
 #include <alsa/error.h>
 
 namespace Alsa {

src/lib/alsa/Error.hxx

@@ -50,4 +50,4 @@ MakeError(int error, const char *msg) noexcept
 	return std::system_error(error, error_category, msg);
 }
 
-} // namespace Avahi
+} // namespace Alsa

src/lib/curl/Escape.cxx

@@ -60,7 +60,7 @@ CurlUnescape(CURL *curl, StringView src) noexcept
 	int outlength;
 	CurlString tmp(curl_easy_unescape(curl, src.data, src.size,
 					  &outlength));
-	return std::string(tmp.c_str(), outlength);
+	return {tmp.c_str(), size_t(outlength)};
 }
 
 std::string

src/lib/icu/meson.build

@@ -12,17 +12,23 @@ if is_windows
   icu_sources += 'Win32.cxx'
 endif
 
+iconv_dep = []
 if icu_dep.found()
   icu_sources += [
     'Util.cxx',
     'Init.cxx',
   ]
 elif not get_option('iconv').disabled()
-  have_iconv = compiler.has_function('iconv', prefix : '#include <iconv.h>')
-  conf.set('HAVE_ICONV', have_iconv)
+  # an installed iconv library will make the builtin iconv() unavailable,
+  # so search for the library first and pass it as (possible) dependency
+  iconv_dep = compiler.find_library('libiconv', required: false)
+  have_iconv = compiler.has_function('iconv', 
+    dependencies: iconv_dep, 
+    prefix : '#include <iconv.h>')
   if not have_iconv and get_option('iconv').enabled()
     error('iconv() not available')
   endif
+  conf.set('HAVE_ICONV', have_iconv)
 endif
 
 icu = static_library(
@@ -31,6 +37,7 @@ icu = static_library(
   include_directories: inc,
   dependencies: [
     icu_dep,
+    iconv_dep,
     fmt_dep,
   ],
 )

src/lib/nfs/patches/no_sprintf_s

@@ -1,14 +0,0 @@
-Index: libnfs-libnfs-4.0.0/include/win32/win32_compat.h
-===================================================================
---- libnfs-libnfs-4.0.0.orig/include/win32/win32_compat.h
-+++ libnfs-libnfs-4.0.0/include/win32/win32_compat.h
-@@ -133,7 +133,9 @@ struct pollfd {
- 
- /* Wrapper macros to call misc. functions win32 is missing */
- #define poll(x, y, z)        win32_poll(x, y, z)
-+#ifndef __MINGW32__
- #define snprintf             sprintf_s
-+#endif
- #define inet_pton(x,y,z)     win32_inet_pton(x,y,z)
- #define open(x, y, z)        _open(x, y, z)
- #ifndef lseek

src/lib/nfs/patches/series

@@ -1 +0,0 @@
-no_sprintf_s

src/lib/upnp/Init.cxx

@@ -35,13 +35,7 @@ static unsigned upnp_ref;
 static void
 DoInit(const char* iface)
 {
-
-#ifdef UPNP_ENABLE_IPV6
-	auto code = UpnpInit2(iface, 0);
-#else
-	auto code = UpnpInit(iface, 0);
-#endif
-	if (code != UPNP_E_SUCCESS)
+	if (auto code = UpnpInit2(iface, 0); code != UPNP_E_SUCCESS)
 		throw FormatRuntimeError("UpnpInit() failed: %s",
 					 UpnpGetErrorMessage(code));
 

src/lib/xiph/OggSyncState.cxx

@@ -18,7 +18,7 @@
  */
 
 #include "OggSyncState.hxx"
-#include "fs/io/Reader.hxx"
+#include "io/Reader.hxx"
 
 bool
 OggSyncState::Feed(size_t size)
@@ -67,7 +67,7 @@ OggSyncState::ExpectPageIn(ogg_stream_state &os)
 bool
 OggSyncState::ExpectPageSeek(ogg_page &page)
 {
-	size_t remaining_skipped = 32768;
+	size_t remaining_skipped = 65536;
 
 	while (true) {
 		int r = ogg_sync_pageseek(&oy, &page);

src/lib/xiph/meson.build

@@ -1,4 +1,11 @@
 libflac_dep = dependency('flac', version: '>= 1.2', required: get_option('flac'))
+
+if is_windows
+  # Our Windows build generates a static libFLAC build
+  libflac_dep = declare_dependency(compile_args: '-DFLAC__NO_DLL',
+                                   dependencies: libflac_dep)
+endif
+
 libopus_dep = dependency('opus', required: get_option('opus'))
 
 if get_option('tremor').enabled()

src/lib/zlib/AutoGunzipReader.hxx

@@ -20,7 +20,7 @@
 #ifndef MPD_AUTO_GUNZIP_READER_HXX
 #define MPD_AUTO_GUNZIP_READER_HXX
 
-#include "PeekReader.hxx"
+#include "io/PeekReader.hxx"
 
 #include <memory>
 

src/lib/zlib/GunzipReader.hxx

@@ -30,7 +30,7 @@
 #ifndef GUNZIP_READER_HXX
 #define GUNZIP_READER_HXX
 
-#include "Reader.hxx"
+#include "io/Reader.hxx"
 #include "util/StaticFifoBuffer.hxx"
 
 #include <zlib.h>

src/lib/zlib/GzipOutputStream.hxx

@@ -30,7 +30,7 @@
 #ifndef GZIP_OUTPUT_STREAM_HXX
 #define GZIP_OUTPUT_STREAM_HXX
 
-#include "OutputStream.hxx"
+#include "io/OutputStream.hxx"
 
 #include <zlib.h>
 

src/lib/zlib/meson.build

@@ -7,6 +7,9 @@ endif
 zlib = static_library(
   'zlib',
   'Error.cxx',
+  'GunzipReader.cxx',
+  'GzipOutputStream.cxx',
+  'AutoGunzipReader.cxx',
   include_directories: inc,
   dependencies: [
     zlib_dep,
@@ -17,5 +20,6 @@ zlib_dep = declare_dependency(
   link_with: zlib,
   dependencies: [
     zlib_dep,
+    io_dep,
   ],
 )

src/mixer/MixerAll.cxx

@@ -34,13 +34,15 @@ gcc_pure
 static int
 output_mixer_get_volume(const AudioOutputControl &ao) noexcept
 {
-	if (!ao.IsEnabled())
-		return -1;
-
 	auto *mixer = ao.GetMixer();
 	if (mixer == nullptr)
 		return -1;
 
+	/* software mixers are always considered, even if they are
+	   disabled */
+	if (!ao.IsEnabled() && !mixer->IsPlugin(software_mixer_plugin))
+		return -1;
+
 	try {
 		return mixer_get_volume(mixer);
 	} catch (...) {
@@ -76,13 +78,15 @@ output_mixer_set_volume(AudioOutputControl &ao, unsigned volume) noexcept
 {
 	assert(volume <= 100);
 
-	if (!ao.IsEnabled())
-		return false;
-
 	auto *mixer = ao.GetMixer();
 	if (mixer == nullptr)
 		return false;
 
+	/* software mixers are always updated, even if they are
+	   disabled */
+	if (!ao.IsReallyEnabled() && !mixer->IsPlugin(software_mixer_plugin))
+		return false;
+
 	try {
 		mixer_set_volume(mixer, volume);
 		return true;

src/mixer/Volume.cxx

@@ -23,7 +23,7 @@
 #include "util/StringCompare.hxx"
 #include "util/Domain.hxx"
 #include "system/PeriodClock.hxx"
-#include "fs/io/BufferedOutputStream.hxx"
+#include "io/BufferedOutputStream.hxx"
 #include "Log.hxx"
 
 #include <cassert>

src/output/Control.hxx

@@ -288,6 +288,13 @@ public:
 		return !output;
 	}
 
+	/**
+	 * Caller must lock the mutex.
+	 */
+	bool IsReallyEnabled() const noexcept {
+		return really_enabled;
+	}
+
 	/**
 	 * Caller must lock the mutex.
 	 */

src/output/State.cxx

@@ -26,7 +26,7 @@
 #include "MultipleOutputs.hxx"
 #include "Domain.hxx"
 #include "Log.hxx"
-#include "fs/io/BufferedOutputStream.hxx"
+#include "io/BufferedOutputStream.hxx"
 #include "util/StringCompare.hxx"
 
 #include <stdlib.h>

src/output/plugins/PipeWireOutputPlugin.cxx

@@ -336,6 +336,8 @@ PipeWireOutput::Enable()
 		throw MakeErrno("pw_thread_loop_new() failed");
 
 	pw_thread_loop_start(thread_loop);
+
+	stream = nullptr;
 }
 
 void
@@ -636,8 +638,8 @@ PipeWireOutput::ParamChanged([[maybe_unused]] uint32_t id,
 			     [[maybe_unused]] const struct spa_pod *param) noexcept
 {
 	if (restore_volume) {
-		SetVolume(volume);
 		restore_volume = false;
+		SetVolume(volume);
 	}
 
 #if defined(ENABLE_DSD) && defined(SPA_AUDIO_DSD_FLAG_NONE)

src/output/plugins/RecorderOutputPlugin.cxx

@@ -27,7 +27,7 @@
 #include "config/Path.hxx"
 #include "Log.hxx"
 #include "fs/AllocatedPath.hxx"
-#include "fs/io/FileOutputStream.hxx"
+#include "io/FileOutputStream.hxx"
 #include "util/Domain.hxx"
 #include "util/ScopeExit.hxx"
 

src/output/plugins/ShoutOutputPlugin.cxx

@@ -59,7 +59,7 @@ class ShoutConfig {
 public:
 	ShoutConfig(const ConfigBlock &block, const char *mime_type);
 
-	void Setup(shout_t *connection) const;
+	void Setup(shout_t &connection) const;
 };
 
 struct ShoutOutput final : AudioOutput {
@@ -229,41 +229,56 @@ ShoutOutput::Create(EventLoop &, const ConfigBlock &block)
 	return new ShoutOutput(block);
 }
 
-inline void
-ShoutConfig::Setup(shout_t *connection) const
+static void
+SetMeta(shout_t &connection, const char *name, const char *value)
 {
-	if (shout_set_host(connection, host) != SHOUTERR_SUCCESS ||
-	    shout_set_port(connection, port) != SHOUTERR_SUCCESS ||
-	    shout_set_password(connection, passwd) != SHOUTERR_SUCCESS ||
-	    shout_set_mount(connection, mount) != SHOUTERR_SUCCESS ||
-	    shout_set_name(connection, name) != SHOUTERR_SUCCESS ||
-	    shout_set_user(connection, user) != SHOUTERR_SUCCESS ||
-	    shout_set_public(connection, is_public) != SHOUTERR_SUCCESS ||
-	    shout_set_format(connection, format) != SHOUTERR_SUCCESS ||
-	    shout_set_protocol(connection, protocol) != SHOUTERR_SUCCESS ||
-#ifdef SHOUT_TLS
-	    shout_set_tls(connection, tls) != SHOUTERR_SUCCESS ||
+	if (shout_set_meta(&connection, name, value) != SHOUTERR_SUCCESS)
+		throw std::runtime_error(shout_get_error(&connection));
+}
+
+static void
+SetOptionalMeta(shout_t &connection, const char *name, const char *value)
+{
+	if (value != nullptr)
+		SetMeta(connection, name, value);
+}
+
+inline void
+ShoutConfig::Setup(shout_t &connection) const
+{
+	if (shout_set_host(&connection, host) != SHOUTERR_SUCCESS ||
+	    shout_set_port(&connection, port) != SHOUTERR_SUCCESS ||
+	    shout_set_password(&connection, passwd) != SHOUTERR_SUCCESS ||
+	    shout_set_mount(&connection, mount) != SHOUTERR_SUCCESS ||
+	    shout_set_user(&connection, user) != SHOUTERR_SUCCESS ||
+	    shout_set_public(&connection, is_public) != SHOUTERR_SUCCESS ||
+#ifdef SHOUT_USAGE_AUDIO
+	    /* since libshout 2.4.3 */
+	    shout_set_content_format(&connection, format, SHOUT_USAGE_AUDIO,
+				     nullptr) != SHOUTERR_SUCCESS ||
+#else
+	    shout_set_format(&connection, format) != SHOUTERR_SUCCESS ||
 #endif
-	    shout_set_agent(connection, "MPD") != SHOUTERR_SUCCESS)
-		throw std::runtime_error(shout_get_error(connection));
+	    shout_set_protocol(&connection, protocol) != SHOUTERR_SUCCESS ||
+#ifdef SHOUT_TLS
+	    shout_set_tls(&connection, tls) != SHOUTERR_SUCCESS ||
+#endif
+	    shout_set_agent(&connection, "MPD") != SHOUTERR_SUCCESS)
+		throw std::runtime_error(shout_get_error(&connection));
+
+	SetMeta(connection, SHOUT_META_NAME, name);
 
 	/* optional paramters */
 
-	if (genre != nullptr && shout_set_genre(connection, genre))
-		throw std::runtime_error(shout_get_error(connection));
-
-	if (description != nullptr &&
-	    shout_set_description(connection, description))
-		throw std::runtime_error(shout_get_error(connection));
-
-	if (url != nullptr && shout_set_url(connection, url))
-		throw std::runtime_error(shout_get_error(connection));
+	SetOptionalMeta(connection, SHOUT_META_GENRE, genre);
+	SetOptionalMeta(connection, SHOUT_META_DESCRIPTION, description);
+	SetOptionalMeta(connection, SHOUT_META_URL, url);
 
 	if (quality != nullptr)
-		shout_set_audio_info(connection, SHOUT_AI_QUALITY, quality);
+		shout_set_audio_info(&connection, SHOUT_AI_QUALITY, quality);
 
 	if (bitrate != nullptr)
-		shout_set_audio_info(connection, SHOUT_AI_BITRATE, bitrate);
+		shout_set_audio_info(&connection, SHOUT_AI_BITRATE, bitrate);
 }
 
 void
@@ -274,7 +289,7 @@ ShoutOutput::Enable()
 		throw std::bad_alloc{};
 
 	try {
-		config.Setup(shout_conn);
+		config.Setup(*shout_conn);
 	} catch (...) {
 		shout_free(shout_conn);
 		throw;
@@ -418,7 +433,7 @@ ShoutOutput::Pause()
 }
 
 static void
-shout_tag_to_metadata(const Tag &tag, char *dest, size_t size)
+shout_tag_to_metadata(const Tag &tag, char *dest, size_t size) noexcept
 {
 	const char *artist = tag.GetValue(TAG_ARTIST);
 	const char *title = tag.GetValue(TAG_TITLE);
@@ -446,9 +461,15 @@ ShoutOutput::SendTag(const Tag &tag)
 		char song[1024];
 		shout_tag_to_metadata(tag, song, sizeof(song));
 
-		shout_metadata_add(meta, "song", song);
-		shout_metadata_add(meta, "charset", "UTF-8");
-		if (SHOUTERR_SUCCESS != shout_set_metadata(shout_conn, meta)) {
+		if (SHOUTERR_SUCCESS != shout_metadata_add(meta, "song", song) ||
+#ifdef SHOUT_FORMAT_TEXT
+		    /* since libshout 2.4.6 */
+		    SHOUTERR_SUCCESS != shout_set_metadata_utf8(shout_conn, meta)
+#else
+		    SHOUTERR_SUCCESS != shout_metadata_add(meta, "charset", "UTF-8") ||
+		    SHOUTERR_SUCCESS != shout_set_metadata(shout_conn, meta)
+#endif
+			) {
 			LogWarning(shout_output_domain,
 				   "error setting shout metadata");
 		}

src/output/plugins/meson.build

@@ -10,6 +10,7 @@ output_plugins_deps = [
 ]
 
 need_encoder = false
+need_wave_encoder = false
 
 if alsa_dep.found()
   output_plugins_sources += 'AlsaOutputPlugin.cxx'
@@ -99,7 +100,7 @@ if get_option('recorder')
   need_encoder = true
 endif
 
-libshout_dep = dependency('shout', required: get_option('shout'))
+libshout_dep = dependency('shout', version: '>= 2.4.0', required: get_option('shout'))
 output_features.set('HAVE_SHOUT', libshout_dep.found())
 if libshout_dep.found()
   output_plugins_sources += 'ShoutOutputPlugin.cxx'
@@ -127,9 +128,7 @@ if get_option('snapcast')
 
   output_features.set('HAVE_YAJL', yajl_dep.found())
 
-  # TODO: the Snapcast plugin needs just the "wave" encoder, but this
-  # enables all available encoders
-  need_encoder = true
+  need_wave_encoder = true
 endif
 
 enable_solaris_output = get_option('solaris_output')

src/output/plugins/wasapi/WasapiOutputPlugin.cxx

@@ -471,6 +471,16 @@ try {
 		}
 
 		UINT32 write_in_frames = buffer_size_in_frames;
+		DWORD mode = 0;
+		AtScopeExit(&) {
+			render_client->ReleaseBuffer(write_in_frames, mode);
+
+			if (!started) {
+				Start(client);
+				started = true;
+			}
+		};
+
 		if (!is_exclusive) {
 			UINT32 data_in_frames =
 				GetCurrentPaddingFrames(client);
@@ -481,7 +491,6 @@ try {
 		}
 
 		BYTE *data;
-		DWORD mode = 0;
 
 		if (HRESULT result =
 		    render_client->GetBuffer(write_in_frames, &data);
@@ -489,15 +498,6 @@ try {
 			throw MakeHResultError(result, "Failed to get buffer");
 		}
 
-		AtScopeExit(&) {
-			render_client->ReleaseBuffer(write_in_frames, mode);
-
-			if (!started) {
-				Start(client);
-				started = true;
-			}
-		};
-
 		const UINT32 write_size = write_in_frames * frame_size;
 		UINT32 new_data_size = 0;
 		new_data_size = spsc_buffer.pop(data, write_size);

src/pcm/LibsamplerateResampler.cxx

@@ -140,8 +140,7 @@ LibsampleratePcmResampler::Resample2(ConstBuffer<float> src)
 		throw FormatRuntimeError("libsamplerate has failed: %s",
 					 src_strerror(result));
 
-	return ConstBuffer<float>(data.data_out,
-				  data.output_frames_gen * channels);
+	return {data.data_out, size_t(data.output_frames_gen * channels)};
 }
 
 ConstBuffer<void>

src/pcm/meson.build

@@ -46,6 +46,7 @@ pcm_sources = [
   'GlueResampler.cxx',
   'FallbackResampler.cxx',
   'ConfiguredResampler.cxx',
+  'AudioCompress/compress.c',
 ]
 
 libsamplerate_dep = dependency('samplerate', version: '>= 0.1.3', required: get_option('libsamplerate'))