From 7f5d317d3ba2bdb1838e942c436ad9f5de321bb4 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 21 Nov 2019 22:07:26 +0100 Subject: [PATCH 1/1] Remove FilmViewer::refresh_view. --- src/wx/film_viewer.cc | 12 +++--------- src/wx/film_viewer.h | 3 +-- src/wx/simple_video_view.cc | 4 ++-- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index c323c8281..7437612af 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -161,7 +161,7 @@ FilmViewer::set_film (shared_ptr 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 diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h index 0699b12ae..21195e747 100644 --- a/src/wx/film_viewer.h +++ b/src/wx/film_viewer.h @@ -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; diff --git a/src/wx/simple_video_view.cc b/src/wx/simple_video_view.cc index 437aed4fa..63dc10200 100644 --- a/src/wx/simple_video_view.cc +++ b/src/wx/simple_video_view.cc @@ -209,7 +209,7 @@ SimpleVideoView::display_player_video () { if (!player_video().first) { set_image (shared_ptr()); - _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()); } -- 2.30.2