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

player/Thread: move ResetCrossFade() calls to where pipes are set

Browse Source 
Move ResetCrossFade() to where cross-fading would actually break, to
make the cross-fading state more reliable.
This commit is contained in:
Max Kellermann 2015-10-27 22:11:56 +01:00
parent f5d21c9cdb
commit 9dc7b5a6d9
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/player/Thread.cxx
View File

@ -176,11 +176,13 @@ private:
} }
void ClearAndReplacePipe(MusicPipe *_pipe) { void ClearAndReplacePipe(MusicPipe *_pipe) {
ResetCrossFade();
ClearAndDeletePipe(); ClearAndDeletePipe();
pipe = _pipe; pipe = _pipe;
} }
void ReplacePipe(MusicPipe *_pipe) { void ReplacePipe(MusicPipe *_pipe) {
ResetCrossFade();
delete pipe; delete pipe;
pipe = _pipe; pipe = _pipe;
} }
@ -335,6 +337,11 @@ Player::StopDecoder()
delete dc.pipe; delete dc.pipe;
dc.pipe = nullptr; dc.pipe = nullptr;
/* just in case we've been cross-fading: cancel it
now, because we just deleted the new song's decoder
pipe */
ResetCrossFade();
} }
} }
@ -599,7 +606,7 @@ Player::SeekDecoder()
player_command_finished(pc); player_command_finished(pc);
ResetCrossFade(); assert(xfade_state == CrossFadeState::UNKNOWN);
/* re-fill the buffer after seeking */ /* re-fill the buffer after seeking */
buffering = true; buffering = true;
@ -905,8 +912,6 @@ Player::PlayNextChunk()
inline bool inline bool
Player::SongBorder() Player::SongBorder()
{ {
ResetCrossFade();
FormatDefault(player_domain, "played \"%s\"", song->GetURI()); FormatDefault(player_domain, "played \"%s\"", song->GetURI());
ReplacePipe(dc.pipe); ReplacePipe(dc.pipe);