X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Ftext_panel.cc;h=a9a3f142dd60ce3773f5f2d0f8acb7965052f415;hp=81ea9c9418f0cd831406f095a7fbb5c75570947b;hb=6c18c9a37f3a1c8ea1d3ca7791a0f1380b23f5d1;hpb=a5c629cb9b638b67a0e4c2d26fe9ab2e124bf0eb

diff --git a/src/wx/text_panel.cc b/src/wx/text_panel.cc
index 81ea9c941..a9a3f142d 100644
--- a/src/wx/text_panel.cc
+++ b/src/wx/text_panel.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,180 +18,398 @@
 
 */
 
-#include "text_panel.h"
-#include "film_editor.h"
-#include "wx_util.h"
-#include "text_view.h"
+
+#include "check_box.h"
 #include "content_panel.h"
+#include "dcp_text_track_dialog.h"
+#include "dcpomatic_button.h"
+#include "dcpomatic_spin_ctrl.h"
+#include "film_editor.h"
+#include "film_viewer.h"
 #include "fonts_dialog.h"
+#include "language_tag_widget.h"
+#include "static_text.h"
 #include "subtitle_appearance_dialog.h"
+#include "text_panel.h"
+#include "text_view.h"
+#include "wx_util.h"
+#include "lib/analyse_subtitles_job.h"
+#include "lib/dcp_content.h"
+#include "lib/dcp_subtitle_content.h"
+#include "lib/dcp_subtitle_decoder.h"
+#include "lib/decoder_factory.h"
 #include "lib/ffmpeg_content.h"
-#include "lib/string_text_file_content.h"
 #include "lib/ffmpeg_subtitle_stream.h"
-#include "lib/dcp_subtitle_content.h"
+#include "lib/job_manager.h"
+#include "lib/string_text_file_content.h"
 #include "lib/string_text_file_decoder.h"
-#include "lib/dcp_subtitle_decoder.h"
-#include "lib/dcp_content.h"
+#include "lib/subtitle_analysis.h"
 #include "lib/text_content.h"
-#include "lib/decoder_factory.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/spinctrl.h>
-#include <boost/foreach.hpp>
+LIBDCP_ENABLE_WARNINGS
+
 
-using std::vector;
-using std::string;
-using std::list;
 using std::cout;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::dynamic_pointer_cast;
+using std::list;
+using std::shared_ptr;
+using std::string;
+using std::vector;
+using boost::bind;
+using boost::optional;
 
+
+/** @param t Original text type of the content, if known */
 TextPanel::TextPanel (ContentPanel* p, TextType t)
 	: ContentSubPanel (p, std_to_wx(text_type_to_name(t)))
-	, _text_view (0)
-	, _fonts_dialog (0)
 	, _original_type (t)
 {
-	wxBoxSizer* reference_sizer = new wxBoxSizer (wxVERTICAL);
 
-	_reference = new wxCheckBox (this, wxID_ANY, _("Use this DCP's subtitle as OV and make VF"));
-	reference_sizer->Add (_reference, 0, wxLEFT | wxRIGHT | wxTOP, DCPOMATIC_SIZER_GAP);
+}
+
+
+void
+TextPanel::create ()
+{
+	wxString refer = _("Use this DCP's subtitle as OV and make VF");
+	if (_original_type == TextType::CLOSED_CAPTION) {
+		refer = _("Use this DCP's closed caption as OV and make VF");
+	}
 
-	_reference_note = new wxStaticText (this, wxID_ANY, _(""));
+	_reference = new CheckBox (this, refer);
+	_reference_note = new StaticText (this, wxT(""));
 	_reference_note->Wrap (200);
-	reference_sizer->Add (_reference_note, 0, wxLEFT | wxRIGHT, DCPOMATIC_SIZER_GAP);
-	wxFont font = _reference_note->GetFont();
+	auto font = _reference_note->GetFont();
 	font.SetStyle(wxFONTSTYLE_ITALIC);
 	font.SetPointSize(font.GetPointSize() - 1);
 	_reference_note->SetFont(font);
 
-	_sizer->Add (reference_sizer);
+	_use = new CheckBox (this, _("Use as"));
+	_type = new wxChoice (this, wxID_ANY);
+	_type->Append (_("open subtitles"));
+	_type->Append (_("closed captions"));
+
+	_burn = new CheckBox (this, _("Burn subtitles into image"));
+
+	_offset_label = create_label (this, _("Offset"), true);
+	_x_offset_label = create_label (this, _("X"), true);
+	_x_offset = new SpinCtrl (this, DCPOMATIC_SPIN_CTRL_WIDTH);
+	_x_offset_pc_label = new StaticText (this, _("%"));
+	_y_offset_label = create_label (this, _("Y"), true);
+	_y_offset = new SpinCtrl (this, DCPOMATIC_SPIN_CTRL_WIDTH);
+	_y_offset_pc_label = new StaticText (this, _("%"));
+
+	_scale_label = create_label (this, _("Scale"), true);
+	_x_scale_label = create_label (this, _("X"), true);
+	_x_scale = new SpinCtrl (this, DCPOMATIC_SPIN_CTRL_WIDTH);
+	_x_scale_pc_label = new StaticText (this, _("%"));
+	_y_scale_label = create_label (this, S_("Coord|Y"), true);
+	_y_scale = new SpinCtrl (this, DCPOMATIC_SPIN_CTRL_WIDTH);
+	_y_scale_pc_label = new StaticText (this, _("%"));
+
+	_line_spacing_label = create_label (this, _("Line spacing"), true);
+	_line_spacing = new SpinCtrl (this, DCPOMATIC_SPIN_CTRL_WIDTH);
+	_line_spacing_pc_label = new StaticText (this, _("%"));
+
+	_stream_label = create_label (this, _("Stream"), true);
+	_stream = new wxChoice (this, wxID_ANY);
+
+	_text_view_button = new Button (this, _("View..."));
+	_fonts_dialog_button = new Button (this, _("Fonts..."));
+	_appearance_dialog_button = new Button (this, _("Appearance..."));
+
+	_x_offset->SetRange (-100, 100);
+	_y_offset->SetRange (-100, 100);
+	_x_scale->SetRange (0, 1000);
+	_y_scale->SetRange (0, 1000);
+	_line_spacing->SetRange (0, 1000);
+
+	_reference->Bind                (wxEVT_CHECKBOX, boost::bind (&TextPanel::reference_clicked, this));
+	_use->Bind                      (wxEVT_CHECKBOX, boost::bind (&TextPanel::use_toggled, this));
+	_type->Bind                     (wxEVT_CHOICE,   boost::bind (&TextPanel::type_changed, this));
+	_burn->Bind                     (wxEVT_CHECKBOX, boost::bind (&TextPanel::burn_toggled, this));
+	_x_offset->Bind                 (wxEVT_SPINCTRL, boost::bind (&TextPanel::x_offset_changed, this));
+	_y_offset->Bind                 (wxEVT_SPINCTRL, boost::bind (&TextPanel::y_offset_changed, this));
+	_x_scale->Bind                  (wxEVT_SPINCTRL, boost::bind (&TextPanel::x_scale_changed, this));
+	_y_scale->Bind                  (wxEVT_SPINCTRL, boost::bind (&TextPanel::y_scale_changed, this));
+	_line_spacing->Bind             (wxEVT_SPINCTRL, boost::bind (&TextPanel::line_spacing_changed, this));
+	_stream->Bind                   (wxEVT_CHOICE,   boost::bind (&TextPanel::stream_changed, this));
+	_text_view_button->Bind         (wxEVT_BUTTON,   boost::bind (&TextPanel::text_view_clicked, this));
+	_fonts_dialog_button->Bind      (wxEVT_BUTTON,   boost::bind (&TextPanel::fonts_dialog_clicked, this));
+	_appearance_dialog_button->Bind (wxEVT_BUTTON,   boost::bind (&TextPanel::appearance_dialog_clicked, this));
+
+	add_to_grid();
+	content_selection_changed ();
+
+	_sizer->Layout ();
+}
+
+
+void
+TextPanel::setup_visibility ()
+{
+	switch (current_type()) {
+	case TextType::OPEN_SUBTITLE:
+		if (_dcp_track_label) {
+			_dcp_track_label->Destroy ();
+			_dcp_track_label = nullptr;
+		}
+		if (_dcp_track) {
+			_dcp_track->Destroy ();
+			_dcp_track = nullptr;
+		}
+		if (!_outline_subtitles) {
+			_outline_subtitles = new CheckBox (this, _("Show subtitle area"));
+			_outline_subtitles->Bind (wxEVT_CHECKBOX, boost::bind (&TextPanel::outline_subtitles_changed, this));
+			_grid->Add (_outline_subtitles, wxGBPosition(_outline_subtitles_row, 0), wxGBSpan(1, 2));
+		}
+		if (!_language) {
+			_language_label = create_label (this, _("Language"), true);
+			add_label_to_sizer (_grid, _language_label, true, wxGBPosition(_ccap_track_or_language_row, 0));
+			_language_sizer = new wxBoxSizer (wxHORIZONTAL);
+			_language = new LanguageTagWidget (this, _("Language of these subtitles"), boost::none, wxString("en-US-"));
+			_language->Changed.connect (boost::bind(&TextPanel::language_changed, this));
+			_language_sizer->Add (_language->sizer(), 1, wxRIGHT, DCPOMATIC_SIZER_GAP);
+			_language_type = new wxChoice (this, wxID_ANY);
+			/// TRANSLATORS: Main and Additional here are a choice for whether a set of subtitles is in the "main" language of the
+			/// film or an "additional" language.
+			_language_type->Append (_("Main"));
+			_language_type->Append (_("Additional"));
+			_language_type->Bind (wxEVT_CHOICE, boost::bind(&TextPanel::language_is_additional_changed, this));
+			_language_sizer->Add (_language_type, 0, wxALIGN_CENTER_VERTICAL | wxTOP, DCPOMATIC_CHOICE_TOP_PAD);
+			_grid->Add (_language_sizer, wxGBPosition(_ccap_track_or_language_row, 1), wxGBSpan(1, 2));
+			film_content_changed (TextContentProperty::LANGUAGE);
+			film_content_changed (TextContentProperty::LANGUAGE_IS_ADDITIONAL);
+		}
+		break;
+	case TextType::CLOSED_CAPTION:
+		if (_language_label) {
+			_language_label->Destroy ();
+			_language_label = nullptr;
+			_grid->Remove (_language->sizer());
+			delete _language;
+			_grid->Remove (_language_sizer);
+			_language_sizer = nullptr;
+			_language = nullptr;
+			_language_type->Destroy ();
+			_language_type = nullptr;
+		}
+		if (!_dcp_track_label) {
+			_dcp_track_label = create_label (this, _("CCAP track"), true);
+			add_label_to_sizer (_grid, _dcp_track_label, true, wxGBPosition(_ccap_track_or_language_row, 0));
+		}
+		if (!_dcp_track) {
+			_dcp_track = new wxChoice (this, wxID_ANY);
+			_dcp_track->Bind (wxEVT_CHOICE, boost::bind(&TextPanel::dcp_track_changed, this));
+			_grid->Add (_dcp_track, wxGBPosition(_ccap_track_or_language_row, 1), wxDefaultSpan, wxEXPAND);
+			update_dcp_tracks ();
+			film_content_changed (TextContentProperty::DCP_TRACK);
+		}
+		if (_outline_subtitles) {
+			_outline_subtitles->Destroy ();
+			_outline_subtitles = nullptr;
+			clear_outline_subtitles ();
+		}
+		break;
+	default:
+		break;
+	}
+
+	_grid->Layout ();
+}
+
 
-	wxGridBagSizer* grid = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
-	_sizer->Add (grid, 0, wxALL, 8);
+void
+TextPanel::add_to_grid ()
+{
 	int r = 0;
 
-	wxBoxSizer* use = new wxBoxSizer (wxHORIZONTAL);
-	_use = new wxCheckBox (this, wxID_ANY, _("Use as"));
+	auto reference_sizer = new wxBoxSizer (wxVERTICAL);
+	reference_sizer->Add (_reference, 0);
+	reference_sizer->Add (_reference_note, 0);
+	_grid->Add (reference_sizer, wxGBPosition(r, 0), wxGBSpan(1, 4));
+	++r;
+
+	auto use = new wxBoxSizer (wxHORIZONTAL);
 	use->Add (_use, 0, wxEXPAND | wxRIGHT, DCPOMATIC_SIZER_GAP);
-	_type = new wxChoice (this, wxID_ANY);
-	_type->Append (_("open subtitles"));
-	_type->Append (_("closed captions"));
 	use->Add (_type, 1, wxEXPAND, 0);
-	grid->Add (use, wxGBPosition (r, 0), wxGBSpan (1, 2));
+	_grid->Add (use, wxGBPosition (r, 0), wxGBSpan (1, 2));
+	++r;
+
+	_grid->Add (_burn, wxGBPosition (r, 0), wxGBSpan (1, 2));
 	++r;
 
-	_burn = new wxCheckBox (this, wxID_ANY, _("Burn subtitles into image"));
-	grid->Add (_burn, wxGBPosition (r, 0), wxGBSpan (1, 2));
+	_outline_subtitles_row = r;
+	++r;
+
+	add_label_to_sizer (_grid, _offset_label, true, wxGBPosition (r, 0));
+	auto offset = new wxBoxSizer (wxHORIZONTAL);
+	add_label_to_sizer (offset, _x_offset_label, true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL);
+	offset->Add (_x_offset, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP);
+	offset->Add (_x_offset_pc_label, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP * 2);
+#ifdef __WXGTK3__
+	_grid->Add (offset, wxGBPosition(r, 1));
+	++r;
+	offset = new wxBoxSizer (wxHORIZONTAL);
+#endif
+	add_label_to_sizer (offset, _y_offset_label, true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL);
+	offset->Add (_y_offset, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP);
+	add_label_to_sizer (offset, _y_offset_pc_label, false, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL);
+	_grid->Add (offset, wxGBPosition (r, 1));
+	++r;
+
+	add_label_to_sizer (_grid, _scale_label, true, wxGBPosition (r, 0));
+	auto scale = new wxBoxSizer (wxHORIZONTAL);
+	add_label_to_sizer (scale, _x_scale_label, true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL);
+	scale->Add (_x_scale, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP);
+	scale->Add (_x_scale_pc_label, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP * 2);
+#ifdef __WXGTK3__
+	_grid->Add (scale, wxGBPosition(r, 1));
+	++r;
+	scale = new wxBoxSizer (wxHORIZONTAL);
+#endif
+	add_label_to_sizer (scale, _y_scale_label, true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL);
+	scale->Add (_y_scale, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP);
+	add_label_to_sizer (scale, _y_scale_pc_label, false, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL);
+	_grid->Add (scale, wxGBPosition (r, 1));
 	++r;
 
 	{
-		add_label_to_sizer (grid, this, _("X Offset"), true, wxGBPosition (r, 0));
-		wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-		_x_offset = new wxSpinCtrl (this);
-		s->Add (_x_offset);
-		add_label_to_sizer (s, this, _("%"), false);
-		grid->Add (s, wxGBPosition (r, 1));
+		add_label_to_sizer (_grid, _line_spacing_label, true, wxGBPosition (r, 0));
+		auto s = new wxBoxSizer (wxHORIZONTAL);
+		s->Add (_line_spacing);
+		add_label_to_sizer (s, _line_spacing_pc_label, false, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL);
+		_grid->Add (s, wxGBPosition (r, 1));
 		++r;
 	}
 
+	_ccap_track_or_language_row = r;
+	++r;
+
+	add_label_to_sizer (_grid, _stream_label, true, wxGBPosition (r, 0));
+	_grid->Add (_stream, wxGBPosition (r, 1));
+	++r;
+
 	{
-		add_label_to_sizer (grid, this, _("Y Offset"), true, wxGBPosition (r, 0));
-		wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-		_y_offset = new wxSpinCtrl (this);
-		s->Add (_y_offset);
-		add_label_to_sizer (s, this, _("%"), false);
-		grid->Add (s, wxGBPosition (r, 1));
+		auto s = new wxBoxSizer (wxHORIZONTAL);
+
+		s->Add (_text_view_button, 0, wxALL, DCPOMATIC_SIZER_GAP);
+		s->Add (_fonts_dialog_button, 0, wxALL, DCPOMATIC_SIZER_GAP);
+		s->Add (_appearance_dialog_button, 0, wxALL, DCPOMATIC_SIZER_GAP);
+
+		_grid->Add (s, wxGBPosition(r, 0), wxGBSpan(1, 2));
 		++r;
 	}
 
-	{
-		add_label_to_sizer (grid, this, _("X Scale"), true, wxGBPosition (r, 0));
-		wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-		_x_scale = new wxSpinCtrl (this);
-		s->Add (_x_scale);
-		add_label_to_sizer (s, this, _("%"), false);
-		grid->Add (s, wxGBPosition (r, 1));
-		++r;
+	setup_visibility ();
+}
+
+
+void
+TextPanel::update_dcp_track_selection ()
+{
+	DCPOMATIC_ASSERT (_dcp_track);
+
+	optional<DCPTextTrack> selected;
+	bool many = false;
+	for (auto i: _parent->selected_text()) {
+		auto t = i->text_of_original_type(_original_type);
+		if (t) {
+			auto dt = t->dcp_track();
+			if (dt && selected && *dt != *selected) {
+				many = true;
+			} else if (!selected) {
+				selected = dt;
+			}
+		}
 	}
 
-	{
-		add_label_to_sizer (grid, this, _("Y Scale"), true, wxGBPosition (r, 0));
-		wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-		_y_scale = new wxSpinCtrl (this);
-		s->Add (_y_scale);
-		add_label_to_sizer (s, this, _("%"), false);
-		grid->Add (s, wxGBPosition (r, 1));
-		++r;
+	int n = 0;
+	for (auto i: _parent->film()->closed_caption_tracks()) {
+		if (!many && selected && *selected == i) {
+			_dcp_track->SetSelection (n);
+		}
+		++n;
 	}
 
-	{
-		add_label_to_sizer (grid, this, _("Line spacing"), true, wxGBPosition (r, 0));
-		wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-		_line_spacing = new wxSpinCtrl (this);
-		s->Add (_line_spacing);
-		add_label_to_sizer (s, this, _("%"), false);
-		grid->Add (s, wxGBPosition (r, 1));
-		++r;
+	if (!selected || many) {
+		_dcp_track->SetSelection (wxNOT_FOUND);
 	}
+}
 
-	add_label_to_sizer (grid, this, _("Language"), true, wxGBPosition (r, 0));
-	_language = new wxTextCtrl (this, wxID_ANY);
-	grid->Add (_language, wxGBPosition (r, 1));
-	++r;
 
-	add_label_to_sizer (grid, this, _("Stream"), true, wxGBPosition (r, 0));
-	_stream = new wxChoice (this, wxID_ANY);
-	grid->Add (_stream, wxGBPosition (r, 1));
-	++r;
+void
+TextPanel::update_dcp_tracks ()
+{
+	DCPOMATIC_ASSERT (_dcp_track);
+
+	_dcp_track->Clear ();
+	for (auto i: _parent->film()->closed_caption_tracks()) {
+		/* XXX: don't display the "magic" track which has empty name and language;
+		   this is a nasty hack (see also Film::closed_caption_tracks)
+		*/
+		if (!i.name.empty() || i.language) {
+			_dcp_track->Append (std_to_wx(i.summary()));
+		}
+	}
 
-	{
-		wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+	if (_parent->film()->closed_caption_tracks().size() < 6) {
+		_dcp_track->Append (_("Add new..."));
+	}
 
-		_text_view_button = new wxButton (this, wxID_ANY, _("View..."));
-		s->Add (_text_view_button, 1, wxALL, DCPOMATIC_SIZER_GAP);
-		_fonts_dialog_button = new wxButton (this, wxID_ANY, _("Fonts..."));
-		s->Add (_fonts_dialog_button, 1, wxALL, DCPOMATIC_SIZER_GAP);
-		_appearance_dialog_button = new wxButton (this, wxID_ANY, _("Appearance..."));
-		s->Add (_appearance_dialog_button, 1, wxALL, DCPOMATIC_SIZER_GAP);
+	update_dcp_track_selection ();
+}
 
-		grid->Add (s, wxGBPosition (r, 0), wxGBSpan (1, 2));
-		++r;
+
+void
+TextPanel::dcp_track_changed ()
+{
+	optional<DCPTextTrack> track;
+
+	if (_dcp_track->GetSelection() == int(_dcp_track->GetCount()) - 1) {
+		auto d = new DCPTextTrackDialog (this);
+		if (d->ShowModal() == wxID_OK) {
+			track = d->get();
+		}
+		d->Destroy ();
+	} else {
+		/* Find the DCPTextTrack that was selected */
+		for (auto i: _parent->film()->closed_caption_tracks()) {
+			if (i.summary() == wx_to_std(_dcp_track->GetStringSelection())) {
+				track = i;
+			}
+		}
 	}
 
-	_x_offset->SetRange (-100, 100);
-	_y_offset->SetRange (-100, 100);
-	_x_scale->SetRange (10, 1000);
-	_y_scale->SetRange (10, 1000);
-	_line_spacing->SetRange (10, 1000);
+	if (track) {
+		for (auto i: _parent->selected_text()) {
+			auto t = i->text_of_original_type(_original_type);
+			if (t && t->type() == TextType::CLOSED_CAPTION) {
+				t->set_dcp_track(*track);
+			}
+		}
+	}
 
-	_reference->Bind                (wxEVT_CHECKBOX, boost::bind (&TextPanel::reference_clicked, this));
-	_use->Bind                      (wxEVT_CHECKBOX, boost::bind (&TextPanel::use_toggled, this));
-	_type->Bind                     (wxEVT_CHOICE,   boost::bind (&TextPanel::type_changed, this));
-	_burn->Bind                     (wxEVT_CHECKBOX, boost::bind (&TextPanel::burn_toggled, this));
-	_x_offset->Bind                 (wxEVT_SPINCTRL, boost::bind (&TextPanel::x_offset_changed, this));
-	_y_offset->Bind                 (wxEVT_SPINCTRL, boost::bind (&TextPanel::y_offset_changed, this));
-	_x_scale->Bind                  (wxEVT_SPINCTRL, boost::bind (&TextPanel::x_scale_changed, this));
-	_y_scale->Bind                  (wxEVT_SPINCTRL, boost::bind (&TextPanel::y_scale_changed, this));
-	_line_spacing->Bind             (wxEVT_SPINCTRL, boost::bind (&TextPanel::line_spacing_changed, this));
-	_language->Bind                 (wxEVT_TEXT,     boost::bind (&TextPanel::language_changed, this));
-	_stream->Bind                   (wxEVT_CHOICE,   boost::bind (&TextPanel::stream_changed, this));
-	_text_view_button->Bind         (wxEVT_BUTTON,   boost::bind (&TextPanel::text_view_clicked, this));
-	_fonts_dialog_button->Bind      (wxEVT_BUTTON,   boost::bind (&TextPanel::fonts_dialog_clicked, this));
-	_appearance_dialog_button->Bind (wxEVT_BUTTON,   boost::bind (&TextPanel::appearance_dialog_clicked, this));
+	update_dcp_tracks ();
 }
 
+
 void
 TextPanel::film_changed (Film::Property property)
 {
-	if (property == Film::CONTENT || property == Film::REEL_TYPE) {
+	if (property == Film::Property::CONTENT || property == Film::Property::REEL_TYPE || property == Film::Property::INTEROP) {
 		setup_sensitivity ();
 	}
 }
 
+
 void
 TextPanel::film_content_changed (int property)
 {
-	FFmpegContentList fc = _parent->selected_ffmpeg ();
-	ContentList sc = _parent->selected_text ();
+	auto fc = _parent->selected_ffmpeg ();
+	auto sc = _parent->selected_text ();
 
 	shared_ptr<FFmpegContent> fcs;
 	if (fc.size() == 1) {
@@ -211,9 +429,8 @@ TextPanel::film_content_changed (int property)
 	if (property == FFmpegContentProperty::SUBTITLE_STREAMS) {
 		_stream->Clear ();
 		if (fcs) {
-			vector<shared_ptr<FFmpegSubtitleStream> > s = fcs->subtitle_streams ();
-			for (vector<shared_ptr<FFmpegSubtitleStream> >::iterator i = s.begin(); i != s.end(); ++i) {
-				_stream->Append (std_to_wx ((*i)->name), new wxStringClientData (std_to_wx ((*i)->identifier ())));
+			for (auto i: fcs->subtitle_streams()) {
+				_stream->Append (std_to_wx(i->name), new wxStringClientData(std_to_wx(i->identifier())));
 			}
 
 			if (fcs->subtitle_stream()) {
@@ -223,16 +440,18 @@ TextPanel::film_content_changed (int property)
 			}
 		}
 		setup_sensitivity ();
+		clear_outline_subtitles ();
 	} else if (property == TextContentProperty::USE) {
 		checked_set (_use, text ? text->use() : false);
 		setup_sensitivity ();
+		clear_outline_subtitles ();
 	} else if (property == TextContentProperty::TYPE) {
 		if (text) {
 			switch (text->type()) {
-			case TEXT_OPEN_SUBTITLE:
+			case TextType::OPEN_SUBTITLE:
 				_type->SetSelection (0);
 				break;
-			case TEXT_CLOSED_CAPTION:
+			case TextType::CLOSED_CAPTION:
 				_type->SetSelection (1);
 				break;
 			default:
@@ -242,23 +461,39 @@ TextPanel::film_content_changed (int property)
 			_type->SetSelection (0);
 		}
 		setup_sensitivity ();
+		setup_visibility ();
 	} else if (property == TextContentProperty::BURN) {
 		checked_set (_burn, text ? text->burn() : false);
 	} else if (property == TextContentProperty::X_OFFSET) {
 		checked_set (_x_offset, text ? lrint (text->x_offset() * 100) : 0);
+		update_outline_subtitles_in_viewer ();
 	} else if (property == TextContentProperty::Y_OFFSET) {
 		checked_set (_y_offset, text ? lrint (text->y_offset() * 100) : 0);
+		update_outline_subtitles_in_viewer ();
 	} else if (property == TextContentProperty::X_SCALE) {
 		checked_set (_x_scale, text ? lrint (text->x_scale() * 100) : 100);
+		clear_outline_subtitles ();
 	} else if (property == TextContentProperty::Y_SCALE) {
 		checked_set (_y_scale, text ? lrint (text->y_scale() * 100) : 100);
+		clear_outline_subtitles ();
 	} else if (property == TextContentProperty::LINE_SPACING) {
 		checked_set (_line_spacing, text ? lrint (text->line_spacing() * 100) : 100);
+		clear_outline_subtitles ();
+	} else if (property == TextContentProperty::DCP_TRACK) {
+		if (_dcp_track) {
+			update_dcp_track_selection ();
+		}
 	} else if (property == TextContentProperty::LANGUAGE) {
-		checked_set (_language, text ? text->language() : "");
+		if (_language) {
+			_language->set (text ? text->language() : boost::none);
+		}
+	} else if (property == TextContentProperty::LANGUAGE_IS_ADDITIONAL) {
+		if (_language_type) {
+			_language_type->SetSelection (text ? (text->language_is_additional() ? 1 : 0) : 0);
+		}
 	} else if (property == DCPContentProperty::REFERENCE_TEXT) {
 		if (scs) {
-			shared_ptr<DCPContent> dcp = dynamic_pointer_cast<DCPContent> (scs);
+			auto dcp = dynamic_pointer_cast<DCPContent> (scs);
 			checked_set (_reference, dcp ? dcp->reference_text(_original_type) : false);
 		} else {
 			checked_set (_reference, false);
@@ -267,58 +502,80 @@ TextPanel::film_content_changed (int property)
 		setup_sensitivity ();
 	} else if (property == DCPContentProperty::TEXTS) {
 		setup_sensitivity ();
+	} else if (property == ContentProperty::TRIM_START) {
+		setup_sensitivity ();
 	}
 }
 
+
 void
 TextPanel::use_toggled ()
 {
-	BOOST_FOREACH (shared_ptr<Content> i, _parent->selected_text()) {
+	for (auto i: _parent->selected_text()) {
 		i->text_of_original_type(_original_type)->set_use (_use->GetValue());
 	}
 }
 
+
+/** @return the text type that is currently selected in the drop-down */
+TextType
+TextPanel::current_type () const
+{
+	switch (_type->GetSelection()) {
+	case 0:
+		return TextType::OPEN_SUBTITLE;
+	case 1:
+		return TextType::CLOSED_CAPTION;
+	}
+
+	return TextType::UNKNOWN;
+}
+
+
 void
 TextPanel::type_changed ()
 {
-	BOOST_FOREACH (shared_ptr<Content> i, _parent->selected_text()) {
-		switch (_type->GetSelection()) {
-		case 0:
-			i->text_of_original_type(_original_type)->set_type (TEXT_OPEN_SUBTITLE);
-			break;
-		case 1:
-			i->text_of_original_type(_original_type)->set_type (TEXT_CLOSED_CAPTION);
-			break;
-		}
+	for (auto i: _parent->selected_text()) {
+		i->text_of_original_type(_original_type)->set_type (current_type ());
 	}
+
+	setup_visibility ();
 }
 
+
 void
 TextPanel::burn_toggled ()
 {
-	BOOST_FOREACH (shared_ptr<Content> i, _parent->selected_text ()) {
+	for (auto i: _parent->selected_text ()) {
 		i->text_of_original_type(_original_type)->set_burn (_burn->GetValue());
 	}
 }
 
+
 void
 TextPanel::setup_sensitivity ()
 {
 	int any_subs = 0;
+	/* We currently assume that FFmpeg subtitles are bitmapped */
 	int ffmpeg_subs = 0;
-	ContentList sel = _parent->selected_text ();
-	BOOST_FOREACH (shared_ptr<Content> i, sel) {
+	/* DCP subs can't have their line spacing changed */
+	int dcp_subs = 0;
+	auto sel = _parent->selected_text ();
+	for (auto i: sel) {
 		/* These are the content types that could include subtitles */
-		shared_ptr<const FFmpegContent> fc = boost::dynamic_pointer_cast<const FFmpegContent> (i);
-		shared_ptr<const StringTextFileContent> sc = boost::dynamic_pointer_cast<const StringTextFileContent> (i);
-		shared_ptr<const DCPContent> dc = boost::dynamic_pointer_cast<const DCPContent> (i);
-		shared_ptr<const DCPSubtitleContent> dsc = boost::dynamic_pointer_cast<const DCPSubtitleContent> (i);
+		auto fc = std::dynamic_pointer_cast<const FFmpegContent>(i);
+		auto sc = std::dynamic_pointer_cast<const StringTextFileContent>(i);
+		auto dc = std::dynamic_pointer_cast<const DCPContent>(i);
+		auto dsc = std::dynamic_pointer_cast<const DCPSubtitleContent>(i);
 		if (fc) {
 			if (!fc->text.empty()) {
 				++ffmpeg_subs;
 				++any_subs;
 			}
-		} else if (sc || dc || dsc) {
+		} else if (dc || dsc) {
+			++dcp_subs;
+			++any_subs;
+		} else if (sc) {
 			/* XXX: in the future there could be bitmap subs from DCPs */
 			++any_subs;
 		}
@@ -328,45 +585,77 @@ TextPanel::setup_sensitivity ()
 
 	shared_ptr<DCPContent> dcp;
 	if (sel.size() == 1) {
-		dcp = dynamic_pointer_cast<DCPContent> (sel.front ());
+		dcp = dynamic_pointer_cast<DCPContent>(sel.front());
 	}
 
 	string why_not;
-	bool const can_reference = dcp && dcp->can_reference_text (_original_type, why_not);
-	setup_refer_button (_reference, _reference_note, dcp, can_reference, why_not);
+	bool const can_reference = dcp && dcp->can_reference_text (_parent->film(), _original_type, why_not);
+	wxString cannot;
+	if (why_not.empty()) {
+		cannot = _("Cannot reference this DCP's subtitles or captions.");
+	} else {
+		cannot = _("Cannot reference this DCP's subtitles or captions: ") + std_to_wx(why_not);
+	}
+	setup_refer_button (_reference, _reference_note, dcp, can_reference, cannot);
 
 	bool const reference = _reference->GetValue ();
 
+	auto const type = current_type ();
+
+	/* Set up _type */
+	_type->Clear ();
+	_type->Append (_("open subtitles"));
+	if (ffmpeg_subs == 0) {
+		_type->Append (_("closed captions"));
+	}
+
+	switch (type) {
+	case TextType::OPEN_SUBTITLE:
+		_type->SetSelection (0);
+		break;
+	case TextType::CLOSED_CAPTION:
+		if (_type->GetCount() > 1) {
+			_type->SetSelection (1);
+		}
+		break;
+	default:
+		break;
+	}
+
 	/* Set up sensitivity */
 	_use->Enable (!reference && any_subs > 0);
 	bool const use = _use->GetValue ();
+	if (_outline_subtitles) {
+		_outline_subtitles->Enable (!_loading_analysis && any_subs && use && type == TextType::OPEN_SUBTITLE);
+	}
 	_type->Enable (!reference && any_subs > 0 && use);
-	_burn->Enable (!reference && any_subs > 0 && use && _type->GetSelection() == 0);
-	_x_offset->Enable (!reference && any_subs > 0 && use);
-	_y_offset->Enable (!reference && any_subs > 0 && use);
-	_x_scale->Enable (!reference && any_subs > 0 && use);
-	_y_scale->Enable (!reference && any_subs > 0 && use);
-	_line_spacing->Enable (!reference && use);
-	_language->Enable (!reference && any_subs > 0 && use);
+	_burn->Enable (!reference && any_subs > 0 && use && type == TextType::OPEN_SUBTITLE);
+	_x_offset->Enable (!reference && any_subs > 0 && use && type == TextType::OPEN_SUBTITLE);
+	_y_offset->Enable (!reference && any_subs > 0 && use && type == TextType::OPEN_SUBTITLE);
+	_x_scale->Enable (!reference && any_subs > 0 && use && type == TextType::OPEN_SUBTITLE);
+	_y_scale->Enable (!reference && any_subs > 0 && use && type == TextType::OPEN_SUBTITLE);
+	_line_spacing->Enable (!reference && use && type == TextType::OPEN_SUBTITLE && dcp_subs < any_subs);
 	_stream->Enable (!reference && ffmpeg_subs == 1);
-	_text_view_button->Enable (!reference);
-	_fonts_dialog_button->Enable (!reference);
-	_appearance_dialog_button->Enable (!reference && any_subs > 0 && use);
+	/* Ideally we would check here to see if the FFmpeg content has "string" subs (i.e. not bitmaps) */
+	_text_view_button->Enable (!reference && any_subs > 0 && ffmpeg_subs == 0);
+	_fonts_dialog_button->Enable (!reference && any_subs > 0 && ffmpeg_subs == 0 && type == TextType::OPEN_SUBTITLE);
+	_appearance_dialog_button->Enable (!reference && any_subs > 0 && use && type == TextType::OPEN_SUBTITLE);
 }
 
+
 void
 TextPanel::stream_changed ()
 {
-	FFmpegContentList fc = _parent->selected_ffmpeg ();
+	auto fc = _parent->selected_ffmpeg ();
 	if (fc.size() != 1) {
 		return;
 	}
 
-	shared_ptr<FFmpegContent> fcs = fc.front ();
+	auto fcs = fc.front ();
 
-	vector<shared_ptr<FFmpegSubtitleStream> > a = fcs->subtitle_streams ();
-	vector<shared_ptr<FFmpegSubtitleStream> >::iterator i = a.begin ();
-	string const s = string_client_data (_stream->GetClientObject (_stream->GetSelection ()));
+	auto a = fcs->subtitle_streams ();
+	auto i = a.begin ();
+	auto const s = string_client_data (_stream->GetClientObject(_stream->GetSelection()));
 	while (i != a.end() && (*i)->identifier () != s) {
 		++i;
 	}
@@ -376,54 +665,51 @@ TextPanel::stream_changed ()
 	}
 }
 
+
 void
 TextPanel::x_offset_changed ()
 {
-	BOOST_FOREACH (shared_ptr<Content> i, _parent->selected_text ()) {
+	for (auto i: _parent->selected_text ()) {
 		i->text_of_original_type(_original_type)->set_x_offset (_x_offset->GetValue() / 100.0);
 	}
 }
 
+
 void
 TextPanel::y_offset_changed ()
 {
-	BOOST_FOREACH (shared_ptr<Content> i, _parent->selected_text ()) {
+	for (auto i: _parent->selected_text ()) {
 		i->text_of_original_type(_original_type)->set_y_offset (_y_offset->GetValue() / 100.0);
 	}
 }
 
+
 void
 TextPanel::x_scale_changed ()
 {
-	ContentList c = _parent->selected_text ();
-	if (c.size() == 1) {
-		c.front()->text_of_original_type(_original_type)->set_x_scale (_x_scale->GetValue() / 100.0);
+	for (auto i: _parent->selected_text ()) {
+		i->text_of_original_type(_original_type)->set_x_scale (_x_scale->GetValue() / 100.0);
 	}
 }
 
+
 void
 TextPanel::y_scale_changed ()
 {
-	BOOST_FOREACH (shared_ptr<Content> i, _parent->selected_text ()) {
+	for (auto i: _parent->selected_text ()) {
 		i->text_of_original_type(_original_type)->set_y_scale (_y_scale->GetValue() / 100.0);
 	}
 }
 
+
 void
 TextPanel::line_spacing_changed ()
 {
-	BOOST_FOREACH (shared_ptr<Content> i, _parent->selected_text ()) {
+	for (auto i: _parent->selected_text ()) {
 		i->text_of_original_type(_original_type)->set_line_spacing (_line_spacing->GetValue() / 100.0);
 	}
 }
 
-void
-TextPanel::language_changed ()
-{
-	BOOST_FOREACH (shared_ptr<Content> i, _parent->selected_text ()) {
-		i->text_of_original_type(_original_type)->set_language (wx_to_std (_language->GetValue()));
-	}
-}
 
 void
 TextPanel::content_selection_changed ()
@@ -436,24 +722,27 @@ TextPanel::content_selection_changed ()
 	film_content_changed (TextContentProperty::X_SCALE);
 	film_content_changed (TextContentProperty::Y_SCALE);
 	film_content_changed (TextContentProperty::LINE_SPACING);
-	film_content_changed (TextContentProperty::LANGUAGE);
 	film_content_changed (TextContentProperty::FONTS);
 	film_content_changed (TextContentProperty::TYPE);
+	film_content_changed (TextContentProperty::DCP_TRACK);
+	film_content_changed (TextContentProperty::LANGUAGE);
+	film_content_changed (TextContentProperty::LANGUAGE_IS_ADDITIONAL);
 	film_content_changed (DCPContentProperty::REFERENCE_TEXT);
 }
 
+
 void
 TextPanel::text_view_clicked ()
 {
 	if (_text_view) {
 		_text_view->Destroy ();
-		_text_view = 0;
+		_text_view = nullptr;
 	}
 
-	ContentList c = _parent->selected_text ();
+	auto c = _parent->selected_text ();
 	DCPOMATIC_ASSERT (c.size() == 1);
 
-	shared_ptr<Decoder> decoder = decoder_factory (c.front(), _parent->film()->log(), false);
+	auto decoder = decoder_factory (_parent->film(), c.front(), false, false, shared_ptr<Decoder>());
 
 	if (decoder) {
 		_text_view = new TextView (this, _parent->film(), c.front(), c.front()->text_of_original_type(_original_type), decoder, _parent->film_viewer());
@@ -461,30 +750,32 @@ TextPanel::text_view_clicked ()
 	}
 }
 
+
 void
 TextPanel::fonts_dialog_clicked ()
 {
 	if (_fonts_dialog) {
 		_fonts_dialog->Destroy ();
-		_fonts_dialog = 0;
+		_fonts_dialog = nullptr;
 	}
 
-	ContentList c = _parent->selected_text ();
+	auto c = _parent->selected_text ();
 	DCPOMATIC_ASSERT (c.size() == 1);
 
 	_fonts_dialog = new FontsDialog (this, c.front(), c.front()->text_of_original_type(_original_type));
 	_fonts_dialog->Show ();
 }
 
+
 void
 TextPanel::reference_clicked ()
 {
-	ContentList c = _parent->selected ();
+	auto c = _parent->selected ();
 	if (c.size() != 1) {
 		return;
 	}
 
-	shared_ptr<DCPContent> d = dynamic_pointer_cast<DCPContent> (c.front ());
+	auto d = dynamic_pointer_cast<DCPContent> (c.front ());
 	if (!d) {
 		return;
 	}
@@ -492,15 +783,164 @@ TextPanel::reference_clicked ()
 	d->set_reference_text (_original_type, _reference->GetValue ());
 }
 
+
 void
 TextPanel::appearance_dialog_clicked ()
 {
-	ContentList c = _parent->selected_text ();
+	auto c = _parent->selected_text ();
 	DCPOMATIC_ASSERT (c.size() == 1);
 
-	SubtitleAppearanceDialog* d = new SubtitleAppearanceDialog (this, c.front(), c.front()->text_of_original_type(_original_type));
+	auto d = new SubtitleAppearanceDialog (this, _parent->film(), c.front(), c.front()->text_of_original_type(_original_type));
 	if (d->ShowModal () == wxID_OK) {
 		d->apply ();
 	}
 	d->Destroy ();
 }
+
+
+/** The user has clicked on the outline subtitles check box */
+void
+TextPanel::outline_subtitles_changed ()
+{
+	if (_outline_subtitles->GetValue()) {
+		_analysis_content = _parent->selected_text().front();
+		try_to_load_analysis ();
+	} else {
+		clear_outline_subtitles ();
+	}
+}
+
+
+void
+TextPanel::try_to_load_analysis ()
+{
+	if (_loading_analysis) {
+		return;
+	}
+
+	_loading_analysis = true;
+	setup_sensitivity ();
+	_analysis.reset ();
+
+	auto content = _analysis_content.lock ();
+	if (!content) {
+		_loading_analysis = false;
+		setup_sensitivity ();
+		return;
+	}
+
+	auto const path = _parent->film()->subtitle_analysis_path(content);
+
+	if (!boost::filesystem::exists(path)) {
+		for (auto i: JobManager::instance()->get()) {
+			if (dynamic_pointer_cast<AnalyseSubtitlesJob>(i)) {
+				i->cancel ();
+			}
+		}
+
+		JobManager::instance()->analyse_subtitles (
+			_parent->film(), content, _analysis_finished_connection, bind(&TextPanel::analysis_finished, this)
+			);
+		return;
+	}
+
+	try {
+		_analysis.reset (new SubtitleAnalysis(path));
+	} catch (OldFormatError& e) {
+		/* An old analysis file: recreate it */
+		JobManager::instance()->analyse_subtitles (
+			_parent->film(), content, _analysis_finished_connection, bind(&TextPanel::analysis_finished, this)
+			);
+		return;
+        }
+
+	update_outline_subtitles_in_viewer ();
+	_loading_analysis = false;
+	setup_sensitivity ();
+}
+
+
+void
+TextPanel::update_outline_subtitles_in_viewer ()
+{
+	auto fv = _parent->film_viewer().lock();
+	if (!fv) {
+		return;
+	}
+
+	if (_analysis) {
+		auto rect = _analysis->bounding_box ();
+		if (rect) {
+			auto content = _analysis_content.lock ();
+			DCPOMATIC_ASSERT (content);
+			rect->x += content->text.front()->x_offset() - _analysis->analysis_x_offset();
+			rect->y += content->text.front()->y_offset() - _analysis->analysis_y_offset();
+		}
+		fv->set_outline_subtitles (rect);
+	} else {
+		fv->set_outline_subtitles ({});
+	}
+}
+
+
+/** Remove any current subtitle outline display */
+void
+TextPanel::clear_outline_subtitles ()
+{
+	_analysis.reset ();
+	update_outline_subtitles_in_viewer ();
+	if (_outline_subtitles) {
+		_outline_subtitles->SetValue (false);
+	}
+}
+
+
+void
+TextPanel::analysis_finished ()
+{
+	auto content = _analysis_content.lock ();
+	if (!content) {
+		_loading_analysis = false;
+		setup_sensitivity ();
+		return;
+	}
+
+	if (!boost::filesystem::exists(_parent->film()->subtitle_analysis_path(content))) {
+		/* We analysed and still nothing showed up, so maybe it was cancelled or it failed.
+		   Give up.
+		*/
+		error_dialog (_parent->window(), _("Could not analyse subtitles."));
+		clear_outline_subtitles ();
+		_loading_analysis = false;
+		setup_sensitivity ();
+		return;
+	}
+
+	_loading_analysis = false;
+	try_to_load_analysis ();
+}
+
+
+void
+TextPanel::language_changed ()
+{
+	for (auto i: _parent->selected_text()) {
+		auto t = i->text_of_original_type(_original_type);
+		if (t) {
+			t->set_language (_language->get());
+		}
+	}
+}
+
+
+void
+TextPanel::language_is_additional_changed ()
+{
+	for (auto i: _parent->selected_text()) {
+		auto t = i->text_of_original_type(_original_type);
+		if (t) {
+			t->set_language_is_additional (_language_type->GetSelection() == 1);
+		}
+	}
+}
+