X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftext_view.cc;h=3b674b5c17eb04562932ca23e54d2668cc144b89;hb=a5d004b0773f633401528392fc28e66d70e13ac8;hp=442335b92c08c6881d9bbc95f340586bc2feef86;hpb=23583dfb56181c76126e652042e9d1940367aa27;p=dcpomatic.git

diff --git a/src/wx/text_view.cc b/src/wx/text_view.cc
index 442335b92..3b674b5c1 100644
--- a/src/wx/text_view.cc
+++ b/src/wx/text_view.cc
@@ -18,6 +18,9 @@
 
 */
 
+#include "text_view.h"
+#include "film_viewer.h"
+#include "wx_util.h"
 #include "lib/string_text_file_decoder.h"
 #include "lib/content_text.h"
 #include "lib/video_decoder.h"
@@ -26,17 +29,19 @@
 #include "lib/config.h"
 #include "lib/string_text_file_content.h"
 #include "lib/text_decoder.h"
-#include "text_view.h"
-#include "control_film_viewer.h"
-#include "wx_util.h"
 
 using std::list;
-using boost::shared_ptr;
+using std::shared_ptr;
+using std::weak_ptr;
 using boost::bind;
-using boost::dynamic_pointer_cast;
+using std::dynamic_pointer_cast;
+using namespace dcpomatic;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 TextView::TextView (
-	wxWindow* parent, shared_ptr<Film> film, shared_ptr<Content> content, shared_ptr<TextContent> text, shared_ptr<Decoder> decoder, ControlFilmViewer* viewer
+	wxWindow* parent, shared_ptr<Film> film, shared_ptr<Content> content, shared_ptr<TextContent> text, shared_ptr<Decoder> decoder, weak_ptr<FilmViewer> viewer
 	)
 	: wxDialog (parent, wxID_ANY, _("Captions"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
 	, _content (content)
@@ -89,7 +94,7 @@ TextView::TextView (
 	_frc = film->active_frame_rate_change (content->position());
 
 	/* Find the decoder that is being used for our TextContent and attach to it */
-	BOOST_FOREACH (shared_ptr<TextDecoder> i, decoder->text) {
+	for (auto i: decoder->text) {
 		if (i->content() == text) {
 			i->PlainStart.connect (bind (&TextView::data_start, this, _1));
 			i->Stop.connect (bind (&TextView::data_stop, this, _1));
@@ -102,7 +107,7 @@ TextView::TextView (
 void
 TextView::data_start (ContentStringText cts)
 {
-	BOOST_FOREACH (dcp::SubtitleString const & i, cts.subs) {
+	for (auto const& i: cts.subs) {
 		wxListItem list_item;
 		list_item.SetId (_subs);
 		_list->InsertItem (list_item);
@@ -135,7 +140,10 @@ TextView::subtitle_selected (wxListEvent& ev)
 	}
 
 	DCPOMATIC_ASSERT (ev.GetIndex() < int(_start_times.size()));
-	shared_ptr<Content> locked = _content.lock ();
-	DCPOMATIC_ASSERT (locked);
-	_film_viewer->set_position (locked, _start_times[ev.GetIndex()]);
+	shared_ptr<Content> lc = _content.lock ();
+	DCPOMATIC_ASSERT (lc);
+	shared_ptr<FilmViewer> fv = _film_viewer.lock ();
+	DCPOMATIC_ASSERT (fv);
+	/* Add on a frame here to work around any rounding errors and make sure land in the subtitle */
+	fv->seek (lc, _start_times[ev.GetIndex()] + ContentTime::from_frames(1, _frc->source), true);
 }