X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.cc;h=bb483f0e235c98cace1283c627bf0957f893ad4c;hb=4e841ab275143ecbd8790c39ed332e5e346733f8;hp=9c3a9c81e0ca8d5b11a10c4ac7cbda386b655c73;hpb=579d18cb7770efe2da03afaf6a33faaf624119e3;p=dcpomatic.git

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 9c3a9c81e..bb483f0e2 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -164,7 +164,7 @@ FilmViewer::set_film (shared_ptr<Film> film)
 	}
 
 	try {
-		_player.reset (new Player (_film, _film->playlist ()));
+		_player.reset (new Player(_film));
 		_player->set_fast ();
 		if (_dcp_decode_reduction) {
 			_player->set_dcp_decode_reduction (_dcp_decode_reduction);
@@ -233,6 +233,15 @@ FilmViewer::set_outline_content (bool o)
 	_video_view->update ();
 }
 
+
+void
+FilmViewer::set_outline_subtitles (optional<dcpomatic::Rect<double> > rect)
+{
+	_outline_subtitles = rect;
+	_video_view->update ();
+}
+
+
 void
 FilmViewer::set_eyes (Eyes e)
 {
@@ -462,7 +471,7 @@ FilmViewer::seek (DCPTime t, bool accurate)
 	}
 
 	if (t >= _film->length ()) {
-		t = _film->length ();
+		t = _film->length() - one_video_frame();
 	}
 
 	suspend ();
@@ -679,6 +688,14 @@ FilmViewer::dropped () const
 	return _video_view->dropped ();
 }
 
+
+int
+FilmViewer::errored () const
+{
+	return _video_view->errored ();
+}
+
+
 int
 FilmViewer::gets () const
 {