diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-06-17 15:59:49 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-06-17 15:59:49 +0100 |
| commit | e57c0ac4775b1bc20b731e0e640e67d75db1bd76 (patch) | |
| tree | f20c6563aed3db320402239af431a9d76dccbc52 /src | |
| parent | 20eea989f452ea1a6af0af6b5c5b504d3b19480c (diff) | |
Use Film::Changed instead of Playlist::Changed in Player.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/player.cc | 13 | ||||
| -rw-r--r-- | src/lib/player.h | 2 |
2 files changed, 4 insertions, 11 deletions
diff --git a/src/lib/player.cc b/src/lib/player.cc index 215b48ee4..b7a5065b7 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -76,7 +76,6 @@ Player::Player (shared_ptr<const Film> f, shared_ptr<const Playlist> p) , _ignore_video (false) , _burn_subtitles (f->burn_subtitles ()) { - _playlist_changed_connection = _playlist->Changed.connect (bind (&Player::playlist_changed, this)); _playlist_content_changed_connection = _playlist->ContentChanged.connect (bind (&Player::content_changed, this, _1, _2, _3)); _film_changed_connection = _film->Changed.connect (bind (&Player::film_changed, this, _1)); set_video_container_size (_film->frame_size ()); @@ -227,13 +226,6 @@ Player::content_changed (weak_ptr<Content> w, int property, bool frequent) } void -Player::playlist_changed () -{ - _have_valid_pieces = false; - Changed (false); -} - -void Player::set_video_container_size (dcp::Size s) { _video_container_size = s; @@ -250,7 +242,10 @@ Player::film_changed (Film::Property p) last time we were run. */ - if (p == Film::CONTAINER || p == Film::VIDEO_FRAME_RATE) { + if (p == Film::CONTENT) { + _have_valid_pieces = false; + Changed (false); + } else if (p == Film::CONTAINER || p == Film::VIDEO_FRAME_RATE) { Changed (false); } else if (p == Film::AUDIO_PROCESSOR) { if (_film->audio_processor ()) { diff --git a/src/lib/player.h b/src/lib/player.h index 52dffec24..624547296 100644 --- a/src/lib/player.h +++ b/src/lib/player.h @@ -112,7 +112,6 @@ private: friend struct player_overlaps_test; void setup_pieces (); - void playlist_changed (); void content_changed (boost::weak_ptr<Content>, int, bool); void flush (); void film_changed (Film::Property); @@ -167,7 +166,6 @@ private: PlayerStatistics _statistics; - boost::signals2::scoped_connection _playlist_changed_connection; boost::signals2::scoped_connection _playlist_content_changed_connection; boost::signals2::scoped_connection _film_changed_connection; }; |