oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'v0.20.x'

Browse Source
This commit is contained in:
Max Kellermann 2017-12-26 20:03:18 +01:00
commit cd38aa3b2a
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/input/plugins/CurlInputPlugin.cxx
View File

@ -270,6 +270,7 @@ CurlInputStream::OnData(ConstBuffer<void> data)
void void
CurlInputStream::OnEnd() CurlInputStream::OnEnd()
{ {
const std::lock_guard<Mutex> protect(mutex);
cond.broadcast(); cond.broadcast();
AsyncInputStream::SetClosed(); AsyncInputStream::SetClosed();
@ -278,6 +279,7 @@ CurlInputStream::OnEnd()
void void
CurlInputStream::OnError(std::exception_ptr e) noexcept CurlInputStream::OnError(std::exception_ptr e) noexcept
{ {
const std::lock_guard<Mutex> protect(mutex);
postponed_exception = std::move(e); postponed_exception = std::move(e);
if (IsSeekPending()) if (IsSeekPending())

2
src/pcm/SampleFormat.hxx
View File

@ -122,7 +122,7 @@ sample_format_size(SampleFormat format)
* @param format a #SampleFormat enum value * @param format a #SampleFormat enum value
* @return the string * @return the string
*/ */
gcc_pure gcc_malloc gcc_returns_nonnull gcc_pure gcc_returns_nonnull
const char * const char *
sample_format_to_string(SampleFormat format) noexcept; sample_format_to_string(SampleFormat format) noexcept;