X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftext_view.cc;h=4a39b913976eba1476bc3a5bb123a006e37928ed;hb=82b08e910e07bb571b11368124d49dc3d73e33ca;hp=b4b2baae211503c8792d56b44f3ae799e8eefcda;hpb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;p=dcpomatic.git

diff --git a/src/wx/text_view.cc b/src/wx/text_view.cc
index b4b2baae2..4a39b9139 100644
--- a/src/wx/text_view.cc
+++ b/src/wx/text_view.cc
@@ -18,28 +18,31 @@
 
 */
 
-#include "text_view.h"
+
 #include "film_viewer.h"
+#include "text_view.h"
 #include "wx_util.h"
-#include "lib/string_text_file_decoder.h"
-#include "lib/content_text.h"
-#include "lib/video_decoder.h"
 #include "lib/audio_decoder.h"
-#include "lib/film.h"
 #include "lib/config.h"
+#include "lib/content_text.h"
+#include "lib/film.h"
 #include "lib/string_text_file_content.h"
+#include "lib/string_text_file_decoder.h"
 #include "lib/text_decoder.h"
+#include "lib/video_decoder.h"
+
 
+using std::dynamic_pointer_cast;
 using std::list;
 using std::shared_ptr;
 using std::weak_ptr;
 using boost::bind;
-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, weak_ptr<FilmViewer> viewer
 	)
@@ -73,12 +76,12 @@ TextView::TextView (
 		_list->InsertColumn (2, ip);
 	}
 
-	wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL);
+	auto sizer = new wxBoxSizer (wxVERTICAL);
 	sizer->Add (_list, 1, wxEXPAND | wxALL, DCPOMATIC_SIZER_X_GAP);
 
 	_list->Bind (wxEVT_LIST_ITEM_SELECTED, boost::bind (&TextView::subtitle_selected, this, _1));
 
-	wxSizer* buttons = CreateSeparatedButtonSizer (wxOK);
+	auto buttons = CreateSeparatedButtonSizer (wxOK);
 	if (buttons) {
 		sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
 	}
@@ -94,7 +97,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));
@@ -104,10 +107,11 @@ TextView::TextView (
 	SetSizerAndFit (sizer);
 }
 
+
 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);
@@ -120,6 +124,7 @@ TextView::data_start (ContentStringText cts)
 	_last_count = cts.subs.size ();
 }
 
+
 void
 TextView::data_stop (ContentTime time)
 {
@@ -132,6 +137,7 @@ TextView::data_stop (ContentTime time)
 	}
 }
 
+
 void
 TextView::subtitle_selected (wxListEvent& ev)
 {
@@ -140,9 +146,9 @@ TextView::subtitle_selected (wxListEvent& ev)
 	}
 
 	DCPOMATIC_ASSERT (ev.GetIndex() < int(_start_times.size()));
-	shared_ptr<Content> lc = _content.lock ();
+	auto lc = _content.lock ();
 	DCPOMATIC_ASSERT (lc);
-	shared_ptr<FilmViewer> fv = _film_viewer.lock ();
+	auto 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);