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

player/Control: Seek*() returns Error information

Browse Source
This commit is contained in:
Max Kellermann
2015-11-11 17:31:32 +01:00
parent faca8bc02a
commit 4404f20cf4
3 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/player/Control.cxx
View File

@@ -204,8 +204,8 @@ PlayerControl::LockEnqueueSong(DetachedSong *song)
EnqueueSongLocked(song);
}
void
PlayerControl::SeekLocked(DetachedSong *song, SongTime t)
bool
PlayerControl::SeekLocked(DetachedSong *song, SongTime t, Error &error_r)
{
assert(song != nullptr);
@@ -214,21 +214,32 @@ PlayerControl::SeekLocked(DetachedSong *song, SongTime t)
assert(next_song == nullptr);
ClearError();
next_song = song;
seek_time = t;
SynchronousCommand(PlayerCommand::SEEK);
assert(next_song == nullptr);
if (error_type != PlayerError::NONE) {
assert(error.IsDefined());
error_r.Set(error);
return false;
}
assert(!error.IsDefined());
return true;
}
bool
PlayerControl::LockSeek(DetachedSong *song, SongTime t)
PlayerControl::LockSeek(DetachedSong *song, SongTime t, Error &error_r)
{
assert(song != nullptr);
{
const ScopeLock protect(mutex);
SeekLocked(song, t);
if (!SeekLocked(song, t, error_r))
return false;
}
idle_add(IDLE_PLAYER);