player/Control: convert error from Error to std::exception_ptr

Prepare full C++ exception support in the player thread.
This commit is contained in:
Max Kellermann
2016-09-08 10:21:34 +02:00
parent 6e52ab285a
commit 0ce72cbf9d
3 changed files with 38 additions and 23 deletions

View File

@@ -21,6 +21,7 @@
#include "Control.hxx"
#include "Idle.hxx"
#include "DetachedSong.hxx"
#include "util/Error.hxx"
#include <algorithm>
@@ -160,14 +161,23 @@ PlayerControl::LockGetStatus()
return status;
}
void
PlayerControl::SetError(PlayerError type, std::exception_ptr &&_error)
{
assert(type != PlayerError::NONE);
assert(_error);
error_type = type;
error = std::move(_error);
}
void
PlayerControl::SetError(PlayerError type, Error &&_error)
{
assert(type != PlayerError::NONE);
assert(_error.IsDefined());
error_type = type;
error = std::move(_error);
SetError(type, std::make_exception_ptr(std::move(_error)));
}
void
@@ -223,11 +233,11 @@ PlayerControl::SeekLocked(DetachedSong *song, SongTime t)
assert(next_song == nullptr);
if (error_type != PlayerError::NONE) {
assert(error.IsDefined());
throw error;
assert(error);
std::rethrow_exception(error);
}
assert(!error.IsDefined());
assert(!error);
}
void