Commit ba576ffa authored by Max Kellermann's avatar Max Kellermann

Merge branch 'v0.21.x'

parents dae8da70 209364ad
...@@ -38,6 +38,13 @@ ver 0.22 (not yet released) ...@@ -38,6 +38,13 @@ ver 0.22 (not yet released)
* switch to C++17 * switch to C++17
- GCC 7 or clang 4 (or newer) recommended - GCC 7 or clang 4 (or newer) recommended
ver 0.21.24 (not yet released)
* protocol
- "tagtypes" requires no permissions
* database
- simple: fix crash when mounting twice
* fix unit test failure
ver 0.21.23 (2020/04/23) ver 0.21.23 (2020/04/23)
* protocol * protocol
- add tag fallback for AlbumSort - add tag fallback for AlbumSort
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.musicpd" package="org.musicpd"
android:installLocation="auto" android:installLocation="auto"
android:versionCode="46" android:versionCode="47"
android:versionName="0.21.23"> android:versionName="0.21.24">
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28"/> <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28"/>
......
...@@ -201,7 +201,7 @@ static constexpr struct command commands[] = { ...@@ -201,7 +201,7 @@ static constexpr struct command commands[] = {
{ "subscribe", PERMISSION_READ, 1, 1, handle_subscribe }, { "subscribe", PERMISSION_READ, 1, 1, handle_subscribe },
{ "swap", PERMISSION_CONTROL, 2, 2, handle_swap }, { "swap", PERMISSION_CONTROL, 2, 2, handle_swap },
{ "swapid", PERMISSION_CONTROL, 2, 2, handle_swapid }, { "swapid", PERMISSION_CONTROL, 2, 2, handle_swapid },
{ "tagtypes", PERMISSION_READ, 0, -1, handle_tagtypes }, { "tagtypes", PERMISSION_NONE, 0, -1, handle_tagtypes },
{ "toggleoutput", PERMISSION_ADMIN, 1, 1, handle_toggleoutput }, { "toggleoutput", PERMISSION_ADMIN, 1, 1, handle_toggleoutput },
#ifdef ENABLE_DATABASE #ifdef ENABLE_DATABASE
{ "unmount", PERMISSION_ADMIN, 1, 1, handle_unmount }, { "unmount", PERMISSION_ADMIN, 1, 1, handle_unmount },
......
...@@ -448,12 +448,7 @@ SimpleDatabase::Mount(const char *local_uri, const char *storage_uri) ...@@ -448,12 +448,7 @@ SimpleDatabase::Mount(const char *local_uri, const char *storage_uri)
// TODO: update the new database instance? // TODO: update the new database instance?
try { Mount(local_uri, std::move(db));
Mount(local_uri, std::move(db));
} catch (...) {
db->Close();
throw;
}
} }
inline DatabasePtr inline DatabasePtr
......
...@@ -62,7 +62,7 @@ mixramp_interpolate(const char *ramp_list, float required_db) noexcept ...@@ -62,7 +62,7 @@ mixramp_interpolate(const char *ramp_list, float required_db) noexcept
++ramp_list; ++ramp_list;
/* Check for exact match. */ /* Check for exact match. */
if (db >= required_db) { if (db == required_db) {
return duration; return duration;
} }
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
* C99 math can be optionally omitted with gcc's libstdc++. * C99 math can be optionally omitted with gcc's libstdc++.
* Use boost if unavailable. * Use boost if unavailable.
*/ */
#if (defined(__GLIBCPP__) || defined(__GLIBCXX__)) && !defined(_GLIBCXX_USE_C99_MATH) #if (defined(__GLIBCPP__) || defined(__GLIBCXX__)) && !defined(_GLIBCXX_USE_C99_MATH_TR1)
#include <boost/math/special_functions/round.hpp> #include <boost/math/special_functions/round.hpp>
using boost::math::lround; using boost::math::lround;
#else #else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment