summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-11-11 21:55:23 +0000
committerCarl Hetherington <cth@carlh.net>2013-11-11 21:55:23 +0000
commitfbf1af9b5d14ce6a71ea184339ca7c30ed544167 (patch)
tree3725c5531fe5a9f4054f014f3a7938a11bf69ae1 /src
parent1415214ff18e05e5b609aab8c4efb89e5b9e0cc0 (diff)
parent8429cf630b45c70b859f57a91e90892269606e75 (diff)
Merge branch '1.0' into 1.0-multiple-selection
Diffstat (limited to 'src')
-rw-r--r--src/lib/player.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/lib/player.cc b/src/lib/player.cc
index 220cf83c0..97d2cbdc0 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -223,6 +223,10 @@ Player::pass ()
if (_audio) {
Time audio_done_up_to = TIME_MAX;
for (list<shared_ptr<Piece> >::iterator i = _pieces.begin(); i != _pieces.end(); ++i) {
+ if ((*i)->decoder->done ()) {
+ continue;
+ }
+
if (dynamic_pointer_cast<AudioDecoder> ((*i)->decoder)) {
audio_done_up_to = min (audio_done_up_to, (*i)->audio_position);
}