Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
ba576ffa
Commit
ba576ffa
authored
May 05, 2020
by
Max Kellermann
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'v0.21.x'
parents
dae8da70
209364ad
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
13 additions
and
11 deletions
+13
-11
NEWS
NEWS
+7
-0
AndroidManifest.xml
android/AndroidManifest.xml
+2
-2
AllCommands.cxx
src/command/AllCommands.cxx
+1
-1
SimpleDatabasePlugin.cxx
src/db/plugins/simple/SimpleDatabasePlugin.cxx
+1
-6
CrossFade.cxx
src/player/CrossFade.cxx
+1
-1
Math.hxx
src/util/Math.hxx
+1
-1
No files found.
NEWS
View file @
ba576ffa
...
...
@@ -38,6 +38,13 @@ ver 0.22 (not yet released)
* switch to C++17
- 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)
* protocol
- add tag fallback for AlbumSort
...
...
android/AndroidManifest.xml
View file @
ba576ffa
...
...
@@ -2,8 +2,8 @@
<manifest
xmlns:android=
"http://schemas.android.com/apk/res/android"
package=
"org.musicpd"
android:installLocation=
"auto"
android:versionCode=
"4
6
"
android:versionName=
"0.21.2
3
"
>
android:versionCode=
"4
7
"
android:versionName=
"0.21.2
4
"
>
<uses-sdk
android:minSdkVersion=
"21"
android:targetSdkVersion=
"28"
/>
...
...
src/command/AllCommands.cxx
View file @
ba576ffa
...
...
@@ -201,7 +201,7 @@ static constexpr struct command commands[] = {
{
"subscribe"
,
PERMISSION_READ
,
1
,
1
,
handle_subscribe
},
{
"swap"
,
PERMISSION_CONTROL
,
2
,
2
,
handle_swap
},
{
"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
},
#ifdef ENABLE_DATABASE
{
"unmount"
,
PERMISSION_ADMIN
,
1
,
1
,
handle_unmount
},
...
...
src/db/plugins/simple/SimpleDatabasePlugin.cxx
View file @
ba576ffa
...
...
@@ -448,12 +448,7 @@ SimpleDatabase::Mount(const char *local_uri, const char *storage_uri)
// TODO: update the new database instance?
try
{
Mount
(
local_uri
,
std
::
move
(
db
));
}
catch
(...)
{
db
->
Close
();
throw
;
}
Mount
(
local_uri
,
std
::
move
(
db
));
}
inline
DatabasePtr
...
...
src/player/CrossFade.cxx
View file @
ba576ffa
...
...
@@ -62,7 +62,7 @@ mixramp_interpolate(const char *ramp_list, float required_db) noexcept
++
ramp_list
;
/* Check for exact match. */
if
(
db
>
=
required_db
)
{
if
(
db
=
=
required_db
)
{
return
duration
;
}
...
...
src/util/Math.hxx
View file @
ba576ffa
...
...
@@ -36,7 +36,7 @@
* C99 math can be optionally omitted with gcc's libstdc++.
* 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>
using
boost
::
math
::
lround
;
#else
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment