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

output/Interface: allow Pause() to throw exception

Browse Source 
Coverity discovered that the Pulse plugin could throw exceptions from
Pause(), but that method was marked "noexcept" because its caller was
not designed to catch exceptions.  So instead of avoiding exceptions
(by catching and logging them in each and every implementation), let's
allow them, and do the catch/log game in the MPD core.
This commit is contained in:
Max Kellermann
2017-09-08 14:45:53 +02:00
parent 9cc37bdea2
commit d0f6131ba4
7 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/output/plugins/sles/SlesOutputPlugin.cxx
View File

@@ -102,7 +102,7 @@ private:
void Drain() override;
void Cancel() noexcept override;
bool Pause() noexcept override;
bool Pause() override;
private:
void PlayedCallback();
@@ -368,7 +368,7 @@ SlesOutput::Cancel() noexcept
}
bool
SlesOutput::Pause() noexcept
SlesOutput::Pause()
{
cancel = false;
@@ -378,10 +378,8 @@ SlesOutput::Pause() noexcept
pause = true;
SLresult result = play.SetPlayState(SL_PLAYSTATE_PAUSED);
if (result != SL_RESULT_SUCCESS) {
FormatError(sles_domain, "Play.SetPlayState(PAUSED) failed");
return false;
}
if (result != SL_RESULT_SUCCESS)
throw std::runtime_error("Play.SetPlayState(PAUSED) failed");
return true;
}