release v0.21.20

Fixes strange C++11 compatibility problems during GTest installation:

 /tmp/gtest-20200216-20679-mu1044/googletest/include/gtest/internal/gtest-internal.h:1249:1: error: unknown type name 'constexpr'
 constexpr bool TypedTestCaseIsDeprecated() { return true; }

 /tmp/gtest-20200216-20679-mu1044/googletest/include/gtest/internal/gtest-internal.h:1249:11: error: expected unqualified-id
 constexpr bool TypedTestCaseIsDeprecated() { return true; }

 /tmp/gtest-20200216-20679-mu1044/googletest/include/gtest/internal/gtest-internal.h:1254:1: error: unknown type name 'constexpr'
 constexpr bool RegisterTypedTestCase_P_IsDeprecated() { return true; }

.travis.yml

@@ -2,6 +2,72 @@ language: cpp
 
 matrix:
   include:
+    # Ubuntu Bionic (18.04) with GCC 7
+    - os: linux
+      dist: bionic
+      addons:
+        apt:
+          sources:
+            - sourceline: 'ppa:deadsnakes/ppa' # for Python 3.7 (required by Meson)
+          packages:
+            - libgtest-dev
+            - libboost-dev
+            - python3.6
+            - python3-urllib3
+            - ninja-build
+      before_install:
+        - wget https://bootstrap.pypa.io/get-pip.py
+        - /usr/bin/python3.6 get-pip.py --user --no-cache-dir
+      install:
+        - /usr/bin/python3.6 $HOME/.local/bin/pip install --user meson --no-cache-dir
+      env:
+        - MATRIX_EVAL="export PATH=\$HOME/.local/bin:\$PATH"
+
+    # Ubuntu Bionic (18.04) with GCC 7 on big-endian
+    - os: linux
+      arch: s390x
+      dist: bionic
+      addons:
+        apt:
+          sources:
+            - sourceline: 'ppa:deadsnakes/ppa' # for Python 3.7 (required by Meson)
+          packages:
+            - libgtest-dev
+            - libboost-dev
+            - python3.6
+            - python3-urllib3
+            - ninja-build
+      before_install:
+        - wget https://bootstrap.pypa.io/get-pip.py
+        - /usr/bin/python3.6 get-pip.py --user --no-cache-dir
+      install:
+        - /usr/bin/python3.6 $HOME/.local/bin/pip install --user meson --no-cache-dir
+      env:
+        - MATRIX_EVAL="export PATH=\$HOME/.local/bin:\$PATH"
+
+    # Ubuntu Bionic (18.04) with GCC 7 on ARM64
+    - os: linux
+      arch: arm64
+      dist: bionic
+      addons:
+        apt:
+          sources:
+            - sourceline: 'ppa:deadsnakes/ppa' # for Python 3.7 (required by Meson)
+          packages:
+            - libgtest-dev
+            - libboost-dev
+            - python3.6
+            - python3-urllib3
+            - ninja-build
+      before_install:
+        - wget https://bootstrap.pypa.io/get-pip.py
+        - /usr/bin/python3.6 get-pip.py --user --no-cache-dir
+      install:
+        - /usr/bin/python3.6 $HOME/.local/bin/pip install --user meson --no-cache-dir
+      env:
+        - MATRIX_EVAL="export PATH=\$HOME/.local/bin:\$PATH"
+
+    # Ubuntu Trusty (16.04) with GCC 6
     - os: linux
       dist: trusty
       addons:
@@ -20,13 +86,14 @@ matrix:
             - ninja-build
       before_install:
         - wget https://bootstrap.pypa.io/get-pip.py
-        - /usr/bin/python3.6 get-pip.py --user
+        - /usr/bin/python3.6 get-pip.py --user --no-cache-dir
       install:
-        - /usr/bin/python3.6 $HOME/.local/bin/pip install --user meson
+        - /usr/bin/python3.6 $HOME/.local/bin/pip install --user meson --no-cache-dir
       env:
         # use gold as workaround for https://sourceware.org/bugzilla/show_bug.cgi?id=17068
-        - MATRIX_EVAL="export CC=gcc-6 CXX=g++-6 LDFLAGS=-fuse-ld=gold PATH=$HOME/.local/bin:$PATH"
+        - MATRIX_EVAL="export CC='ccache gcc-6' CXX='ccache g++-6' LDFLAGS=-fuse-ld=gold PATH=\$HOME/.local/bin:\$PATH"
 
+    # Ubuntu Trusty (16.04) with GCC 8
     - os: linux
       dist: trusty
       addons:
@@ -45,31 +112,43 @@ matrix:
             - ninja-build
       before_install:
         - wget https://bootstrap.pypa.io/get-pip.py
-        - /usr/bin/python3.6 get-pip.py --user
+        - /usr/bin/python3.6 get-pip.py --user --no-cache-dir
       install:
-        - /usr/bin/python3.6 $HOME/.local/bin/pip install --user meson
+        - /usr/bin/python3.6 $HOME/.local/bin/pip install --user meson --no-cache-dir
       env:
         # use gold as workaround for https://sourceware.org/bugzilla/show_bug.cgi?id=17068
-        - MATRIX_EVAL="export CC=gcc-8 CXX=g++-8 LDFLAGS=-fuse-ld=gold PATH=$HOME/.local/bin:$PATH"
+        - MATRIX_EVAL="export CC='ccache gcc-8' CXX='ccache g++-8' LDFLAGS=-fuse-ld=gold PATH=\$HOME/.local/bin:\$PATH"
 
     - os: osx
-      osx_image: xcode9.3beta
+      osx_image: xcode9.4
+      addons:
+        homebrew:
+          packages:
+            - ccache
+            - meson
       env:
-        - MATRIX_EVAL=""
+        - MATRIX_EVAL="export PATH=/usr/local/opt/ccache/libexec:$PATH HOMEBREW_NO_ANALYTICS=1"
 
 cache:
-  - apt
-  - ccache
+  apt: true
+  ccache: true
+  directories:
+    - $HOME/Library/Caches/Homebrew
+
+before_cache:
+  - test "$TRAVIS_OS_NAME" != "osx" || brew cleanup
 
 before_install:
   - eval "${MATRIX_EVAL}"
-  # C++14
-  - test "$TRAVIS_OS_NAME" != "osx" || brew update
 
 install:
   # C++14
-  - test "$TRAVIS_OS_NAME" != "osx" || brew install ccache meson
-  - test "$TRAVIS_OS_NAME" != "osx" || brew install --HEAD https://gist.githubusercontent.com/Kronuz/96ac10fbd8472eb1e7566d740c4034f8/raw/gtest.rb
+
+  # Work around "Target /usr/local/lib/libgtest.a is a symlink
+  # belonging to nss. You can unlink it" during gtest install
+  - test "$TRAVIS_OS_NAME" != "osx" || brew unlink nss
+
+  - test "$TRAVIS_OS_NAME" != "osx" || brew install https://gist.githubusercontent.com/Kronuz/96ac10fbd8472eb1e7566d740c4034f8/raw/gtest.rb
 
 before_script:
   - ccache -s

NEWS

@@ -1,3 +1,28 @@
+ver 0.21.20 (2020/02/16)
+* decoder
+  - audiofile, ffmpeg, sndfile: handle MIME type "audio/wav"
+  - ffmpeg: fix playback of AIFF and TTA
+  - vorbis, opus: fix seeking in small files
+* fix backwards seeking on ARM (and other non-x86 CPUs)
+
+ver 0.21.19 (2020/01/17)
+* configuration
+  - allow overriding top-level settings in includes
+* output
+  - pulse: obey Pulse's maximum sample rate (fixes DSD128 playback)
+* fix build failure with clang 10
+* fix build failure with Android NDK r20
+
+ver 0.21.18 (2019/12/24)
+* protocol
+  - work around Mac OS X bug in the ISO 8601 parser
+* output
+  - alsa: fix hang bug with ALSA "null" outputs
+* storage
+  - curl: fix crash bug
+* drop support for CURL versions older than 7.32.0
+* reduce unnecessary CPU wakeups
+
 ver 0.21.17 (2019/12/16)
 * protocol
   - relax the ISO 8601 parser: allow omitting field separators, the

android/AndroidManifest.xml

@@ -2,10 +2,10 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="org.musicpd"
           android:installLocation="auto"
-          android:versionCode="40"
-          android:versionName="0.21.17">
+          android:versionCode="43"
+          android:versionName="0.21.20">
 
-  <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="26"/>
+  <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28"/>
 
   <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
   <uses-permission android:name="android.permission.WAKE_LOCK"/>

android/build.py

@@ -25,16 +25,15 @@ android_abis = {
         'arch': 'arm-linux-androideabi',
         'ndk_arch': 'arm',
         'toolchain_arch': 'arm-linux-androideabi',
-        'llvm_triple': 'armv7-none-linux-androideabi',
+        'llvm_triple': 'armv7-linux-androideabi',
         'cflags': '-march=armv7-a -mfpu=vfp -mfloat-abi=softfp',
     },
 
     'arm64-v8a': {
-        'android_api_level': '21',
         'arch': 'aarch64-linux-android',
         'ndk_arch': 'arm64',
         'toolchain_arch': 'aarch64-linux-android',
-        'llvm_triple': 'aarch64-none-linux-android',
+        'llvm_triple': 'aarch64-linux-android',
         'cflags': '',
     },
 
@@ -42,9 +41,17 @@ android_abis = {
         'arch': 'i686-linux-android',
         'ndk_arch': 'x86',
         'toolchain_arch': 'x86',
-        'llvm_triple': 'i686-none-linux-android',
+        'llvm_triple': 'i686-linux-android',
         'cflags': '-march=i686 -mtune=intel -mssse3 -mfpmath=sse -m32',
     },
+
+    'x86_64': {
+        'arch': 'x86_64-linux-android',
+        'ndk_arch': 'x86_64',
+        'toolchain_arch': 'x86_64',
+        'llvm_triple': 'x86_64-linux-android',
+        'cflags': '-m64',
+    },
 }
 
 # select the NDK target
@@ -76,24 +83,18 @@ class AndroidNdkToolchain:
 
         ndk_arch = abi_info['ndk_arch']
         android_api_level = '21'
-        ndk_platform = 'android-' + android_api_level
 
         # select the NDK compiler
         gcc_version = '4.9'
 
-        ndk_platform_path = os.path.join(ndk_path, 'platforms', ndk_platform)
-        sysroot = os.path.join(ndk_path, 'sysroot')
-        target_root = os.path.join(ndk_platform_path, 'arch-' + ndk_arch)
-
         install_prefix = os.path.join(arch_path, 'root')
 
         self.arch = arch
         self.install_prefix = install_prefix
-        self.sysroot = sysroot
 
         toolchain_path = os.path.join(ndk_path, 'toolchains', abi_info['toolchain_arch'] + '-' + gcc_version, 'prebuilt', build_arch)
         llvm_path = os.path.join(ndk_path, 'toolchains', 'llvm', 'prebuilt', build_arch)
-        llvm_triple = abi_info['llvm_triple']
+        llvm_triple = abi_info['llvm_triple'] + android_api_level
 
         common_flags = '-Os -g'
         common_flags += ' -fPIC'
@@ -107,6 +108,9 @@ class AndroidNdkToolchain:
 
         common_flags += ' -fvisibility=hidden -fdata-sections -ffunction-sections'
 
+        # required flags from https://android.googlesource.com/platform/ndk/+/ndk-release-r20/docs/BuildSystemMaintainers.md#additional-required-arguments
+        common_flags += ' -fno-addrsig'
+
         self.ar = os.path.join(toolchain_bin, arch + '-ar')
         self.ranlib = os.path.join(toolchain_bin, arch + '-ranlib')
         self.nm = os.path.join(toolchain_bin, arch + '-nm')
@@ -114,15 +118,11 @@ class AndroidNdkToolchain:
 
         self.cflags = common_flags
         self.cxxflags = common_flags
-        self.cppflags = '--sysroot=' + sysroot + \
-            ' -isystem ' + os.path.join(install_prefix, 'include') + \
-            ' -isystem ' + os.path.join(sysroot, 'usr', 'include', arch) + \
-            ' -D__ANDROID_API__=' + android_api_level
-        self.ldflags = '--sysroot=' + sysroot + \
-            ' -L' + os.path.join(install_prefix, 'lib') + \
-            ' -L' + os.path.join(target_root, 'usr', 'lib') + \
-            ' -B' + os.path.join(target_root, 'usr', 'lib') + \
+        self.cppflags = ' -isystem ' + os.path.join(install_prefix, 'include')
+        self.ldflags = ' -L' + os.path.join(install_prefix, 'lib') + \
+            ' -Wl,--exclude-libs=ALL' + \
             ' ' + common_flags
+        self.ldflags = common_flags
         self.libs = ''
 
         self.is_arm = ndk_arch == 'arm'
@@ -130,13 +130,10 @@ class AndroidNdkToolchain:
         self.is_aarch64 = ndk_arch == 'arm64'
         self.is_windows = False
 
-        libcxx_path = os.path.join(ndk_path, 'sources/cxx-stl/llvm-libc++')
-        libcxx_libs_path = os.path.join(libcxx_path, 'libs', android_abi)
-
         libstdcxx_flags = ''
-        libstdcxx_cxxflags = libstdcxx_flags + ' -isystem ' + os.path.join(libcxx_path, 'include') + ' -isystem ' + os.path.join(ndk_path, 'sources/android/support/include')
-        libstdcxx_ldflags = libstdcxx_flags + ' -L' + libcxx_libs_path
-        libstdcxx_libs = '-lc++_static -lc++abi'
+        libstdcxx_cxxflags = ''
+        libstdcxx_ldflags = ''
+        libstdcxx_libs = '-static-libstdc++'
 
         if self.is_armv7:
             # On 32 bit ARM, clang generates no ".eh_frame" section;

doc/conf.py

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

meson.build

@@ -1,7 +1,7 @@
 project(
   'mpd',
   ['c', 'cpp'],
-  version: '0.21.17',
+  version: '0.21.20',
   meson_version: '>= 0.49.0',
   default_options: [
     'c_std=c99',
@@ -88,6 +88,10 @@ test_ldflags = [
 ]
 
 if get_option('buildtype') != 'debug'
+  test_cxxflags += [
+    '-ffunction-sections',
+    '-fdata-sections',
+  ]
   test_cflags += [
     '-ffunction-sections',
     '-fdata-sections',

python/build/libs.py

@@ -9,8 +9,8 @@ from build.ffmpeg import FfmpegProject
 from build.boost import BoostProject
 
 libmpdclient = MesonProject(
-    'https://www.musicpd.org/download/libmpdclient/2/libmpdclient-2.16.tar.xz',
-    'fa6bdab67c0e0490302b38f00c27b4959735c3ec8aef7a88327adb1407654464',
+    'https://www.musicpd.org/download/libmpdclient/2/libmpdclient-2.17.tar.xz',
+    'ee9b8f1c7e95b65c8f18a354daf7b16bfcd455fc52a0f3b5abe402316bce3559',
     'lib/libmpdclient.a',
 )
 
@@ -52,8 +52,8 @@ opus = AutotoolsProject(
 )
 
 flac = AutotoolsProject(
-    'http://downloads.xiph.org/releases/flac/flac-1.3.2.tar.xz',
-    '91cfc3ed61dc40f47f050a109b08610667d73477af6ef36dcad31c31a4a8d53f',
+    'http://downloads.xiph.org/releases/flac/flac-1.3.3.tar.xz',
+    '213e82bd716c9de6db2f98bcadbc4c24c7e2efe8c75939a1a84e28539c4e1748',
     'lib/libFLAC.a',
     [
         '--disable-shared', '--enable-static',
@@ -112,8 +112,8 @@ liblame = AutotoolsProject(
 )
 
 ffmpeg = FfmpegProject(
-    'http://ffmpeg.org/releases/ffmpeg-4.2.1.tar.xz',
-    'cec7c87e9b60d174509e263ac4011b522385fd0775292e1670ecc1180c9bb6d4',
+    'http://ffmpeg.org/releases/ffmpeg-4.2.2.tar.xz',
+    'cb754255ab0ee2ea5f66f8850e1bd6ad5cac1cd855d0a2f4990fb8c668b0d29c',
     'lib/libavcodec.a',
     [
         '--disable-shared', '--enable-static',
@@ -341,8 +341,8 @@ ffmpeg = FfmpegProject(
 )
 
 curl = AutotoolsProject(
-    'http://curl.haxx.se/download/curl-7.66.0.tar.xz',
-    'dbb48088193016d079b97c5c3efde8efa56ada2ebf336e8a97d04eb8e2ed98c1',
+    'http://curl.haxx.se/download/curl-7.68.0.tar.xz',
+    'b724240722276a27f6e770b952121a3afd097129d8c9fe18e6272dc34192035a',
     'lib/libcurl.a',
     [
         '--disable-shared', '--enable-static',
@@ -358,6 +358,11 @@ curl = AutotoolsProject(
         '--disable-manual',
         '--disable-threaded-resolver', '--disable-verbose', '--disable-sspi',
         '--disable-crypto-auth', '--disable-ntlm-wb', '--disable-tls-srp', '--disable-cookies',
+        '--disable-doh',
+        '--disable-mime',
+        '--disable-netrc',
+        '--disable-progress-meter',
+        '--disable-alt-svc',
         '--without-ssl', '--without-gnutls', '--without-nss', '--without-libssh2',
     ],
 
@@ -365,8 +370,8 @@ curl = AutotoolsProject(
 )
 
 libexpat = AutotoolsProject(
-    'https://github.com/libexpat/libexpat/releases/download/R_2_2_7/expat-2.2.7.tar.bz2',
-    'cbc9102f4a31a8dafd42d642e9a3aa31e79a0aedaa1f6efd2795ebc83174ec18',
+    'https://github.com/libexpat/libexpat/releases/download/R_2_2_9/expat-2.2.9.tar.bz2',
+    'f1063084dc4302a427dabcca499c8312b3a32a29b7d2506653ecc8f950a9a237',
     'lib/libexpat.a',
     [
         '--disable-shared', '--enable-static',
@@ -392,7 +397,7 @@ libnfs = AutotoolsProject(
 )
 
 boost = BoostProject(
-    'https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2',
-    'd73a8da01e8bf8c7eda40b4c84915071a8c8a0df4a6734537ddde4a8580524ee',
+    'https://dl.bintray.com/boostorg/release/1.72.0/source/boost_1_72_0.tar.bz2',
+    '59c9b274bc451cf91a9ba1dd2c7fdcaf5d60b1b3aa83f2c9fa143417cc660722',
     'include/boost/version.hpp',
 )

src/config/File.cxx

@@ -153,11 +153,9 @@ ReadConfigParam(ConfigData &config_data, BufferedReader &reader,
 			      name, reader.GetLineNumber());
 
 	if (!option.repeatable)
-		if (const auto *param = config_data.GetParam(o))
-			throw FormatRuntimeError("config parameter \"%s\" is first defined "
-						 "on line %d and redefined on line %u\n",
-						 name, param->line,
-						 reader.GetLineNumber());
+		/* if the option is not repeatable, override the old
+		   value by removing it first */
+		config_data.GetParamList(o).clear();
 
 	/* now parse the block or the value */
 

src/decoder/plugins/AudiofileDecoderPlugin.cxx

@@ -269,6 +269,8 @@ static const char *const audiofile_suffixes[] = {
 };
 
 static const char *const audiofile_mime_types[] = {
+	"audio/wav",
+	"audio/aiff",
 	"audio/x-wav",
 	"audio/x-aiff",
 	nullptr

src/decoder/plugins/FfmpegDecoderPlugin.cxx

@@ -762,7 +762,7 @@ static const char *const ffmpeg_mime_types[] = {
 	"audio/aac",
 	"audio/aacp",
 	"audio/ac3",
-	"audio/aiff"
+	"audio/aiff",
 	"audio/amr",
 	"audio/basic",
 	"audio/flac",
@@ -775,12 +775,13 @@ static const char *const ffmpeg_mime_types[] = {
 	"audio/qcelp",
 	"audio/vorbis",
 	"audio/vorbis+ogg",
+	"audio/wav",
 	"audio/x-8svx",
 	"audio/x-16sv",
 	"audio/x-aac",
 	"audio/x-ac3",
 	"audio/x-adx",
-	"audio/x-aiff"
+	"audio/x-aiff",
 	"audio/x-alaw",
 	"audio/x-au",
 	"audio/x-dca",
@@ -800,7 +801,7 @@ static const char *const ffmpeg_mime_types[] = {
 	"audio/x-pn-realaudio",
 	"audio/x-pn-multirate-realaudio",
 	"audio/x-speex",
-	"audio/x-tta"
+	"audio/x-tta",
 	"audio/x-voc",
 	"audio/x-wav",
 	"audio/x-wma",

src/decoder/plugins/MadDecoderPlugin.cxx

@@ -793,7 +793,7 @@ MadDecoder::DecodeFirstFrame(Tag *tag) noexcept
 
 	if (max_frames > 8 * 1024 * 1024) {
 		FormatWarning(mad_domain,
-			      "mp3 file header indicates too many frames: %lu",
+			      "mp3 file header indicates too many frames: %zu",
 			      max_frames);
 		return false;
 	}

src/decoder/plugins/OggDecoder.cxx

@@ -47,8 +47,12 @@ OggDecoder::LoadEndPacket(ogg_packet &packet) const
 		DecoderReader reader(client, input_stream);
 		OggSyncState sync2(reader);
 		OggStreamState stream2(GetSerialNo());
+
+		/* passing synced=false because we're inside an
+		   OggVisitor callback, and our InputStream may be in
+		   the middle of an Ogg packet */
 		result = OggSeekFindEOS(sync2, stream2, packet,
-					input_stream);
+					input_stream, false);
 	}
 
 	/* restore the previous file position */

src/decoder/plugins/SndfileDecoderPlugin.cxx

@@ -322,6 +322,8 @@ static const char *const sndfile_suffixes[] = {
 };
 
 static const char *const sndfile_mime_types[] = {
+	"audio/wav",
+	"audio/aiff",
 	"audio/x-wav",
 	"audio/x-aiff",
 

src/event/Loop.cxx

@@ -137,7 +137,8 @@ static constexpr int
 ExportTimeoutMS(std::chrono::steady_clock::duration timeout)
 {
 	return timeout >= timeout.zero()
-		? int(std::chrono::duration_cast<std::chrono::milliseconds>(timeout).count())
+		/* round up (+1) to avoid unnecessary wakeups */
+		? int(std::chrono::duration_cast<std::chrono::milliseconds>(timeout).count()) + 1
 		: -1;
 }
 
@@ -220,7 +221,6 @@ EventLoop::Run() noexcept
 	} while (!quit);
 
 #ifndef NDEBUG
-	assert(busy);
 	assert(thread.IsInside());
 #endif
 }

src/event/MultiSocketMonitor.cxx

@@ -22,6 +22,10 @@
 
 #include <algorithm>
 
+#ifdef USE_EPOLL
+#include <errno.h>
+#endif
+
 #ifndef _WIN32
 #include <poll.h>
 #endif
@@ -37,17 +41,42 @@ MultiSocketMonitor::Reset() noexcept
 	assert(GetEventLoop().IsInside());
 
 	fds.clear();
+#ifdef USE_EPOLL
+	always_ready_fds.clear();
+#endif
 	IdleMonitor::Cancel();
 	timeout_event.Cancel();
 	ready = refresh = false;
 }
 
+bool
+MultiSocketMonitor::AddSocket(SocketDescriptor fd, unsigned events) noexcept
+{
+	fds.emplace_front(*this, fd);
+	bool success = fds.front().Schedule(events);
+	if (!success) {
+		fds.pop_front();
+
+#ifdef USE_EPOLL
+		if (errno == EPERM)
+			/* not supported by epoll (e.g. "/dev/null"):
+			   add it to the "always ready" list */
+			always_ready_fds.push_front({fd, events});
+#endif
+	}
+
+	return success;
+}
+
 void
 MultiSocketMonitor::ClearSocketList() noexcept
 {
 	assert(GetEventLoop().IsInside());
 
 	fds.clear();
+#ifdef USE_EPOLL
+	always_ready_fds.clear();
+#endif
 }
 
 #ifndef _WIN32
@@ -55,6 +84,10 @@ MultiSocketMonitor::ClearSocketList() noexcept
 void
 MultiSocketMonitor::ReplaceSocketList(pollfd *pfds, unsigned n) noexcept
 {
+#ifdef USE_EPOLL
+	always_ready_fds.clear();
+#endif
+
 	pollfd *const end = pfds + n;
 
 	UpdateSocketList([pfds, end](SocketDescriptor fd) -> unsigned {
@@ -64,9 +97,7 @@ MultiSocketMonitor::ReplaceSocketList(pollfd *pfds, unsigned n) noexcept
 			if (i == end)
 				return 0;
 
-			auto events = i->events;
-			i->events = 0;
-			return events;
+			return std::exchange(i->events, 0);
 		});
 
 	for (auto i = pfds; i != end; ++i)
@@ -79,7 +110,20 @@ MultiSocketMonitor::ReplaceSocketList(pollfd *pfds, unsigned n) noexcept
 void
 MultiSocketMonitor::Prepare() noexcept
 {
-	const auto timeout = PrepareSockets();
+	auto timeout = PrepareSockets();
+
+#ifdef USE_EPOLL
+	if (!always_ready_fds.empty()) {
+		/* if there was at least one file descriptor not
+		   supported by epoll, install a very short timeout
+		   because we assume it's always ready */
+		constexpr std::chrono::steady_clock::duration ready_timeout =
+			std::chrono::milliseconds(1);
+		if (timeout < timeout.zero() || timeout > ready_timeout)
+			timeout = ready_timeout;
+	}
+#endif
+
 	if (timeout >= timeout.zero())
 		timeout_event.Schedule(timeout);
 	else

src/event/MultiSocketMonitor.hxx

@@ -50,12 +50,10 @@ class MultiSocketMonitor : IdleMonitor
 		unsigned revents;
 
 	public:
-		SingleFD(MultiSocketMonitor &_multi, SocketDescriptor _fd,
-			 unsigned events) noexcept
+		SingleFD(MultiSocketMonitor &_multi,
+			 SocketDescriptor _fd) noexcept
 			:SocketMonitor(_fd, _multi.GetEventLoop()),
-			multi(_multi), revents(0) {
-			Schedule(events);
-		}
+			multi(_multi), revents(0) {}
 
 		SocketDescriptor GetSocket() const noexcept {
 			return SocketMonitor::GetSocket();
@@ -86,8 +84,6 @@ class MultiSocketMonitor : IdleMonitor
 		}
 	};
 
-	friend class SingleFD;
-
 	TimerEvent timeout_event;
 
 	/**
@@ -106,6 +102,21 @@ class MultiSocketMonitor : IdleMonitor
 
 	std::forward_list<SingleFD> fds;
 
+#ifdef USE_EPOLL
+	struct AlwaysReady {
+		const SocketDescriptor fd;
+		const unsigned revents;
+	};
+
+	/**
+	 * A list of file descriptors which are always ready.  This is
+	 * a kludge needed because the ALSA output plugin gives us a
+	 * file descriptor to /dev/null, which is incompatible with
+	 * epoll (epoll_ctl() returns -EPERM).
+	 */
+	std::forward_list<AlwaysReady> always_ready_fds;
+#endif
+
 public:
 	static constexpr unsigned READ = SocketMonitor::READ;
 	static constexpr unsigned WRITE = SocketMonitor::WRITE;
@@ -147,9 +158,7 @@ public:
 	 *
 	 * May only be called from PrepareSockets().
 	 */
-	void AddSocket(SocketDescriptor fd, unsigned events) noexcept {
-		fds.emplace_front(*this, fd, events);
-	}
+	bool AddSocket(SocketDescriptor fd, unsigned events) noexcept;
 
 	/**
 	 * Remove all sockets.
@@ -204,6 +213,11 @@ public:
 				i.ClearReturnedEvents();
 			}
 		}
+
+#ifdef USE_EPOLL
+		for (const auto &i : always_ready_fds)
+			f(i.fd, i.revents);
+#endif
 	}
 
 protected:
@@ -232,7 +246,6 @@ private:
 
 	void OnTimeout() noexcept {
 		SetReady();
-		IdleMonitor::Schedule();
 	}
 
 	virtual void OnIdle() noexcept final;

src/event/SocketMonitor.cxx

@@ -68,20 +68,24 @@ SocketMonitor::Close() noexcept
 	Steal().Close();
 }
 
-void
+bool
 SocketMonitor::Schedule(unsigned flags) noexcept
 {
 	assert(IsDefined());
 
 	if (flags == GetScheduledFlags())
-		return;
+		return true;
 
+	bool success;
 	if (scheduled_flags == 0)
-		loop.AddFD(fd.Get(), flags, *this);
+		success = loop.AddFD(fd.Get(), flags, *this);
 	else if (flags == 0)
-		loop.RemoveFD(fd.Get(), *this);
+		success = loop.RemoveFD(fd.Get(), *this);
 	else
-		loop.ModifyFD(fd.Get(), flags, *this);
+		success = loop.ModifyFD(fd.Get(), flags, *this);
 
-	scheduled_flags = flags;
+	if (success)
+		scheduled_flags = flags;
+
+	return success;
 }

src/event/SocketMonitor.hxx

@@ -98,18 +98,22 @@ public:
 		return scheduled_flags;
 	}
 
-	void Schedule(unsigned flags) noexcept;
+	/**
+	 * @return true on success, false on error (with errno set if
+	 * USE_EPOLL is defined)
+	 */
+	bool Schedule(unsigned flags) noexcept;
 
 	void Cancel() noexcept {
 		Schedule(0);
 	}
 
-	void ScheduleRead() noexcept {
-		Schedule(GetScheduledFlags() | READ | HANGUP | ERROR);
+	bool ScheduleRead() noexcept {
+		return Schedule(GetScheduledFlags() | READ | HANGUP | ERROR);
 	}
 
-	void ScheduleWrite() noexcept {
-		Schedule(GetScheduledFlags() | WRITE);
+	bool ScheduleWrite() noexcept {
+		return Schedule(GetScheduledFlags() | WRITE);
 	}
 
 	void CancelRead() noexcept {

src/input/plugins/CurlInputPlugin.cxx

@@ -180,7 +180,6 @@ CurlInputStream::FreeEasyIndirect() noexcept
 {
 	BlockingCall(GetEventLoop(), [this](){
 			FreeEasy();
-			(*curl_init)->InvalidateSockets();
 		});
 }
 

src/lib/curl/Global.cxx

@@ -181,8 +181,6 @@ CurlGlobal::Remove(CURL *easy) noexcept
 	assert(easy != nullptr);
 
 	curl_multi_remove_handle(multi.Get(), easy);
-
-	InvalidateSockets();
 }
 
 static CurlRequest *
@@ -227,12 +225,12 @@ CurlGlobal::UpdateTimeout(long timeout_ms) noexcept
 		return;
 	}
 
-	if (timeout_ms < 10)
-		/* CURL 7.21.1 likes to report "timeout=0", which
+	if (timeout_ms < 1)
+		/* CURL's threaded resolver sets a timeout of 0ms, which
 		   means we're running in a busy loop.  Quite a bad
 		   idea to waste so much CPU.  Let's use a lower limit
-		   of 10ms. */
-		timeout_ms = 10;
+		   of 1ms. */
+		timeout_ms = 1;
 
 	timeout_event.Schedule(std::chrono::milliseconds(timeout_ms));
 }

src/lib/curl/Global.hxx

@@ -74,16 +74,6 @@ public:
 		SocketAction(CURL_SOCKET_TIMEOUT, 0);
 	}
 
-	/**
-	 * This is a kludge to allow pausing/resuming a stream with
-	 * libcurl < 7.32.0.  Read the curl_easy_pause manpage for
-	 * more information.
-	 */
-	void ResumeSockets() {
-		int running_handles;
-		curl_multi_socket_all(multi.Get(), &running_handles);
-	}
-
 private:
 	void UpdateTimeout(long timeout_ms) noexcept;
 	static int TimerFunction(CURLM *global, long timeout_ms,

src/lib/curl/Request.cxx

@@ -30,7 +30,6 @@
 #include "config.h"
 #include "Request.hxx"
 #include "Global.hxx"
-#include "Version.hxx"
 #include "Handler.hxx"
 #include "event/Call.hxx"
 #include "util/RuntimeError.hxx"
@@ -124,12 +123,6 @@ CurlRequest::Resume() noexcept
 
 	curl_easy_pause(easy.Get(), CURLPAUSE_CONT);
 
-	if (IsCurlOlderThan(0x072000))
-		/* libcurl older than 7.32.0 does not update
-		   its sockets after curl_easy_pause(); force
-		   libcurl to do it now */
-		global.ResumeSockets();
-
 	global.InvalidateSockets();
 }
 

src/lib/curl/meson.build

@@ -1,4 +1,4 @@
-curl_dep = dependency('libcurl', version: '>= 7.18', required: get_option('curl'))
+curl_dep = dependency('libcurl', version: '>= 7.32', required: get_option('curl'))
 conf.set('ENABLE_CURL', curl_dep.found())
 if not curl_dep.found()
   subdir_done()

src/lib/xiph/OggFind.cxx

@@ -57,13 +57,14 @@ OggSeekPageAtOffset(OggSyncState &oy, ogg_stream_state &os, InputStream &is,
 
 bool
 OggSeekFindEOS(OggSyncState &oy, ogg_stream_state &os, ogg_packet &packet,
-	       InputStream &is)
+	       InputStream &is, bool synced)
 {
 	if (!is.KnownSize())
 		return false;
 
 	if (is.GetRest() < 65536)
-		return OggFindEOS(oy, os, packet);
+		return (synced || oy.ExpectPageSeekIn(os)) &&
+			OggFindEOS(oy, os, packet);
 
 	if (!is.CheapSeeking())
 		return false;

src/lib/xiph/OggFind.hxx

@@ -47,10 +47,13 @@ OggSeekPageAtOffset(OggSyncState &oy, ogg_stream_state &os, InputStream &is,
  * Try to find the end-of-stream (EOS) packet.  Seek to the end of the
  * file if necessary.
  *
+ * @param synced is the #OggSyncState currently synced?  If not, then
+ * we need to use ogg_sync_pageseek() instead of ogg_sync_pageout(),
+ * which is more expensive
  * @return true if the EOS packet was found
  */
 bool
 OggSeekFindEOS(OggSyncState &oy, ogg_stream_state &os, ogg_packet &packet,
-	       InputStream &is);
+	       InputStream &is, bool synced=true);
 
 #endif

src/output/plugins/PulseOutputPlugin.cxx

@@ -650,7 +650,7 @@ PulseOutput::Open(AudioFormat &audio_format)
 		break;
 	}
 
-	ss.rate = audio_format.sample_rate;
+	ss.rate = std::min(audio_format.sample_rate, PA_RATE_MAX);
 	ss.channels = audio_format.channels;
 
 	/* create a stream .. */

src/player/Thread.cxx

@@ -46,6 +46,7 @@
 #include "CrossFade.hxx"
 #include "tag/Tag.hxx"
 #include "Idle.hxx"
+#include "util/Compiler.h"
 #include "util/Domain.hxx"
 #include "thread/Name.hxx"
 #include "Log.hxx"
@@ -1171,6 +1172,7 @@ try {
 			}
 
 			/* fall through */
+			gcc_fallthrough;
 
 		case PlayerCommand::PAUSE:
 			next_song.reset();

src/protocol/ArgParser.cxx

@@ -175,5 +175,5 @@ SignedSongTime
 ParseCommandArgSignedSongTime(const char *s)
 {
 	auto value = ParseCommandArgFloat(s);
-	return SongTime::FromS(value);
+	return SignedSongTime::FromS(value);
 }

src/storage/plugins/CurlStorage.cxx

@@ -109,7 +109,9 @@ public:
 			     BIND_THIS_METHOD(OnDeferredStart)),
 		 request(curl, uri, *this) {
 		// TODO: use CurlInputStream's configuration
+	}
 
+	void DeferStart() noexcept {
 		/* start the transfer inside the IOThread */
 		defer_start.Schedule();
 	}
@@ -283,6 +285,7 @@ public:
 	}
 
 	using BlockingHttpRequest::GetEasy;
+	using BlockingHttpRequest::DeferStart;
 	using BlockingHttpRequest::Wait;
 
 protected:
@@ -430,6 +433,7 @@ public:
 	}
 
 	const StorageFileInfo &Perform() {
+		DeferStart();
 		Wait();
 		return info;
 	}
@@ -481,6 +485,7 @@ public:
 		 base_path(UriPathOrSlash(uri)) {}
 
 	std::unique_ptr<StorageDirectoryReader> Perform() {
+		DeferStart();
 		Wait();
 		return ToReader();
 	}

src/time/ISO8601.cxx

@@ -58,6 +58,8 @@ FormatISO8601(std::chrono::system_clock::time_point tp)
 	return FormatISO8601(GmTime(tp));
 }
 
+#ifndef _WIN32
+
 static std::pair<unsigned, unsigned>
 ParseTimeZoneOffsetRaw(const char *&s)
 {
@@ -108,6 +110,67 @@ ParseTimeZoneOffset(const char *&s)
 	return d;
 }
 
+static const char *
+ParseTimeOfDay(const char *s, struct tm &tm,
+	       std::chrono::system_clock::duration &precision) noexcept
+{
+	/* this function always checks "end==s" to work around a
+	   strptime() bug on OS X: if nothing could be parsed,
+	   strptime() returns the input string (indicating success)
+	   instead of nullptr (indicating error) */
+
+	const char *end = strptime(s, "%H", &tm);
+	if (end == nullptr || end == s)
+		return end;
+
+	s = end;
+	precision = std::chrono::hours(1);
+
+	if (*s == ':') {
+		/* with field separators: now a minute must follow */
+
+		++s;
+
+		end = strptime(s, "%M", &tm);
+		if (end == nullptr || end == s)
+			return nullptr;
+
+		s = end;
+		precision = std::chrono::minutes(1);
+
+		/* the "seconds" field is optional */
+		if (*s != ':')
+			return s;
+
+		++s;
+
+		end = strptime(s, "%S", &tm);
+		if (end == nullptr || end == s)
+			return nullptr;
+
+		precision = std::chrono::seconds(1);
+		return end;
+	}
+
+	/* without field separators */
+
+	end = strptime(s, "%M", &tm);
+	if (end == nullptr || end == s)
+		return s;
+
+	s = end;
+	precision = std::chrono::minutes(1);
+
+	end = strptime(s, "%S", &tm);
+	if (end == nullptr || end == s)
+		return s;
+
+	precision = std::chrono::seconds(1);
+	return end;
+}
+
+#endif
+
 std::pair<std::chrono::system_clock::time_point,
 	  std::chrono::system_clock::duration>
 ParseISO8601(const char *s)
@@ -138,22 +201,9 @@ ParseISO8601(const char *s)
 	if (*s == 'T') {
 		++s;
 
-		if ((end = strptime(s, "%T", &tm)) != nullptr)
-			precision = std::chrono::seconds(1);
-		else if ((end = strptime(s, "%H%M%S", &tm)) != nullptr)
-			/* no field separators */
-			precision = std::chrono::seconds(1);
-		else if ((end = strptime(s, "%H%M", &tm)) != nullptr)
-			/* no field separators */
-			precision = std::chrono::minutes(1);
-		else if ((end = strptime(s, "%H:%M", &tm)) != nullptr)
-			precision = std::chrono::minutes(1);
-		else if ((end = strptime(s, "%H", &tm)) != nullptr)
-			precision = std::chrono::hours(1);
-		else
+		s = ParseTimeOfDay(s, tm, precision);
+		if (s == nullptr)
 			throw std::runtime_error("Failed to parse time of day");
-
-		s = end;
 	}
 
 	auto tp = TimeGm(tm);

src/util/Compiler.h

@@ -143,6 +143,14 @@
 #define gcc_flatten
 #endif
 
+#if GCC_CHECK_VERSION(7,0)
+#define gcc_fallthrough __attribute__((fallthrough))
+#elif CLANG_CHECK_VERSION(10,0) && defined(__cplusplus)
+#define gcc_fallthrough [[fallthrough]]
+#else
+#define gcc_fallthrough
+#endif
+
 #ifndef __cplusplus
 /* plain C99 has "restrict" */
 #define gcc_restrict restrict

src/util/format.c

@@ -19,6 +19,7 @@
  */
 
 #include "format.h"
+#include "util/Compiler.h"
 
 #include <stdbool.h>
 #include <stdio.h>
@@ -238,6 +239,7 @@ format_object2(const char *format, const char **last, const void *object,
 			}
 
 			/* fall through */
+			gcc_fallthrough;
 
 		default:
 			/* pass-through non-escaped portions of the format string */

test/DumpDecoderClient.cxx

@@ -28,15 +28,15 @@
 
 void
 DumpDecoderClient::Ready(const AudioFormat audio_format,
-			 gcc_unused bool seekable,
+			 bool seekable,
 			 SignedSongTime duration)
 {
 	assert(!initialized);
 	assert(audio_format.IsValid());
 
-	fprintf(stderr, "audio_format=%s duration=%f\n",
+	fprintf(stderr, "audio_format=%s duration=%f seekable=%d\n",
 		ToString(audio_format).c_str(),
-		duration.ToDoubleS());
+		duration.ToDoubleS(), seekable);
 
 	initialized = true;
 }

test/RunCurl.cxx

@@ -0,0 +1,93 @@
+/*
+ * Copyright 2003-2019 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 "ShutdownHandler.hxx"
+#include "lib/curl/Global.hxx"
+#include "lib/curl/Request.hxx"
+#include "lib/curl/Handler.hxx"
+#include "event/Loop.hxx"
+#include "util/PrintException.hxx"
+
+#include <stdio.h>
+
+class MyHandler final : public CurlResponseHandler {
+	EventLoop &event_loop;
+
+	std::exception_ptr error;
+
+public:
+	explicit MyHandler(EventLoop &_event_loop) noexcept
+		:event_loop(_event_loop) {}
+
+	void Finish() {
+		if (error)
+			std::rethrow_exception(error);
+	}
+
+	/* virtual methods from CurlResponseHandler */
+	void OnHeaders(unsigned status,
+		       std::multimap<std::string, std::string> &&headers) override {
+		fprintf(stderr, "status: %u\n", status);
+		for (const auto &i : headers)
+			fprintf(stderr, "%s: %s\n",
+				i.first.c_str(), i.second.c_str());
+	}
+
+	void OnData(ConstBuffer<void> data) override {
+		if (fwrite(data.data, data.size, 1, stdout) != 1)
+			throw std::runtime_error("Failed to write");
+	}
+
+	void OnEnd() override {
+		event_loop.Break();
+	}
+
+	void OnError(std::exception_ptr e) noexcept override {
+		error = std::move(e);
+		event_loop.Break();
+	}
+};
+
+int
+main(int argc, char **argv) noexcept
+try {
+	if (argc != 2) {
+		fprintf(stderr, "Usage: RunCurl URI\n");
+		return EXIT_FAILURE;
+	}
+
+	const char *const uri = argv[1];
+
+	EventLoop event_loop;
+	const ShutdownHandler shutdown_handler(event_loop);
+	CurlGlobal curl_global(event_loop);
+
+	MyHandler handler(event_loop);
+	CurlRequest request(curl_global, uri, handler);
+	request.Start();
+
+	event_loop.Run();
+
+	handler.Finish();
+
+	return EXIT_SUCCESS;
+} catch (...) {
+	PrintException(std::current_exception());
+	return EXIT_FAILURE;
+}

test/meson.build

@@ -7,9 +7,14 @@ if compiler.get_id() == 'gcc'
     '-Wno-suggest-attribute=format',
     '-Wno-suggest-attribute=noreturn',
     '-Wno-missing-declarations',
+  ]
+endif
 
-    # needed on Jessie for gtest's IsNullLiteralHelper
-    '-Wno-conversion-null',
+if compiler.get_id() == 'clang' and compiler.version().version_compare('>=9')
+  gtest_compile_args += [
+    # work around clang warning caused by GTest's wrong "-lpthread"
+    # compiler flag
+    '-Wno-unused-command-line-argument',
   ]
 endif
 
@@ -334,6 +339,18 @@ executable(
 )
 
 if curl_dep.found()
+  executable(
+    'RunCurl',
+    'RunCurl.cxx',
+    'ShutdownHandler.cxx',
+    '../src/Log.cxx',
+    '../src/LogBackend.cxx',
+    include_directories: inc,
+    dependencies: [
+      curl_dep,
+    ],
+  )
+
   test('test_icy_parser', executable(
     'test_icy_parser',
     'test_icy_parser.cxx',

test/run_storage.cxx

@@ -90,6 +90,29 @@ Ls(Storage &storage, const char *path)
 	return EXIT_SUCCESS;
 }
 
+static int
+Stat(Storage &storage, const char *path)
+{
+	const auto info = storage.GetInfo(path, false);
+	switch (info.type) {
+	case StorageFileInfo::Type::OTHER:
+		printf("other\n");
+		break;
+
+	case StorageFileInfo::Type::REGULAR:
+		printf("regular\n");
+		break;
+
+	case StorageFileInfo::Type::DIRECTORY:
+		printf("directory\n");
+		break;
+	}
+
+	printf("size: %llu\n", (unsigned long long)info.size);
+
+	return EXIT_SUCCESS;
+}
+
 int
 main(int argc, char **argv)
 try {
@@ -117,6 +140,18 @@ try {
 					   storage_uri);
 
 		return Ls(*storage, path);
+	} else if (strcmp(command, "stat") == 0) {
+		if (argc != 4) {
+			fprintf(stderr, "Usage: run_storage stat URI PATH\n");
+			return EXIT_FAILURE;
+		}
+
+		const char *const path = argv[3];
+
+		auto storage = MakeStorage(io_thread.GetEventLoop(),
+					   storage_uri);
+
+		return Stat(*storage, path);
 	} else {
 		fprintf(stderr, "Unknown command\n");
 		return EXIT_FAILURE;