diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/player.cc | 10 | ||||
| -rw-r--r-- | src/lib/player.h | 4 |
2 files changed, 6 insertions, 8 deletions
diff --git a/src/lib/player.cc b/src/lib/player.cc index 657c1a8b4..62527e3eb 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -87,7 +87,7 @@ int const PlayerProperty::DCP_DECODE_REDUCTION = 704; Player::Player (shared_ptr<const Film> film, shared_ptr<const Playlist> playlist) : _film (film) , _playlist (playlist) - , _suspended (false) + , _suspended (0) , _ignore_video (false) , _ignore_audio (false) , _ignore_text (false) @@ -252,19 +252,17 @@ void Player::playlist_content_change (ChangeType type, int property, bool frequent) { if (type == CHANGE_TYPE_PENDING) { - boost::mutex::scoped_lock lm (_mutex); /* The player content is probably about to change, so we can't carry on until that has happened and we've rebuilt our pieces. Stop pass() and seek() from working until then. */ - _suspended = true; + ++_suspended; } else if (type == CHANGE_TYPE_DONE) { /* A change in our content has gone through. Re-build our pieces. */ setup_pieces (); - _suspended = false; + --_suspended; } else if (type == CHANGE_TYPE_CANCELLED) { - boost::mutex::scoped_lock lm (_mutex); - _suspended = false; + --_suspended; } Change (type, property, frequent); diff --git a/src/lib/player.h b/src/lib/player.h index 2fd7c8668..68531cfb3 100644 --- a/src/lib/player.h +++ b/src/lib/player.h @@ -149,8 +149,8 @@ private: boost::shared_ptr<const Film> _film; boost::shared_ptr<const Playlist> _playlist; - /** true if we are suspended (i.e. pass() and seek() do nothing) */ - bool _suspended; + /** > 0 if we are suspended (i.e. pass() and seek() do nothing) */ + boost::atomic<int> _suspended; std::list<boost::shared_ptr<Piece> > _pieces; /** Size of the image in the DCP (e.g. 1990x1080 for flat) */ |