X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_advanced_dialog.cc;h=27f34e19afeba1e89b8d613386ae482b2722bee9;hb=e87f943433216d294b22853411eca5c582be1066;hp=1726579ea4a025382553efec3b884690630b6aa3;hpb=7d5a2d5f585c1c8ed0e645d0190ed3d9fbe21490;p=dcpomatic.git

diff --git a/src/wx/content_advanced_dialog.cc b/src/wx/content_advanced_dialog.cc
index 1726579ea..27f34e19a 100644
--- a/src/wx/content_advanced_dialog.cc
+++ b/src/wx/content_advanced_dialog.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2020 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2020-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -19,9 +19,11 @@
 */
 
 
+#include "check_box.h"
 #include "content_advanced_dialog.h"
 #include "dcpomatic_button.h"
 #include "filter_dialog.h"
+#include "language_tag_widget.h"
 #include "static_text.h"
 #include "wx_util.h"
 #include "lib/content.h"
@@ -30,19 +32,22 @@
 #include "lib/ffmpeg_content.h"
 #include "lib/image_content.h"
 #include "lib/video_content.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/gbsizer.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <wx/propgrid/property.h>
 #include <wx/propgrid/props.h>
-DCPOMATIC_ENABLE_WARNINGS
-#include <boost/bind.hpp>
+#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
+#include <boost/bind/bind.hpp>
 
 
+using std::dynamic_pointer_cast;
+using std::shared_ptr;
 using std::string;
 using std::vector;
 using boost::bind;
-using boost::dynamic_pointer_cast;
 using boost::optional;
-using boost::shared_ptr;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
 #endif
@@ -54,12 +59,12 @@ ContentAdvancedDialog::ContentAdvancedDialog (wxWindow* parent, shared_ptr<Conte
 	: wxDialog (parent, wxID_ANY, _("Advanced content settings"))
 	, _content (content)
 {
-	wxGridBagSizer* sizer = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+	auto sizer = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
 
 	int r = 0;
 
 	wxClientDC dc (this);
-	wxSize size = dc.GetTextExtent (wxT ("A quite long name"));
+	auto size = dc.GetTextExtent (wxT ("A quite long name"));
 #ifdef __WXGTK3__
 	size.SetWidth (size.GetWidth() + 64);
 #endif
@@ -68,7 +73,7 @@ ContentAdvancedDialog::ContentAdvancedDialog (wxWindow* parent, shared_ptr<Conte
 	add_label_to_sizer (sizer, this, _("Video filters"), true, wxGBPosition(r, 0));
 	_filters = new StaticText (this, _("None"), wxDefaultPosition, size);
 	_filters_button = new Button (this, _("Edit..."));
-	wxBoxSizer* filters = new wxBoxSizer (wxHORIZONTAL);
+	auto filters = new wxBoxSizer (wxHORIZONTAL);
 	filters->Add (_filters, 1, wxALL | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_GAP);
 	filters->Add (_filters_button, 0, wxALL, DCPOMATIC_SIZER_GAP);
 	sizer->Add (filters, wxGBPosition(r, 1), wxGBSpan(1, 2));
@@ -87,60 +92,76 @@ ContentAdvancedDialog::ContentAdvancedDialog (wxWindow* parent, shared_ptr<Conte
 	sizer->Add (_set_video_frame_rate, wxGBPosition(r, 2));
 	++r;
 
-	wxCheckBox* ignore_video = new wxCheckBox (this, wxID_ANY, _("Ignore this content's video and use only audio, subtitles and closed captions"));
-	sizer->Add (ignore_video, wxGBPosition(r, 0), wxGBSpan(1, 3));
+	/// TRANSLATORS: next to this control is a language selector, so together they will read, for example
+	/// "Video has burnt-in subtitles in the language fr-FR"
+	_burnt_subtitle = new CheckBox(this, _("Video has burnt-in subtitles in the language"));
+	sizer->Add (_burnt_subtitle, wxGBPosition(r, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
+	_burnt_subtitle_language = new LanguageTagWidget (this, _("Language of burnt-in subtitles in this content"), content->video ? content->video->burnt_subtitle_language() : boost::none);
+	sizer->Add (_burnt_subtitle_language->sizer(), wxGBPosition(r, 1), wxGBSpan(1, 2), wxEXPAND);
 	++r;
 
-	wxSizer* overall = new wxBoxSizer (wxVERTICAL);
+	_ignore_video = new CheckBox(this, _("Ignore this content's video and use only audio, subtitles and closed captions"));
+	sizer->Add(_ignore_video, wxGBPosition(r, 0), wxGBSpan(1, 3));
+	++r;
+
+	auto overall = new wxBoxSizer (wxVERTICAL);
 	overall->Add (sizer, 1, wxALL, DCPOMATIC_DIALOG_BORDER);
-	wxSizer* buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL);
+	auto buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL);
 	if (buttons) {
 		overall->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
 	}
 
 	SetSizerAndFit (overall);
 
-	ignore_video->Enable (static_cast<bool>(_content->video));
-	ignore_video->SetValue (_content->video ? !content->video->use() : false);
+	_ignore_video->Enable(static_cast<bool>(_content->video));
+	_ignore_video->SetValue(_content->video ? !content->video->use() : false);
+
+	auto fcs = dynamic_pointer_cast<FFmpegContent>(content);
+	_filters_allowed = static_cast<bool>(fcs);
+	if (fcs) {
+		_filters_list = fcs->filters();
+	}
 	setup_filters ();
 
 	bool const single_frame_image_content = dynamic_pointer_cast<const ImageContent>(_content) && _content->number_of_paths() == 1;
 	video_frame_rate_label->Enable (!single_frame_image_content);
 	_video_frame_rate->Enable (!single_frame_image_content);
 
-	optional<double> vfr = _content->video_frame_rate ();
+	auto vfr = _content->video_frame_rate ();
 	if (vfr) {
 		_video_frame_rate->SetValue (std_to_wx(locale_convert<string>(*vfr)));
 	}
 
-	ignore_video->Bind (wxEVT_CHECKBOX, bind(&ContentAdvancedDialog::ignore_video_changed, this, _1));
+	_burnt_subtitle->SetValue (_content->video && static_cast<bool>(_content->video->burnt_subtitle_language()));
+	_burnt_subtitle_language->set (_content->video ? _content->video->burnt_subtitle_language() : boost::none);
+
 	_filters_button->Bind (wxEVT_BUTTON, bind(&ContentAdvancedDialog::edit_filters, this));
 	_set_video_frame_rate->Bind (wxEVT_BUTTON, bind(&ContentAdvancedDialog::set_video_frame_rate, this));
 	_video_frame_rate->Bind (wxEVT_TEXT, boost::bind(&ContentAdvancedDialog::video_frame_rate_changed, this));
+	_burnt_subtitle->bind(&ContentAdvancedDialog::burnt_subtitle_changed, this);
+
+	setup_sensitivity ();
 }
 
 
-void
-ContentAdvancedDialog::ignore_video_changed (wxCommandEvent& ev)
+bool
+ContentAdvancedDialog::ignore_video() const
 {
-	 if (_content->video) {
-		 _content->video->set_use (!ev.IsChecked());
-	 }
+	return _ignore_video->GetValue();
 }
 
 
 void
 ContentAdvancedDialog::setup_filters ()
 {
-	shared_ptr<FFmpegContent> fcs = dynamic_pointer_cast<FFmpegContent>(_content);
-	if (!fcs) {
+	if (!_filters_allowed) {
 		checked_set (_filters, _("None"));
 		_filters->Enable (false);
 		_filters_button->Enable (false);
 		return;
 	}
 
-	string p = Filter::ffmpeg_string (fcs->filters());
+	auto p = Filter::ffmpeg_string(_filters_list);
 	if (p.empty()) {
 		checked_set (_filters, _("None"));
 	} else {
@@ -155,40 +176,38 @@ ContentAdvancedDialog::setup_filters ()
 void
 ContentAdvancedDialog::edit_filters ()
 {
-	shared_ptr<FFmpegContent> fcs = dynamic_pointer_cast<FFmpegContent>(_content);
-	if (!fcs) {
+	if (!_filters_allowed) {
 		return;
 	}
 
-	FilterDialog* d = new FilterDialog (this, fcs->filters());
-	d->ActiveChanged.connect (bind(&ContentAdvancedDialog::filters_changed, this, _1));
-	d->ShowModal ();
-	d->Destroy ();
+	auto dialog = make_wx<FilterDialog>(this, _filters_list);
+	dialog->ActiveChanged.connect(bind(&ContentAdvancedDialog::filters_changed, this, _1));
+	dialog->ShowModal();
 }
 
 
 void
 ContentAdvancedDialog::filters_changed (vector<Filter const *> filters)
 {
-	shared_ptr<FFmpegContent> fcs = dynamic_pointer_cast<FFmpegContent>(_content);
-	if (!fcs) {
-		return;
+	_filters_list = filters;
+	setup_filters ();
+}
+
+
+optional<double>
+ContentAdvancedDialog::video_frame_rate() const
+{
+	if (_video_frame_rate->GetValue() == wxT("")) {
+		return {};
 	}
 
-	fcs->set_filters (filters);
-	setup_filters ();
+	return locale_convert<double>(wx_to_std(_video_frame_rate->GetValue()));
 }
 
 
 void
 ContentAdvancedDialog::set_video_frame_rate ()
 {
-	if (_video_frame_rate->GetValue() != wxT("")) {
-		_content->set_video_frame_rate (locale_convert<double>(wx_to_std(_video_frame_rate->GetValue())));
-	} else {
-		_content->unset_video_frame_rate ();
-	}
-
 	_set_video_frame_rate->Enable (false);
 }
 
@@ -207,3 +226,25 @@ ContentAdvancedDialog::video_frame_rate_changed ()
        _set_video_frame_rate->Enable (enable);
 }
 
+
+void
+ContentAdvancedDialog::setup_sensitivity ()
+{
+	_burnt_subtitle->Enable (static_cast<bool>(_content->video));
+	_burnt_subtitle_language->enable (_content->video && _burnt_subtitle->GetValue());
+}
+
+
+void
+ContentAdvancedDialog::burnt_subtitle_changed ()
+{
+	setup_sensitivity ();
+}
+
+
+optional<dcp::LanguageTag>
+ContentAdvancedDialog::burnt_subtitle_language() const
+{
+	return _burnt_subtitle_language->get();
+}
+