summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2019-11-21 22:07:26 +0100
committerCarl Hetherington <cth@carlh.net>2020-01-08 21:56:47 +0100
commit7f5d317d3ba2bdb1838e942c436ad9f5de321bb4 (patch)
treed02879afa281cd32994cd54f563a9d28b47548ab /src
parent9001a63be211fd8e97431f8fc07c66af01554f5a (diff)
Remove FilmViewer::refresh_view.
Diffstat (limited to 'src')
-rw-r--r--src/wx/film_viewer.cc12
-rw-r--r--src/wx/film_viewer.h3
-rw-r--r--src/wx/simple_video_view.cc4
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> film)
if (!_film) {
_player.reset ();
recreate_butler ();
- refresh_view ();
+ _video_view->update ();
return;
}
@@ -225,16 +225,10 @@ FilmViewer::recreate_butler ()
}
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> _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<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());
}