summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2019-03-13 12:53:23 +0000
committerCarl Hetherington <cth@carlh.net>2019-03-13 12:53:23 +0000
commit5c712268c87dd318a6f5357b0d8f7b8a8b7764bb (patch)
treef2ab51ccab7620f33379804d0e6bf262856cc89f
parenta1a96da90403c0a16a9d9dcde9fd8b66da2daffe (diff)
Only mark _suspended as false at the appropriate times; previouslyv2.13.130
it was done too often, I think.
-rw-r--r--src/lib/player.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/player.cc b/src/lib/player.cc
index caf165e11..537a71906 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -231,7 +231,6 @@ Player::setup_pieces_unlocked ()
_last_video_time = DCPTime ();
_last_video_eyes = EYES_BOTH;
_last_audio_time = DCPTime ();
- _suspended = false;
}
void
@@ -247,6 +246,7 @@ Player::playlist_content_change (ChangeType type, int property, bool frequent)
} else if (type == CHANGE_TYPE_DONE) {
/* A change in our content has gone through. Re-build our pieces. */
setup_pieces ();
+ _suspended = false;
} else if (type == CHANGE_TYPE_CANCELLED) {
boost::mutex::scoped_lock lm (_mutex);
_suspended = false;