Merge tag 'v0.21.22'

release v0.21.22

src/CommandLine.cxx

@@ -33,6 +33,7 @@
 #include "playlist/PlaylistRegistry.hxx"
 #include "playlist/PlaylistPlugin.hxx"
 #include "fs/AllocatedPath.hxx"
+#include "fs/NarrowPath.hxx"
 #include "fs/Traits.hxx"
 #include "fs/FileSystem.hxx"
 #include "fs/StandardDirectory.hxx"
@@ -378,17 +379,7 @@ ParseCommandLine(int argc, char **argv, struct options &options,
 
 	if (config_file != nullptr) {
 		/* use specified configuration file */
-#ifdef _UNICODE
-		wchar_t buffer[MAX_PATH];
-		auto result = MultiByteToWideChar(CP_ACP, 0, config_file, -1,
-						  buffer, std::size(buffer));
-		if (result <= 0)
-			throw MakeLastError("MultiByteToWideChar() failed");
-
-		ReadConfigFile(config, Path::FromFS(buffer));
-#else
-		ReadConfigFile(config, Path::FromFS(config_file));
-#endif
+		ReadConfigFile(config, FromNarrowPath(config_file));
 		return;
 	}
 

src/android/AudioManager.cxx

@@ -0,0 +1,56 @@
+/*
+ * Copyright 2003-2020 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 "AudioManager.hxx"
+#include "java/Class.hxx"
+#include "java/Exception.hxx"
+#include "java/File.hxx"
+
+#define STREAM_MUSIC 3
+
+AudioManager::AudioManager(JNIEnv *env, jobject obj) noexcept
+	: Java::GlobalObject(env, obj)
+{
+	Java::Class cls(env, env->GetObjectClass(Get()));
+	jmethodID method = env->GetMethodID(cls, "getStreamMaxVolume", "(I)I");
+	assert(method);
+	maxVolume = env->CallIntMethod(Get(), method, STREAM_MUSIC);
+
+	getStreamVolumeMethod = env->GetMethodID(cls, "getStreamVolume", "(I)I");
+	assert(getStreamVolumeMethod);
+
+	setStreamVolumeMethod = env->GetMethodID(cls, "setStreamVolume", "(III)V");
+	assert(setStreamVolumeMethod);
+}
+
+int
+AudioManager::GetVolume(JNIEnv *env)
+{
+	if (maxVolume == 0)
+		return 0;
+	return env->CallIntMethod(Get(), getStreamVolumeMethod, STREAM_MUSIC);
+}
+
+void
+AudioManager::SetVolume(JNIEnv *env, int volume)
+{
+	if (maxVolume == 0)
+		return;
+	env->CallVoidMethod(Get(), setStreamVolumeMethod, STREAM_MUSIC, volume, 0);
+}

src/android/AudioManager.hxx

@@ -0,0 +1,42 @@
+/*
+ * Copyright 2003-2020 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef MPD_ANDROID_AUDIO_MANAGER_HXX
+#define MPD_ANDROID_AUDIO_MANAGER_HXX
+
+#include "java/Object.hxx"
+
+class AudioManager : public Java::GlobalObject {
+	int maxVolume;
+	jmethodID getStreamVolumeMethod;
+	jmethodID setStreamVolumeMethod;
+
+public:
+	AudioManager(JNIEnv *env, jobject obj) noexcept;
+
+	AudioManager(std::nullptr_t) noexcept { maxVolume = 0; }
+
+	~AudioManager() noexcept {}
+
+	int GetMaxVolume() { return maxVolume; }
+	int GetVolume(JNIEnv *env);
+	void SetVolume(JNIEnv *env, int);
+};
+
+#endif

src/android/Context.cxx

@@ -21,8 +21,11 @@
 #include "java/Class.hxx"
 #include "java/Exception.hxx"
 #include "java/File.hxx"
+#include "java/String.hxx"
 #include "fs/AllocatedPath.hxx"
 
+#include "AudioManager.hxx"
+
 AllocatedPath
 Context::GetCacheDir(JNIEnv *env) const noexcept
 {
@@ -39,3 +42,21 @@ Context::GetCacheDir(JNIEnv *env) const noexcept
 
 	return Java::File::ToAbsolutePath(env, file);
 }
+
+AudioManager *
+Context::GetAudioManager(JNIEnv *env) noexcept
+{
+	assert(env != nullptr);
+
+	Java::Class cls(env, env->GetObjectClass(Get()));
+	jmethodID method = env->GetMethodID(cls, "getSystemService",
+					    "(Ljava/lang/String;)Ljava/lang/Object;");
+	assert(method);
+
+	Java::String name(env, "audio");
+	jobject am = env->CallObjectMethod(Get(), method, name.Get());
+	if (Java::DiscardException(env) || am == nullptr)
+		return nullptr;
+
+    return new AudioManager(env, am);
+}

src/android/Context.hxx

@@ -23,6 +23,7 @@
 #include "java/Object.hxx"
 
 class AllocatedPath;
+class AudioManager;
 
 class Context : public Java::GlobalObject {
 public:
@@ -31,6 +32,9 @@ public:
 
 	gcc_pure
 	AllocatedPath GetCacheDir(JNIEnv *env) const noexcept;
+
+	gcc_pure
+	AudioManager *GetAudioManager(JNIEnv *env) noexcept;
 };
 
 #endif

src/db/plugins/simple/Directory.cxx

@@ -32,6 +32,7 @@
 #include "fs/Traits.hxx"
 #include "util/Alloc.hxx"
 #include "util/DeleteDisposer.hxx"
+#include "util/StringCompare.hxx"
 
 #include <cassert>
 
@@ -70,7 +71,15 @@ Directory::GetName() const noexcept
 {
 	assert(!IsRoot());
 
-	return PathTraitsUTF8::GetBase(path.c_str());
+	if (parent->IsRoot())
+		return path.c_str();
+
+	assert(StringAfterPrefix(path.c_str(), parent->path.c_str()) != nullptr);
+	assert(*StringAfterPrefix(path.c_str(), parent->path.c_str()) == PathTraitsUTF8::SEPARATOR);
+
+	/* strip the parent directory path and the slash separator
+	   from this directory's path, and the base name remains */
+	return path.c_str() + parent->path.length() + 1;
 }
 
 Directory *

src/decoder/plugins/FfmpegDecoderPlugin.cxx

@@ -287,7 +287,7 @@ FfmpegReceiveFrames(DecoderClient &client, InputStream &is,
  */
 static DecoderCommand
 ffmpeg_send_packet(DecoderClient &client, InputStream &is,
-		   AVPacket &&packet,
+		   const AVPacket &packet,
 		   AVCodecContext &codec_context,
 		   const AVStream &stream,
 		   AVFrame &frame,
@@ -340,24 +340,6 @@ ffmpeg_send_packet(DecoderClient &client, InputStream &is,
 	return cmd;
 }
 
-static DecoderCommand
-ffmpeg_send_packet(DecoderClient &client, InputStream &is,
-		   const AVPacket &packet,
-		   AVCodecContext &codec_context,
-		   const AVStream &stream,
-		   AVFrame &frame,
-		   uint64_t min_frame, size_t pcm_frame_size,
-		   FfmpegBuffer &buffer)
-{
-	return ffmpeg_send_packet(client, is,
-				  /* copy the AVPacket, because FFmpeg
-				     < 3.0 requires this */
-				  AVPacket(packet),
-				  codec_context, stream,
-				  frame, min_frame, pcm_frame_size,
-				  buffer);
-}
-
 gcc_const
 static SampleFormat
 ffmpeg_sample_format(enum AVSampleFormat sample_fmt) noexcept

src/event/meson.build

@@ -26,6 +26,7 @@ event_dep = declare_dependency(
   link_with: event,
   dependencies: [
     thread_dep,
+    net_dep,
     system_dep,
     boost_dep,
   ],

src/fs/NarrowPath.cxx

@@ -0,0 +1,54 @@
+/*
+ * Copyright 2003-2018 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 "NarrowPath.hxx"
+
+#ifdef _UNICODE
+
+#include "lib/icu/Win32.hxx"
+#include "system/Error.hxx"
+
+#include <windows.h>
+
+NarrowPath::NarrowPath(Path _path) noexcept
+	:value(WideCharToMultiByte(CP_ACP, _path.c_str()))
+{
+	if (value.IsNull())
+		/* fall back to empty string */
+		value = Value::Empty();
+}
+
+static AllocatedPath
+AcpToAllocatedPath(const char *s)
+{
+	wchar_t buffer[MAX_PATH];
+	auto result = MultiByteToWideChar(CP_ACP, 0, s, -1,
+					  buffer, std::size(buffer));
+	if (result <= 0)
+		throw MakeLastError("MultiByteToWideChar() failed");
+
+	return AllocatedPath::FromFS(buffer);
+}
+
+FromNarrowPath::FromNarrowPath(const char *s)
+	:value(AcpToAllocatedPath(s))
+{
+}
+
+#endif /* _UNICODE */

src/fs/NarrowPath.hxx

@@ -23,9 +23,8 @@
 #include "Path.hxx"
 
 #ifdef _UNICODE
-#include "lib/icu/Win32.hxx"
+#include "AllocatedPath.hxx"
 #include "util/AllocatedString.hxx"
-#include <windows.h>
 #else
 #include "util/StringPointer.hxx"
 #endif
@@ -47,12 +46,7 @@ class NarrowPath {
 
 public:
 #ifdef _UNICODE
-	explicit NarrowPath(Path _path)
-		:value(WideCharToMultiByte(CP_ACP, _path.c_str())) {
-		if (value.IsNull())
-			/* fall back to empty string */
-			value = Value::Empty();
-	}
+	explicit NarrowPath(Path _path) noexcept;
 #else
 	explicit NarrowPath(Path _path):value(_path.c_str()) {}
 #endif
@@ -66,4 +60,38 @@ public:
 	}
 };
 
+/**
+ * A path name converted from a "narrow" string.  This is used to
+ * import an existing narrow string to a #Path.
+ */
+class FromNarrowPath {
+#ifdef _UNICODE
+	using Value = AllocatedPath;
+#else
+	using Value = Path;
+#endif
+
+	Value value{nullptr};
+
+public:
+	FromNarrowPath() = default;
+
+#ifdef _UNICODE
+	/**
+	 * Throws on error.
+	 */
+	FromNarrowPath(const char *s);
+#else
+	constexpr FromNarrowPath(const char *s) noexcept
+		:value(Value::FromFS(s)) {}
+#endif
+
+#ifndef _UNICODE
+	constexpr
+#endif
+	operator Path() const noexcept {
+		return value;
+	}
+};
+
 #endif

src/fs/io/BufferedReader.hxx

@@ -50,7 +50,7 @@ class BufferedReader {
 
 public:
 	explicit BufferedReader(Reader &_reader) noexcept
-		:reader(_reader), buffer(4096) {}
+		:reader(_reader), buffer(16384) {}
 
 	/**
 	 * Reset the internal state.  Should be called after rewinding

src/fs/io/GunzipReader.hxx

@@ -45,7 +45,7 @@ class GunzipReader final : public Reader {
 
 	z_stream z;
 
-	StaticFifoBuffer<Bytef, 4096> buffer;
+	StaticFifoBuffer<Bytef, 65536> buffer;
 
 public:
 	/**

src/fs/io/GzipOutputStream.cxx

@@ -62,7 +62,7 @@ GzipOutputStream::Flush()
 	z.avail_in = 0;
 
 	while (true) {
-		Bytef output[4096];
+		Bytef output[16384];
 		z.next_out = output;
 		z.avail_out = sizeof(output);
 
@@ -87,7 +87,7 @@ GzipOutputStream::Write(const void *_data, size_t size)
 	z.avail_in = size;
 
 	while (z.avail_in > 0) {
-		Bytef output[4096];
+		Bytef output[16384];
 		z.next_out = output;
 		z.avail_out = sizeof(output);
 

src/fs/meson.build

@@ -6,6 +6,7 @@ fs_sources = [
   'Path.cxx',
   'Path2.cxx',
   'AllocatedPath.cxx',
+  'NarrowPath.cxx',
   'FileSystem.cxx',
   'List.cxx',
   'StandardDirectory.cxx',

src/lib/curl/Request.cxx

@@ -56,7 +56,9 @@ CurlRequest::CurlRequest(CurlGlobal &_global,
 	easy.SetUserAgent("Music Player Daemon " VERSION);
 	easy.SetHeaderFunction(_HeaderFunction, this);
 	easy.SetWriteFunction(WriteFunction, this);
+#ifndef ANDROID
 	easy.SetOption(CURLOPT_NETRC, 1L);
+#endif
 	easy.SetErrorBuffer(error_buffer);
 	easy.SetNoProgress();
 	easy.SetNoSignal();

src/mixer/MixerList.hxx

@@ -29,6 +29,7 @@ struct MixerPlugin;
 
 extern const MixerPlugin null_mixer_plugin;
 extern const MixerPlugin software_mixer_plugin;
+extern const MixerPlugin android_mixer_plugin;
 extern const MixerPlugin alsa_mixer_plugin;
 extern const MixerPlugin haiku_mixer_plugin;
 extern const MixerPlugin oss_mixer_plugin;

src/mixer/plugins/AndroidMixerPlugin.cxx

@@ -0,0 +1,116 @@
+/*
+ * Copyright 2003-2020 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 "mixer/MixerInternal.hxx"
+#include "filter/plugins/VolumeFilterPlugin.hxx"
+#include "pcm/Volume.hxx"
+#include "android/Context.hxx"
+#include "android/AudioManager.hxx"
+
+#include "Main.hxx"
+
+#include <cassert>
+#include <cmath>
+
+class AndroidMixer final : public Mixer {
+	AudioManager *audioManager;
+	int currentVolume;
+	int maxAndroidVolume;
+	int lastAndroidVolume;
+public:
+	explicit AndroidMixer(MixerListener &_listener);
+
+	~AndroidMixer() override;
+
+	/* virtual methods from class Mixer */
+	void Open() override {
+	}
+
+	void Close() noexcept override {
+	}
+
+	int GetVolume() override;
+
+	void SetVolume(unsigned volume) override;
+};
+
+static Mixer *
+android_mixer_init([[maybe_unused]] EventLoop &event_loop,
+		    [[maybe_unused]] AudioOutput &ao,
+		    MixerListener &listener,
+		    [[maybe_unused]] const ConfigBlock &block)
+{
+	return new AndroidMixer(listener);
+}
+
+AndroidMixer::AndroidMixer(MixerListener &_listener)
+	:Mixer(android_mixer_plugin, _listener)
+{
+	JNIEnv *env = Java::GetEnv();
+	audioManager = context->GetAudioManager(env);
+
+	maxAndroidVolume = audioManager->GetMaxVolume();
+	if (maxAndroidVolume != 0)
+	{
+		lastAndroidVolume = audioManager->GetVolume(env);
+		currentVolume = 100 * lastAndroidVolume / maxAndroidVolume;
+	}
+}
+
+AndroidMixer::~AndroidMixer()
+{
+	delete audioManager;
+}
+
+int
+AndroidMixer::GetVolume()
+{
+	JNIEnv *env = Java::GetEnv();
+	if (maxAndroidVolume == 0)
+		return -1;
+
+	// The android volume index (or scale) is very likely inferior to the
+	// MPD one (100). The last volume set by MPD is saved into
+	// currentVolume, this volume is returned instead of the Android one
+	// when the Android mixer was not touched by an other application. This
+	// allows to fake a 0..100 scale from MPD.
+
+	int volume = audioManager->GetVolume(env);
+	if (volume == lastAndroidVolume)
+		return currentVolume;
+
+	return 100 * volume / maxAndroidVolume;
+}
+
+void
+AndroidMixer::SetVolume(unsigned newVolume)
+{
+	JNIEnv *env = Java::GetEnv();
+	if (maxAndroidVolume == 0)
+		return;
+	currentVolume = newVolume;
+	lastAndroidVolume = currentVolume * maxAndroidVolume / 100;
+	audioManager->SetVolume(env, lastAndroidVolume);
+
+}
+
+const MixerPlugin android_mixer_plugin = {
+	android_mixer_init,
+	true,
+};

src/mixer/plugins/meson.build

@@ -34,6 +34,10 @@ if is_windows
   mixer_plugins_sources += 'WinmmMixerPlugin.cxx'
 endif
 
+if is_android
+  mixer_plugins_sources += 'AndroidMixerPlugin.cxx'
+endif
+
 mixer_plugins = static_library(
   'mixer_plugins',
   mixer_plugins_sources,

src/output/plugins/sles/SlesOutputPlugin.cxx

@@ -27,6 +27,7 @@
 #include "thread/Cond.hxx"
 #include "util/Domain.hxx"
 #include "util/ByteOrder.hxx"
+#include "mixer/MixerList.hxx"
 #include "Log.hxx"
 
 #include <SLES/OpenSLES.h>
@@ -412,5 +413,5 @@ const struct AudioOutputPlugin sles_output_plugin = {
 	"sles",
 	sles_test_default_device,
 	SlesOutput::Create,
-	nullptr,
+	&android_mixer_plugin,
 };

src/playlist/plugins/RssPlaylistPlugin.cxx

@@ -160,6 +160,7 @@ static const char *const rss_suffixes[] = {
 
 static const char *const rss_mime_types[] = {
 	"application/rss+xml",
+	"application/xml",
 	"text/xml",
 	nullptr
 };

src/tag/Pool.cxx

@@ -32,7 +32,7 @@
 
 Mutex tag_pool_lock;
 
-static constexpr size_t NUM_SLOTS = 4093;
+static constexpr size_t NUM_SLOTS = 16127;
 
 struct TagPoolSlot {
 	TagPoolSlot *next;

src/time/Convert.cxx

@@ -77,15 +77,15 @@ static time_t
 GetTimeZoneOffset() noexcept
 {
 	time_t t = 1234567890;
-	struct tm tm;
-	tm.tm_isdst = 0;
 #ifdef _WIN32
 	struct tm *p = gmtime(&t);
 #else
+	struct tm tm;
+	tm.tm_isdst = 0;
 	struct tm *p = &tm;
 	gmtime_r(&t, p);
 #endif
-	return t - mktime(&tm);
+	return t - mktime(p);
 }
 
 #endif /* !__GLIBC__ */