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
cd38aa3b
Commit
cd38aa3b
authored
Dec 26, 2017
by
Max Kellermann
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'v0.20.x'
parents
daeb7ae9
eee10ad2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
CurlInputPlugin.cxx
src/input/plugins/CurlInputPlugin.cxx
+2
-0
SampleFormat.hxx
src/pcm/SampleFormat.hxx
+1
-1
No files found.
src/input/plugins/CurlInputPlugin.cxx
View file @
cd38aa3b
...
...
@@ -270,6 +270,7 @@ CurlInputStream::OnData(ConstBuffer<void> data)
void
CurlInputStream
::
OnEnd
()
{
const
std
::
lock_guard
<
Mutex
>
protect
(
mutex
);
cond
.
broadcast
();
AsyncInputStream
::
SetClosed
();
...
...
@@ -278,6 +279,7 @@ CurlInputStream::OnEnd()
void
CurlInputStream
::
OnError
(
std
::
exception_ptr
e
)
noexcept
{
const
std
::
lock_guard
<
Mutex
>
protect
(
mutex
);
postponed_exception
=
std
::
move
(
e
);
if
(
IsSeekPending
())
...
...
src/pcm/SampleFormat.hxx
View file @
cd38aa3b
...
...
@@ -122,7 +122,7 @@ sample_format_size(SampleFormat format)
* @param format a #SampleFormat enum value
* @return the string
*/
gcc_pure
gcc_
malloc
gcc_
returns_nonnull
gcc_pure
gcc_returns_nonnull
const
char
*
sample_format_to_string
(
SampleFormat
format
)
noexcept
;
...
...
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