X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Ftext_panel.cc;h=2121ba388254d6a6b9a61dc1220ded90274b5ab0;hp=7c2ddd7f9575c1b6dd2d0b0a26456ab7649808fc;hb=e8582393bd1367fff36bae8e053d799073d8b2ed;hpb=8484d278ec6905502bd1178cc58d8cb7b3c12df0

diff --git a/src/wx/text_panel.cc b/src/wx/text_panel.cc
index 7c2ddd7f9..2121ba388 100644
--- a/src/wx/text_panel.cc
+++ b/src/wx/text_panel.cc
@@ -24,7 +24,11 @@
 #include "text_view.h"
 #include "content_panel.h"
 #include "fonts_dialog.h"
+#include "dcp_text_track_dialog.h"
 #include "subtitle_appearance_dialog.h"
+#include "static_text.h"
+#include "check_box.h"
+#include "dcpomatic_button.h"
 #include "lib/ffmpeg_content.h"
 #include "lib/string_text_file_content.h"
 #include "lib/ffmpeg_subtitle_stream.h"
@@ -52,117 +56,58 @@ TextPanel::TextPanel (ContentPanel* p, TextType t)
 	, _fonts_dialog (0)
 	, _original_type (t)
 {
-	wxBoxSizer* reference_sizer = new wxBoxSizer (wxVERTICAL);
-
 	wxString refer = _("Use this DCP's subtitle as OV and make VF");
 	if (t == TEXT_CLOSED_CAPTION) {
 		refer = _("Use this DCP's closed caption as OV and make VF");
 	}
 
-	_reference = new wxCheckBox (this, wxID_ANY, refer);
-	reference_sizer->Add (_reference, 0, wxLEFT | wxRIGHT | wxTOP, DCPOMATIC_SIZER_GAP);
-
-	_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();
 	font.SetStyle(wxFONTSTYLE_ITALIC);
 	font.SetPointSize(font.GetPointSize() - 1);
 	_reference_note->SetFont(font);
 
-	_sizer->Add (reference_sizer);
-
-	wxGridBagSizer* grid = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
-	_sizer->Add (grid, 0, wxALL, 8);
-	int r = 0;
-
-	wxBoxSizer* use = new wxBoxSizer (wxHORIZONTAL);
-	_use = new wxCheckBox (this, wxID_ANY, _("Use as"));
-	use->Add (_use, 0, wxEXPAND | wxRIGHT, DCPOMATIC_SIZER_GAP);
+	_use = new CheckBox (this, _("Use as"));
 	_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));
-	++r;
 
-	_burn = new wxCheckBox (this, wxID_ANY, _("Burn subtitles into image"));
-	grid->Add (_burn, wxGBPosition (r, 0), wxGBSpan (1, 2));
-	++r;
+	_burn = new CheckBox (this, _("Burn subtitles into image"));
 
-	{
-		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));
-		++r;
-	}
+	_offset_label = create_label (this, _("Offset"), true);
+	_x_offset_label = create_label (this, _("X"), true);
+	_x_offset = new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(64, -1));
+	_x_offset_pc_label = new StaticText (this, _("%"));
+	_y_offset_label = create_label (this, _("Y"), true);
+	_y_offset = new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(64, -1));
+	_y_offset_pc_label = new StaticText (this, _("%"));
 
-	{
-		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));
-		++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;
-	}
+	_scale_label = create_label (this, _("Scale"), true);
+	_x_scale_label = create_label (this, _("X"), true);
+	_x_scale = new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(64, -1));
+	_x_scale_pc_label = new StaticText (this, _("%"));
+	_y_scale_label = create_label (this, S_("Coord|Y"), true);
+	_y_scale = new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(64, -1));
+	_y_scale_pc_label = new StaticText (this, _("%"));
 
-	{
-		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;
-	}
+	_line_spacing_label = create_label (this, _("Line spacing"), true);
+	_line_spacing = new wxSpinCtrl (this);
+	_line_spacing_pc_label = new StaticText (this, _("%"));
 
-	{
-		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;
-	}
+	_dcp_track_label = create_label (this, _("DCP track"), true);
+	_dcp_track = new wxChoice (this, wxID_ANY);
 
-	add_label_to_sizer (grid, this, _("Language"), true, wxGBPosition (r, 0));
+	_language_label = create_label (this, _("Language"), true);
 	_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_label = create_label (this, _("Stream"), true);
 	_stream = new wxChoice (this, wxID_ANY);
-	grid->Add (_stream, wxGBPosition (r, 1));
-	++r;
 
-	{
-		wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-
-		_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);
-
-		grid->Add (s, wxGBPosition (r, 0), wxGBSpan (1, 2));
-		++r;
-	}
+	_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);
@@ -170,6 +115,10 @@ TextPanel::TextPanel (ContentPanel* p, TextType t)
 	_y_scale->SetRange (10, 1000);
 	_line_spacing->SetRange (10, 1000);
 
+	update_dcp_tracks ();
+
+	content_selection_changed ();
+
 	_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));
@@ -179,17 +128,184 @@ TextPanel::TextPanel (ContentPanel* p, TextType t)
 	_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));
+	_dcp_track->Bind                (wxEVT_CHOICE,   boost::bind (&TextPanel::dcp_track_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));
+
+	add_to_grid();
+}
+
+void
+TextPanel::add_to_grid ()
+{
+	Config::Interface const interface = Config::instance()->interface_complexity();
+
+	int r = 0;
+
+	_reference->Show (interface == Config::INTERFACE_FULL);
+	_reference_note->Show (interface == Config::INTERFACE_FULL);
+
+	if (interface == Config::INTERFACE_FULL) {
+		wxBoxSizer* 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;
+	}
+
+	wxBoxSizer* use = new wxBoxSizer (wxHORIZONTAL);
+	use->Add (_use, 0, wxEXPAND | wxRIGHT, DCPOMATIC_SIZER_GAP);
+	use->Add (_type, 1, wxEXPAND, 0);
+	_grid->Add (use, wxGBPosition (r, 0), wxGBSpan (1, 2));
+	++r;
+
+	_grid->Add (_burn, wxGBPosition (r, 0), wxGBSpan (1, 2));
+	++r;
+
+	add_label_to_sizer (_grid, _offset_label, true, wxGBPosition (r, 0));
+	wxBoxSizer* offset = new wxBoxSizer (wxHORIZONTAL);
+	add_label_to_sizer (offset, _x_offset_label, true);
+	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);
+	add_label_to_sizer (offset, _y_offset_label, true);
+	offset->Add (_y_offset, 0);
+	add_label_to_sizer (offset, _y_offset_pc_label, false);
+	_grid->Add (offset, wxGBPosition (r, 1));
+	++r;
+
+	add_label_to_sizer (_grid, _scale_label, true, wxGBPosition (r, 0));
+	wxBoxSizer* scale = new wxBoxSizer (wxHORIZONTAL);
+	add_label_to_sizer (scale, _x_scale_label, true);
+	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);
+	add_label_to_sizer (scale, _y_scale_label, true);
+	scale->Add (_y_scale, 0);
+	add_label_to_sizer (scale, _y_scale_pc_label, false);
+	_grid->Add (scale, wxGBPosition (r, 1));
+	++r;
+
+	{
+		add_label_to_sizer (_grid, _line_spacing_label, true, wxGBPosition (r, 0));
+		wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+		s->Add (_line_spacing);
+		add_label_to_sizer (s, _line_spacing_pc_label, false);
+		_grid->Add (s, wxGBPosition (r, 1));
+		++r;
+	}
+
+	add_label_to_sizer (_grid, _dcp_track_label, true, wxGBPosition(r, 0));
+	_grid->Add (_dcp_track, wxGBPosition(r, 1), wxDefaultSpan, wxEXPAND);
+	++r;
+
+	add_label_to_sizer (_grid, _language_label, true, wxGBPosition (r, 0));
+	_grid->Add (_language, wxGBPosition (r, 1));
+	++r;
+
+	add_label_to_sizer (_grid, _stream_label, true, wxGBPosition (r, 0));
+	_grid->Add (_stream, wxGBPosition (r, 1));
+	++r;
+
+	{
+		wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+
+		s->Add (_text_view_button, 1, wxALL, DCPOMATIC_SIZER_GAP);
+		s->Add (_fonts_dialog_button, 1, wxALL, DCPOMATIC_SIZER_GAP);
+		s->Add (_appearance_dialog_button, 1, wxALL, DCPOMATIC_SIZER_GAP);
+
+		_grid->Add (s, wxGBPosition (r, 0), wxGBSpan (1, 2));
+		++r;
+	}
+}
+
+void
+TextPanel::update_dcp_track_selection ()
+{
+	optional<DCPTextTrack> selected;
+	bool many = false;
+	BOOST_FOREACH (shared_ptr<Content> i, _parent->selected_text()) {
+		shared_ptr<TextContent> t = i->text_of_original_type(_original_type);
+		if (t) {
+			optional<DCPTextTrack> dt = t->dcp_track();
+			if (dt && selected && *dt != *selected) {
+				many = true;
+			} else if (!selected) {
+				selected = dt;
+			}
+		}
+	}
+
+	int n = 0;
+	BOOST_FOREACH (DCPTextTrack i, _parent->film()->closed_caption_tracks()) {
+		if (!many && selected && *selected == i) {
+			_dcp_track->SetSelection (n);
+		}
+		++n;
+	}
+
+	if (!selected || many) {
+		_dcp_track->SetSelection (wxNOT_FOUND);
+	}
+}
+
+void
+TextPanel::update_dcp_tracks ()
+{
+	_dcp_track->Clear ();
+	BOOST_FOREACH (DCPTextTrack 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.empty()) {
+			_dcp_track->Append (std_to_wx(i.summary()));
+		}
+	}
+
+	if (_parent->film()->closed_caption_tracks().size() < 6) {
+		_dcp_track->Append (_("Add new..."));
+	}
+
+	update_dcp_track_selection ();
+}
+
+void
+TextPanel::dcp_track_changed ()
+{
+	optional<DCPTextTrack> track;
+
+	if (_dcp_track->GetSelection() == int(_dcp_track->GetCount()) - 1) {
+		DCPTextTrackDialog* d = new DCPTextTrackDialog (this);
+		if (d->ShowModal() == wxID_OK) {
+			track = d->get();
+		}
+		d->Destroy ();
+	} else {
+		/* Find the DCPTextTrack that was selected */
+		BOOST_FOREACH (DCPTextTrack i, _parent->film()->closed_caption_tracks()) {
+			if (i.summary() == wx_to_std(_dcp_track->GetStringSelection())) {
+				track = i;
+			}
+		}
+	}
+
+	if (track) {
+		BOOST_FOREACH (shared_ptr<Content> i, _parent->selected_text()) {
+			shared_ptr<TextContent> t = i->text_of_original_type(_original_type);
+			if (t && t->type() == TEXT_CLOSED_CAPTION) {
+				t->set_dcp_track(*track);
+			}
+		}
+	}
+
+	update_dcp_tracks ();
 }
 
 void
 TextPanel::film_changed (Film::Property property)
 {
-	if (property == Film::CONTENT || property == Film::REEL_TYPE) {
+	if (property == Film::CONTENT || property == Film::REEL_TYPE || property == Film::INTEROP) {
 		setup_sensitivity ();
 	}
 }
@@ -249,6 +365,7 @@ TextPanel::film_content_changed (int property)
 			_type->SetSelection (0);
 		}
 		setup_sensitivity ();
+		update_dcp_track_selection ();
 	} else if (property == TextContentProperty::BURN) {
 		checked_set (_burn, text ? text->burn() : false);
 	} else if (property == TextContentProperty::X_OFFSET) {
@@ -263,6 +380,8 @@ TextPanel::film_content_changed (int property)
 		checked_set (_line_spacing, text ? lrint (text->line_spacing() * 100) : 100);
 	} else if (property == TextContentProperty::LANGUAGE) {
 		checked_set (_language, text ? text->language() : "");
+	} else if (property == TextContentProperty::DCP_TRACK) {
+		update_dcp_track_selection ();
 	} else if (property == DCPContentProperty::REFERENCE_TEXT) {
 		if (scs) {
 			shared_ptr<DCPContent> dcp = dynamic_pointer_cast<DCPContent> (scs);
@@ -319,7 +438,10 @@ void
 TextPanel::setup_sensitivity ()
 {
 	int any_subs = 0;
+	/* We currently assume that FFmpeg subtitles are bitmapped */
 	int ffmpeg_subs = 0;
+	/* DCP subs can't have their line spacing changed */
+	int dcp_subs = 0;
 	ContentList sel = _parent->selected_text ();
 	BOOST_FOREACH (shared_ptr<Content> i, sel) {
 		/* These are the content types that could include subtitles */
@@ -332,7 +454,10 @@ TextPanel::setup_sensitivity ()
 				++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;
 		}
@@ -346,13 +471,33 @@ TextPanel::setup_sensitivity ()
 	}
 
 	string why_not;
-	bool const can_reference = dcp && dcp->can_reference_text (_original_type, why_not);
+	bool const can_reference = dcp && dcp->can_reference_text (_parent->film(), _original_type, why_not);
 	setup_refer_button (_reference, _reference_note, dcp, can_reference, why_not);
 
 	bool const reference = _reference->GetValue ();
 
 	TextType const type = current_type ();
 
+	/* Set up _type */
+	_type->Clear ();
+	_type->Append (_("open subtitles"));
+	if (ffmpeg_subs == 0) {
+		_type->Append (_("closed captions"));
+	}
+
+	switch (type) {
+	case TEXT_OPEN_SUBTITLE:
+		_type->SetSelection (0);
+		break;
+	case TEXT_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 ();
@@ -362,11 +507,14 @@ TextPanel::setup_sensitivity ()
 	_y_offset->Enable (!reference && any_subs > 0 && use && type == TEXT_OPEN_SUBTITLE);
 	_x_scale->Enable (!reference && any_subs > 0 && use && type == TEXT_OPEN_SUBTITLE);
 	_y_scale->Enable (!reference && any_subs > 0 && use && type == TEXT_OPEN_SUBTITLE);
-	_line_spacing->Enable (!reference && use && type == TEXT_OPEN_SUBTITLE);
-	_language->Enable (!reference && any_subs > 0 && use);
+	/* DCP subs ignore the line spacing setting */
+	_line_spacing->Enable (!reference && use && type == TEXT_OPEN_SUBTITLE && dcp_subs < any_subs);
+	_dcp_track->Enable (!reference && any_subs > 0 && use && type == TEXT_CLOSED_CAPTION);
+	_language->Enable (!reference && any_subs > 0 && use && type == TEXT_OPEN_SUBTITLE);
 	_stream->Enable (!reference && ffmpeg_subs == 1);
-	_text_view_button->Enable (!reference);
-	_fonts_dialog_button->Enable (!reference && type == TEXT_OPEN_SUBTITLE);
+	/* 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 == TEXT_OPEN_SUBTITLE);
 	_appearance_dialog_button->Enable (!reference && any_subs > 0 && use && type == TEXT_OPEN_SUBTITLE);
 }
 
@@ -455,6 +603,7 @@ TextPanel::content_selection_changed ()
 	film_content_changed (TextContentProperty::LANGUAGE);
 	film_content_changed (TextContentProperty::FONTS);
 	film_content_changed (TextContentProperty::TYPE);
+	film_content_changed (TextContentProperty::DCP_TRACK);
 	film_content_changed (DCPContentProperty::REFERENCE_TEXT);
 }
 
@@ -469,7 +618,7 @@ TextPanel::text_view_clicked ()
 	ContentList c = _parent->selected_text ();
 	DCPOMATIC_ASSERT (c.size() == 1);
 
-	shared_ptr<Decoder> decoder = decoder_factory (c.front(), _parent->film()->log(), false);
+	shared_ptr<Decoder> decoder = decoder_factory (_parent->film(), c.front(), false);
 
 	if (decoder) {
 		_text_view = new TextView (this, _parent->film(), c.front(), c.front()->text_of_original_type(_original_type), decoder, _parent->film_viewer());
@@ -514,7 +663,7 @@ TextPanel::appearance_dialog_clicked ()
 	ContentList c = _parent->selected_text ();
 	DCPOMATIC_ASSERT (c.size() == 1);
 
-	SubtitleAppearanceDialog* d = new SubtitleAppearanceDialog (this, c.front(), c.front()->text_of_original_type(_original_type));
+	SubtitleAppearanceDialog* d = new SubtitleAppearanceDialog (this, _parent->film(), c.front(), c.front()->text_of_original_type(_original_type));
 	if (d->ShowModal () == wxID_OK) {
 		d->apply ();
 	}