Use Film::Changed instead of Playlist::Changed in Player.

diff --git a/src/lib/player.cc b/src/lib/player.cc
index 215b48ee444f83c9025d29e08c05890958425996..b7a5065b739eafa0915a9b930638557f12d334f3 100644 (file)
--- 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 ());
@@ -226,13 +225,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)
 {
@@ -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 52dffec24656a1edadcefab42756ea73bb6844d2..624547296defb65af236938cd6caf7621280e37e 100644 (file)
--- 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;
 };