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
34aa67ea
Commit
34aa67ea
authored
3 years ago
by
Max Kellermann
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branches 'neheb/6', 'neheb/5', 'neheb/3', 'neheb/2' and 'neheb/1'
parents
18be8c33
1d7a8f99
da1783cd
20d74bb0
0f7a0b04
40c6a214
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
7 additions
and
15 deletions
+7
-15
ContentDirectoryService.cxx
src/db/plugins/upnp/ContentDirectoryService.cxx
+2
-6
ConvertFilterPlugin.cxx
src/filter/plugins/ConvertFilterPlugin.cxx
+1
-1
Interleave.cxx
src/lib/ffmpeg/Interleave.cxx
+1
-1
SnapcastOutputPlugin.cxx
src/output/plugins/snapcast/SnapcastOutputPlugin.cxx
+1
-5
CueParser.cxx
src/playlist/cue/CueParser.cxx
+1
-1
Builder.cxx
src/tag/Builder.cxx
+1
-1
No files found.
src/db/plugins/upnp/ContentDirectoryService.cxx
View file @
34aa67ea
...
@@ -258,12 +258,8 @@ ContentDirectoryService::getMetadata(UpnpClient_Handle hdl,
...
@@ -258,12 +258,8 @@ ContentDirectoryService::getMetadata(UpnpClient_Handle hdl,
if
(
code
!=
UPNP_E_SUCCESS
)
if
(
code
!=
UPNP_E_SUCCESS
)
throw
FormatRuntimeError
(
"UpnpSendAction() failed: %s"
,
throw
FormatRuntimeError
(
"UpnpSendAction() failed: %s"
,
UpnpGetErrorMessage
(
code
));
UpnpGetErrorMessage
(
code
));
const
char
*
p
=
""
;
auto
it
=
std
::
find_if
(
responseData
.
begin
(),
responseData
.
end
(),
[](
auto
&&
entry
){
return
entry
.
first
==
"Result"
;
});
for
(
const
auto
&
entry
:
responseData
)
{
const
char
*
p
=
it
!=
responseData
.
end
()
?
it
->
second
.
c_str
()
:
""
;
if
(
entry
.
first
==
"Result"
)
{
p
=
entry
.
second
.
c_str
();
}
}
UPnPDirContent
dirbuf
;
UPnPDirContent
dirbuf
;
dirbuf
.
Parse
(
p
);
dirbuf
.
Parse
(
p
);
return
dirbuf
;
return
dirbuf
;
...
...
This diff is collapsed.
Click to expand it.
src/filter/plugins/ConvertFilterPlugin.cxx
View file @
34aa67ea
...
@@ -121,7 +121,7 @@ std::unique_ptr<Filter>
...
@@ -121,7 +121,7 @@ std::unique_ptr<Filter>
convert_filter_new
(
const
AudioFormat
in_audio_format
,
convert_filter_new
(
const
AudioFormat
in_audio_format
,
const
AudioFormat
out_audio_format
)
const
AudioFormat
out_audio_format
)
{
{
std
::
unique_ptr
<
ConvertFilter
>
filter
(
new
ConvertFilter
(
in_audio_format
)
);
auto
filter
=
std
::
make_unique
<
ConvertFilter
>
(
in_audio_format
);
filter
->
Set
(
out_audio_format
);
filter
->
Set
(
out_audio_format
);
return
filter
;
return
filter
;
}
}
...
...
This diff is collapsed.
Click to expand it.
src/lib/ffmpeg/Interleave.cxx
View file @
34aa67ea
...
@@ -37,7 +37,7 @@ InterleaveFrame(const AVFrame &frame, FfmpegBuffer &buffer)
...
@@ -37,7 +37,7 @@ InterleaveFrame(const AVFrame &frame, FfmpegBuffer &buffer)
{
{
assert
(
frame
.
nb_samples
>
0
);
assert
(
frame
.
nb_samples
>
0
);
const
AVSampleFormat
format
=
AVSampleFormat
(
frame
.
format
);
const
auto
format
=
AVSampleFormat
(
frame
.
format
);
const
unsigned
channels
=
frame
.
channels
;
const
unsigned
channels
=
frame
.
channels
;
const
std
::
size_t
n_frames
=
frame
.
nb_samples
;
const
std
::
size_t
n_frames
=
frame
.
nb_samples
;
...
...
This diff is collapsed.
Click to expand it.
src/output/plugins/snapcast/SnapcastOutputPlugin.cxx
View file @
34aa67ea
...
@@ -367,11 +367,7 @@ SnapcastOutput::IsDrained() const noexcept
...
@@ -367,11 +367,7 @@ SnapcastOutput::IsDrained() const noexcept
if
(
!
chunks
.
empty
())
if
(
!
chunks
.
empty
())
return
false
;
return
false
;
for
(
const
auto
&
client
:
clients
)
return
std
::
all_of
(
clients
.
begin
(),
clients
.
end
(),
[](
auto
&&
c
){
return
c
.
IsDrained
();
});
if
(
!
client
.
IsDrained
())
return
false
;
return
true
;
}
}
void
void
...
...
This diff is collapsed.
Click to expand it.
src/playlist/cue/CueParser.cxx
View file @
34aa67ea
...
@@ -63,7 +63,7 @@ cue_next_token(StringView &src) noexcept
...
@@ -63,7 +63,7 @@ cue_next_token(StringView &src) noexcept
return
cue_next_word
(
src
);
return
cue_next_word
(
src
);
}
}
static
const
StringView
static
StringView
cue_next_value
(
StringView
&
src
)
noexcept
cue_next_value
(
StringView
&
src
)
noexcept
{
{
src
.
StripLeft
();
src
.
StripLeft
();
...
...
This diff is collapsed.
Click to expand it.
src/tag/Builder.cxx
View file @
34aa67ea
...
@@ -158,7 +158,7 @@ TagBuilder::Commit() noexcept
...
@@ -158,7 +158,7 @@ TagBuilder::Commit() noexcept
std
::
unique_ptr
<
Tag
>
std
::
unique_ptr
<
Tag
>
TagBuilder
::
CommitNew
()
noexcept
TagBuilder
::
CommitNew
()
noexcept
{
{
std
::
unique_ptr
<
Tag
>
tag
(
new
Tag
()
);
auto
tag
=
std
::
make_unique
<
Tag
>
(
);
Commit
(
*
tag
);
Commit
(
*
tag
);
return
tag
;
return
tag
;
}
}
...
...
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