diff options
| author | Rainer Hochecker <fernetmenta@online.de> | 2015-11-03 20:46:16 +0100 |
|---|---|---|
| committer | Rainer Hochecker <fernetmenta@online.de> | 2015-11-03 20:46:16 +0100 |
| commit | 94a726b04b204d73cb58b07fc487dedd7b984220 (patch) | |
| tree | dd716e88f4108dafaf264d7845739febe31079a4 | |
| parent | 6fd277c6be78f168dc8f7befd484bc30048f5a0e (diff) | |
| parent | 7a5c2b313134861429a06a550d0efcb5e32aa7cc (diff) | |
Merge pull request #8332 from FernetMenta/fixeof
paplayer: wait for eof if no crossfading or cue sheet
| -rw-r--r-- | xbmc/cores/paplayer/PAPlayer.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/xbmc/cores/paplayer/PAPlayer.cpp b/xbmc/cores/paplayer/PAPlayer.cpp index a18e56f26e..29af933ed3 100644 --- a/xbmc/cores/paplayer/PAPlayer.cpp +++ b/xbmc/cores/paplayer/PAPlayer.cpp @@ -455,7 +455,8 @@ bool PAPlayer::QueueNextFileEx(const CFileItem &file, bool fadeIn/* = true */, b void PAPlayer::UpdateStreamInfoPlayNextAtFrame(StreamInfo *si, unsigned int crossFadingTime) { - if (si) + // if no crossfading or cue sheet, wait for eof + if (si && (crossFadingTime || si->m_endOffset)) { int64_t streamTotalTime = si->m_decoder.TotalTime(); if (si->m_endOffset) |