Move some updates from content_change to player_change.

So far as I can see there's no need for them to respond to
content_change, and it's neater to do it all in one place.

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index bfacbdfe1667179fc64b95103899aa64f0488c03..1993f00117aae3c13a6a45458c74ce9334d550b3 100644 (file)
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -180,7 +180,6 @@ FilmViewer::set_film (shared_ptr<Film> film)
        _player->set_play_referenced ();
 
        _film->Change.connect (boost::bind (&FilmViewer::film_change, this, _1, _2));
-       _film->ContentChange.connect (boost::bind(&FilmViewer::content_change, this, _1, _3));
        _film->LengthChange.connect (boost::bind(&FilmViewer::film_length_change, this));
        _player->Change.connect (boost::bind (&FilmViewer::player_change, this, _1, _2, _3));
 
@@ -402,6 +401,10 @@ FilmViewer::player_change (ChangeType type, int property, bool frequent)
        if (!refreshed) {
                slow_refresh ();
        }
+
+       if (property == TextContentProperty::USE || property == TextContentProperty::TYPE || property == TextContentProperty::DCP_TRACK) {
+               _closed_captions_dialog->update_tracks (_film);
+       }
 }
 
 void
@@ -707,19 +710,6 @@ FilmViewer::gets () const
 }
 
 
-void
-FilmViewer::content_change (ChangeType type, int property)
-{
-       if (type != ChangeType::DONE) {
-               return;
-       }
-
-       if (property == TextContentProperty::USE || property == TextContentProperty::TYPE || property == TextContentProperty::DCP_TRACK) {
-               _closed_captions_dialog->update_tracks (_film);
-       }
-}
-
-
 void
 FilmViewer::image_changed (shared_ptr<PlayerVideo> pv)
 {

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index 9cbedc7cb1b7f61592a23b7a9d8326ad7be4ca47..125e4fd2d958787585be3ffe667e91063a1fa0a9 100644 (file)
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -156,7 +156,6 @@ private:
        void idle_handler ();
        void request_idle_display_next_frame ();
        void film_change (ChangeType, Film::Property);
-       void content_change (ChangeType, int property);
        void recreate_butler ();
        void config_changed (Config::Property);
        void film_length_change ();