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
3d714739
Commit
3d714739
authored
5 years ago
by
Max Kellermann
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'v0.21.x'
parents
3c5ef504
ca705e1e
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
38 additions
and
5 deletions
+38
-5
NEWS
NEWS
+9
-0
AndroidManifest.xml
android/AndroidManifest.xml
+2
-2
meson.py
python/build/meson.py
+6
-1
FileInputPlugin.cxx
src/input/plugins/FileInputPlugin.cxx
+7
-0
PlaylistEdit.cxx
src/queue/PlaylistEdit.cxx
+8
-1
UriUtil.cxx
src/util/UriUtil.cxx
+6
-1
No files found.
NEWS
View file @
3d714739
...
@@ -40,6 +40,15 @@ ver 0.22 (not yet released)
...
@@ -40,6 +40,15 @@ 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.25 (not yet released)
* protocol:
- fix crash when using "rangeid" while playing
* input
- file: detect premature end of file
- smbclient: don't send credentials to MPD clients
* Windows/Android:
- fix Boost detection after breaking change in Meson 0.54
ver 0.21.24 (2020/06/10)
ver 0.21.24 (2020/06/10)
* protocol
* protocol
- "tagtypes" requires no permissions
- "tagtypes" requires no permissions
...
...
This diff is collapsed.
Click to expand it.
android/AndroidManifest.xml
View file @
3d714739
...
@@ -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=
"4
7
"
android:versionCode=
"4
8
"
android:versionName=
"0.21.2
4
"
>
android:versionName=
"0.21.2
5
"
>
<uses-sdk
android:minSdkVersion=
"21"
android:targetSdkVersion=
"28"
/>
<uses-sdk
android:minSdkVersion=
"21"
android:targetSdkVersion=
"28"
/>
...
...
This diff is collapsed.
Click to expand it.
python/build/meson.py
View file @
3d714739
...
@@ -91,7 +91,12 @@ def configure(toolchain, src, build, args=()):
...
@@ -91,7 +91,12 @@ def configure(toolchain, src, build, args=()):
'--cross-file'
,
cross_file
,
'--cross-file'
,
cross_file
,
]
+
args
]
+
args
subprocess
.
check_call
(
configure
,
env
=
toolchain
.
env
)
env
=
toolchain
.
env
.
copy
()
# Meson 0.54 requires the BOOST_ROOT environment variable
env
[
'BOOST_ROOT'
]
=
toolchain
.
install_prefix
subprocess
.
check_call
(
configure
,
env
=
env
)
class
MesonProject
(
Project
):
class
MesonProject
(
Project
):
def
__init__
(
self
,
url
,
md5
,
installed
,
configure_args
=
[],
def
__init__
(
self
,
url
,
md5
,
installed
,
configure_args
=
[],
...
...
This diff is collapsed.
Click to expand it.
src/input/plugins/FileInputPlugin.cxx
View file @
3d714739
...
@@ -25,6 +25,8 @@
...
@@ -25,6 +25,8 @@
#include "io/FileDescriptor.hxx"
#include "io/FileDescriptor.hxx"
#include "util/RuntimeError.hxx"
#include "util/RuntimeError.hxx"
#include <cinttypes> // for PRIu64 (PRIoffset)
#include <sys/stat.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <fcntl.h>
...
@@ -97,6 +99,11 @@ FileInputStream::Read(std::unique_lock<Mutex> &,
...
@@ -97,6 +99,11 @@ FileInputStream::Read(std::unique_lock<Mutex> &,
nbytes
=
reader
.
Read
(
ptr
,
read_size
);
nbytes
=
reader
.
Read
(
ptr
,
read_size
);
}
}
if
(
nbytes
==
0
&&
!
IsEOF
())
throw
FormatRuntimeError
(
"Unexpected end of file %s"
" at %"
PRIoffset
" of %"
PRIoffset
,
GetURI
(),
GetOffset
(),
GetSize
());
offset
+=
nbytes
;
offset
+=
nbytes
;
return
nbytes
;
return
nbytes
;
}
}
This diff is collapsed.
Click to expand it.
src/queue/PlaylistEdit.cxx
View file @
3d714739
...
@@ -430,6 +430,8 @@ playlist::SetSongIdRange(PlayerControl &pc, unsigned id,
...
@@ -430,6 +430,8 @@ playlist::SetSongIdRange(PlayerControl &pc, unsigned id,
if
(
position
<
0
)
if
(
position
<
0
)
throw
PlaylistError
::
NoSuchSong
();
throw
PlaylistError
::
NoSuchSong
();
bool
was_queued
=
false
;
if
(
playing
)
{
if
(
playing
)
{
if
(
position
==
current
)
if
(
position
==
current
)
throw
PlaylistError
(
PlaylistResult
::
DENIED
,
throw
PlaylistError
(
PlaylistResult
::
DENIED
,
...
@@ -441,6 +443,10 @@ playlist::SetSongIdRange(PlayerControl &pc, unsigned id,
...
@@ -441,6 +443,10 @@ playlist::SetSongIdRange(PlayerControl &pc, unsigned id,
already; cancel that */
already; cancel that */
pc
.
LockCancel
();
pc
.
LockCancel
();
queued
=
-
1
;
queued
=
-
1
;
/* schedule a call to UpdateQueuedSong() to
re-queue the song with its new range */
was_queued
=
true
;
}
}
}
}
...
@@ -463,7 +469,8 @@ playlist::SetSongIdRange(PlayerControl &pc, unsigned id,
...
@@ -463,7 +469,8 @@ playlist::SetSongIdRange(PlayerControl &pc, unsigned id,
song
.
SetEndTime
(
end
);
song
.
SetEndTime
(
end
);
/* announce the change to all interested subsystems */
/* announce the change to all interested subsystems */
UpdateQueuedSong
(
pc
,
nullptr
);
if
(
was_queued
)
UpdateQueuedSong
(
pc
,
nullptr
);
queue
.
ModifyAtPosition
(
position
);
queue
.
ModifyAtPosition
(
position
);
OnModified
();
OnModified
();
}
}
This diff is collapsed.
Click to expand it.
src/util/UriUtil.cxx
View file @
3d714739
...
@@ -70,7 +70,12 @@ gcc_pure
...
@@ -70,7 +70,12 @@ gcc_pure
static
const
char
*
static
const
char
*
SkipUriScheme
(
const
char
*
uri
)
noexcept
SkipUriScheme
(
const
char
*
uri
)
noexcept
{
{
const
char
*
const
schemes
[]
=
{
"http://"
,
"https://"
,
"ftp://"
};
static
const
char
*
const
schemes
[]
=
{
"http://"
,
"https://"
,
"ftp://"
,
"smb://"
,
};
for
(
auto
scheme
:
schemes
)
{
for
(
auto
scheme
:
schemes
)
{
auto
result
=
StringAfterPrefixCaseASCII
(
uri
,
scheme
);
auto
result
=
StringAfterPrefixCaseASCII
(
uri
,
scheme
);
if
(
result
!=
nullptr
)
if
(
result
!=
nullptr
)
...
...
This diff is collapsed.
Click to expand it.
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