Change re{set,fresh}_metadata to take a film and a size from the player.

3 files changed, 5 insertions, 4 deletions

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index ee0322d6f..e91cdc9a0 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -441,7 +441,7 @@ FilmViewer::quick_refresh ()
 	if (!_video_view || !_film || !_player) {
 		return true;
 	}
-	return _video_view->refresh_metadata (_film, _player->video_container_size(), _film->frame_size());
+	return _video_view->refresh_metadata (_film, _player->video_container_size());
 }
 
 void
diff --git a/src/wx/video_view.cc b/src/wx/video_view.cc
index aa3a469da..08b7d2912 100644
--- a/src/wx/video_view.cc
+++ b/src/wx/video_view.cc
@@ -125,14 +125,14 @@ VideoView::start ()
 }
 
 bool
-VideoView::refresh_metadata (shared_ptr<const Film> film, dcp::Size video_container_size, dcp::Size film_frame_size)
+VideoView::refresh_metadata (shared_ptr<const Film> film, dcp::Size player_video_container_size)
 {
 	pair<shared_ptr<PlayerVideo>, dcpomatic::DCPTime> pv = player_video ();
 	if (!pv.first) {
 		return false;
 	}
 
-	if (!pv.first->reset_metadata (film, video_container_size, film_frame_size)) {
+	if (!pv.first->reset_metadata(film, player_video_container_size)) {
 		return false;
 	}
 
diff --git a/src/wx/video_view.h b/src/wx/video_view.h
index 4e0b89ed7..ef5e8107d 100644
--- a/src/wx/video_view.h
+++ b/src/wx/video_view.h
@@ -33,6 +33,7 @@
 class Image;
 class wxWindow;
 class FilmViewer;
+class Player;
 class PlayerVideo;
 
 class VideoView : public ExceptionStore, public boost::noncopyable
@@ -53,7 +54,7 @@ public:
 	virtual bool display_next_frame (bool) = 0;
 
 	void clear ();
-	bool refresh_metadata (boost::shared_ptr<const Film> film, dcp::Size video_container_size, dcp::Size film_frame_size);
+	bool refresh_metadata (boost::shared_ptr<const Film> film, dcp::Size player_video_container_size);
 
 	/** Emitted from the GUI thread when our display changes in size */
 	boost::signals2::signal<void()> Sized;