Remove FilmViewer::refresh_view.
authorCarl Hetherington <cth@carlh.net>
Thu, 21 Nov 2019 21:07:26 +0000 (22:07 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 8 Jan 2020 20:56:47 +0000 (21:56 +0100)
src/wx/film_viewer.cc
src/wx/film_viewer.h
src/wx/simple_video_view.cc

index c323c8281e7043ef7082c3346baf79ab97951508..7437612af9f9fde9094737ee545a7f10c979190e 100644 (file)
@@ -161,7 +161,7 @@ FilmViewer::set_film (shared_ptr<Film> film)
        if (!_film) {
                _player.reset ();
                recreate_butler ();
-               refresh_view ();
+               _video_view->update ();
                return;
        }
 
@@ -224,17 +224,11 @@ FilmViewer::recreate_butler ()
        resume ();
 }
 
-void
-FilmViewer::refresh_view ()
-{
-       _video_view->update ();
-}
-
 void
 FilmViewer::set_outline_content (bool o)
 {
        _outline_content = o;
-       refresh_view ();
+       _video_view->update ();
 }
 
 void
@@ -478,7 +472,7 @@ FilmViewer::config_changed (Config::Property p)
 {
 #ifdef DCPOMATIC_VARIANT_SWAROOP
        if (p == Config::PLAYER_BACKGROUND_IMAGE) {
-               refresh_view ();
+               _video_view->update ();
                return;
        }
 #endif
index 0699b12ae787ec4e1f1f42443b60bf438bf972c7..21195e74761cf1dd42305feaa833d855df57e8ae 100644 (file)
@@ -99,7 +99,7 @@ public:
 #ifdef DCPOMATIC_VARIANT_SWAROOP
        void set_background_image (bool b) {
                _background_image = b;
-               refresh_view ();
+               _video_view->update ();
        }
 
        bool background_image () const {
@@ -163,7 +163,6 @@ private:
        dcpomatic::DCPTime uncorrected_time () const;
        Frame average_latency () const;
 
-       void refresh_view ();
        bool quick_refresh ();
 
        boost::shared_ptr<Film> _film;
index 437aed4fa136f38fe70ab898932d451be7c04c31..63dc102001b06344e64d78a2162b2cd7621f5f43 100644 (file)
@@ -209,7 +209,7 @@ SimpleVideoView::display_player_video ()
 {
        if (!player_video().first) {
                set_image (shared_ptr<Image>());
-               _viewer->refresh_view ();
+               update ();
                return;
        }
 
@@ -252,7 +252,7 @@ SimpleVideoView::display_player_video ()
        _inter_position = player_video().first->inter_position ();
        _inter_size = player_video().first->inter_size ();
 
-       _viewer->refresh_view ();
+       update ();
 
        _viewer->closed_captions_dialog()->update (_viewer->time());
 }