X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fsmpte_metadata_dialog.cc;h=64afcac5c2240e6548b6c1a7da08c3042ed69219;hb=d461d2685050842cb86875f5a5aa62505779b9ed;hp=7ff9c6c52286634bbd0a62621b2025333accb99b;hpb=c241da6c6db16ed5d73b2f349d69006cba12cf3f;p=dcpomatic.git diff --git a/src/wx/smpte_metadata_dialog.cc b/src/wx/smpte_metadata_dialog.cc index 7ff9c6c52..64afcac5c 100644 --- a/src/wx/smpte_metadata_dialog.cc +++ b/src/wx/smpte_metadata_dialog.cc @@ -32,13 +32,20 @@ using std::string; using std::vector; using boost::optional; -using boost::shared_ptr; -using boost::weak_ptr; +using std::shared_ptr; +using std::weak_ptr; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; #endif +static string +additional_subtitle_language_column (dcp::LanguageTag r, int) +{ + return r.to_string(); +} + + static string ratings_column (dcp::Rating r, int c) { @@ -59,7 +66,7 @@ content_versions_column (string v, int) SMPTEMetadataDialog::SMPTEMetadataDialog (wxWindow* parent, weak_ptr weak_film) : wxDialog (parent, wxID_ANY, _("Metadata")) - , _film (weak_film) + , WeakFilm (weak_film) { wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL); SetSizer (overall_sizer); @@ -67,21 +74,53 @@ SMPTEMetadataDialog::SMPTEMetadataDialog (wxWindow* parent, weak_ptr weak_ wxFlexGridSizer* sizer = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); sizer->AddGrowableCol (1, 1); + add_label_to_sizer (sizer, this, _("Title language"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL); _name_language = new LanguageTagWidget( this, - sizer, - _("Title language"), wxString::Format(_("The language that the film's title (\"%s\") is in"), std_to_wx(film()->name())), film()->name_language() ); + sizer->Add (_name_language->sizer(), 0, wxEXPAND); + add_label_to_sizer (sizer, this, _("Audio language"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL); _audio_language = new LanguageTagWidget( this, - sizer, - _("Audio language"), _("The main language that is spoken in the film's soundtrack"), film()->audio_language() ); + sizer->Add (_audio_language->sizer(), 0, wxEXPAND); + + _enable_main_subtitle_language = new wxCheckBox (this, wxID_ANY, _("Main subtitle language")); + sizer->Add (_enable_main_subtitle_language, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_GAP); + vector subtitle_languages = film()->subtitle_languages(); + _main_subtitle_language = new LanguageTagWidget( + this, + _("The main language that is displayed in the film's subtitles"), + subtitle_languages.empty() ? dcp::LanguageTag("en-US") : subtitle_languages.front() + ); + sizer->Add (_main_subtitle_language->sizer(), 0, wxEXPAND); + + { + int flags = wxALIGN_TOP | wxLEFT | wxRIGHT | wxTOP; +#ifdef __WXOSX__ + flags |= wxALIGN_RIGHT; +#endif + wxStaticText* m = create_label (this, _("Additional subtitle languages"), true); + sizer->Add (m, 0, flags, DCPOMATIC_SIZER_GAP); + } + + vector columns; + columns.push_back (EditableListColumn("Language", 250, true)); + _additional_subtitle_languages = new EditableList ( + this, + columns, + boost::bind(&SMPTEMetadataDialog::additional_subtitle_languages, this), + boost::bind(&SMPTEMetadataDialog::set_additional_subtitle_languages, this, _1), + boost::bind(&additional_subtitle_language_column, _1, _2), + true, + false + ); + sizer->Add (_additional_subtitle_languages, 1, wxEXPAND); Button* edit_release_territory = 0; add_label_to_sizer (sizer, this, _("Release territory"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL); @@ -135,7 +174,7 @@ SMPTEMetadataDialog::SMPTEMetadataDialog (wxWindow* parent, weak_ptr weak_ sizer->Add (m, 0, flags, DCPOMATIC_SIZER_GAP); } - vector columns; + columns.clear (); columns.push_back (EditableListColumn("Agency", 200, true)); columns.push_back (EditableListColumn("Label", 50, true)); _ratings = new EditableList ( @@ -190,6 +229,8 @@ SMPTEMetadataDialog::SMPTEMetadataDialog (wxWindow* parent, weak_ptr weak_ _name_language->Changed.connect (boost::bind(&SMPTEMetadataDialog::name_language_changed, this, _1)); _audio_language->Changed.connect (boost::bind(&SMPTEMetadataDialog::audio_language_changed, this, _1)); + _enable_main_subtitle_language->Bind (wxEVT_CHECKBOX, boost::bind(&SMPTEMetadataDialog::enable_main_subtitle_changed, this)); + _main_subtitle_language->Changed.connect (boost::bind(&SMPTEMetadataDialog::main_subtitle_language_changed, this, _1)); edit_release_territory->Bind (wxEVT_BUTTON, boost::bind(&SMPTEMetadataDialog::edit_release_territory, this)); _version_number->Bind (wxEVT_SPINCTRL, boost::bind(&SMPTEMetadataDialog::version_number_changed, this)); _status->Bind (wxEVT_CHOICE, boost::bind(&SMPTEMetadataDialog::status_changed, this)); @@ -203,59 +244,70 @@ SMPTEMetadataDialog::SMPTEMetadataDialog (wxWindow* parent, weak_ptr weak_ _film_changed_connection = film()->Change.connect(boost::bind(&SMPTEMetadataDialog::film_changed, this, _1, _2)); - film_changed (CHANGE_TYPE_DONE, Film::NAME_LANGUAGE); - film_changed (CHANGE_TYPE_DONE, Film::RELEASE_TERRITORY); - film_changed (CHANGE_TYPE_DONE, Film::VERSION_NUMBER); - film_changed (CHANGE_TYPE_DONE, Film::STATUS); - film_changed (CHANGE_TYPE_DONE, Film::CHAIN); - film_changed (CHANGE_TYPE_DONE, Film::DISTRIBUTOR); - film_changed (CHANGE_TYPE_DONE, Film::FACILITY); - film_changed (CHANGE_TYPE_DONE, Film::CONTENT_VERSIONS); - film_changed (CHANGE_TYPE_DONE, Film::LUMINANCE); + film_changed (ChangeType::DONE, Film::Property::NAME_LANGUAGE); + film_changed (ChangeType::DONE, Film::Property::RELEASE_TERRITORY); + film_changed (ChangeType::DONE, Film::Property::VERSION_NUMBER); + film_changed (ChangeType::DONE, Film::Property::STATUS); + film_changed (ChangeType::DONE, Film::Property::CHAIN); + film_changed (ChangeType::DONE, Film::Property::DISTRIBUTOR); + film_changed (ChangeType::DONE, Film::Property::FACILITY); + film_changed (ChangeType::DONE, Film::Property::CONTENT_VERSIONS); + film_changed (ChangeType::DONE, Film::Property::LUMINANCE); + film_changed (ChangeType::DONE, Film::Property::SUBTITLE_LANGUAGES); + + setup_sensitivity (); } void SMPTEMetadataDialog::film_changed (ChangeType type, Film::Property property) { - if (type != CHANGE_TYPE_DONE || film()->interop()) { + if (type != ChangeType::DONE || film()->interop()) { return; } - if (property == Film::NAME_LANGUAGE) { + if (property == Film::Property::NAME_LANGUAGE) { _name_language->set (film()->name_language()); - } else if (property == Film::RELEASE_TERRITORY) { - checked_set (_release_territory, std_to_wx(*dcp::LanguageTag::get_subtag_description(dcp::LanguageTag::REGION, film()->release_territory().subtag()))); - } else if (property == Film::VERSION_NUMBER) { + } else if (property == Film::Property::RELEASE_TERRITORY) { + checked_set (_release_territory, std_to_wx(*dcp::LanguageTag::get_subtag_description(dcp::LanguageTag::SubtagType::REGION, film()->release_territory().subtag()))); + } else if (property == Film::Property::VERSION_NUMBER) { checked_set (_version_number, film()->version_number()); - } else if (property == Film::STATUS) { + } else if (property == Film::Property::STATUS) { switch (film()->status()) { - case dcp::TEMP: + case dcp::Status::TEMP: checked_set (_status, 0); break; - case dcp::PRE: + case dcp::Status::PRE: checked_set (_status, 1); break; - case dcp::FINAL: + case dcp::Status::FINAL: checked_set (_status, 2); break; } - } else if (property == Film::CHAIN) { + } else if (property == Film::Property::CHAIN) { checked_set (_chain, film()->chain()); - } else if (property == Film::DISTRIBUTOR) { + } else if (property == Film::Property::DISTRIBUTOR) { checked_set (_distributor, film()->distributor()); - } else if (property == Film::FACILITY) { + } else if (property == Film::Property::FACILITY) { checked_set (_facility, film()->facility()); - } else if (property == Film::LUMINANCE) { + } else if (property == Film::Property::LUMINANCE) { checked_set (_luminance_value, film()->luminance().value()); switch (film()->luminance().unit()) { - case dcp::Luminance::CANDELA_PER_SQUARE_METRE: + case dcp::Luminance::Unit::CANDELA_PER_SQUARE_METRE: checked_set (_luminance_unit, 0); break; - case dcp::Luminance::FOOT_LAMBERT: + case dcp::Luminance::Unit::FOOT_LAMBERT: checked_set (_luminance_unit, 1); break; } + } else if (property == Film::Property::SUBTITLE_LANGUAGES) { + vector languages = film()->subtitle_languages(); + checked_set (_enable_main_subtitle_language, !languages.empty()); + if (!languages.empty()) { + _main_subtitle_language->set (languages.front()); + } else { + _main_subtitle_language->set (dcp::LanguageTag("en-US")); + } } } @@ -305,25 +357,16 @@ SMPTEMetadataDialog::audio_language_changed (dcp::LanguageTag tag) void SMPTEMetadataDialog::edit_release_territory () { - RegionSubtagDialog* d = new RegionSubtagDialog(this, film()->release_territory()); + auto d = new RegionSubtagDialog(this, film()->release_territory()); d->ShowModal (); - optional tag = d->get(); + auto tag = d->get(); if (tag) { - film()->set_release_territory (*tag); + film()->set_release_territory(*tag); } d->Destroy (); } -shared_ptr -SMPTEMetadataDialog::film () const -{ - shared_ptr film = _film.lock (); - DCPOMATIC_ASSERT (film); - return film; -} - - void SMPTEMetadataDialog::version_number_changed () { @@ -336,13 +379,13 @@ SMPTEMetadataDialog::status_changed () { switch (_status->GetSelection()) { case 0: - film()->set_status (dcp::TEMP); + film()->set_status(dcp::Status::TEMP); break; case 1: - film()->set_status (dcp::PRE); + film()->set_status(dcp::Status::PRE); break; case 2: - film()->set_status (dcp::FINAL); + film()->set_status(dcp::Status::FINAL); break; } } @@ -375,10 +418,10 @@ SMPTEMetadataDialog::luminance_changed () dcp::Luminance::Unit unit; switch (_luminance_unit->GetSelection()) { case 0: - unit = dcp::Luminance::CANDELA_PER_SQUARE_METRE; + unit = dcp::Luminance::Unit::CANDELA_PER_SQUARE_METRE; break; case 1: - unit = dcp::Luminance::FOOT_LAMBERT; + unit = dcp::Luminance::Unit::FOOT_LAMBERT; break; default: DCPOMATIC_ASSERT (false); @@ -386,3 +429,65 @@ SMPTEMetadataDialog::luminance_changed () film()->set_luminance (dcp::Luminance(_luminance_value->GetValue(), unit)); } + + +void +SMPTEMetadataDialog::enable_main_subtitle_changed () +{ + setup_sensitivity (); + bool enabled = _enable_main_subtitle_language->GetValue (); + if (enabled) { + film()->set_subtitle_language (_main_subtitle_language->get()); + } else { + set_additional_subtitle_languages (vector()); + _additional_subtitle_languages->refresh (); + film()->unset_subtitle_language (); + } +} + + +void +SMPTEMetadataDialog::setup_sensitivity () +{ + bool const enabled = _enable_main_subtitle_language->GetValue (); + _main_subtitle_language->enable (enabled); + _additional_subtitle_languages->Enable (enabled); +} + + +void +SMPTEMetadataDialog::main_subtitle_language_changed (dcp::LanguageTag tag) +{ + vector existing = film()->subtitle_languages(); + if (existing.empty()) { + existing.push_back (tag); + } else { + existing[0] = tag; + } + + film()->set_subtitle_languages (existing); +} + + +vector +SMPTEMetadataDialog::additional_subtitle_languages () +{ + vector all = film()->subtitle_languages(); + if (all.empty()) { + return all; + } + + return vector(all.begin() + 1, all.end()); +} + + +void +SMPTEMetadataDialog::set_additional_subtitle_languages (vector languages) +{ + vector all = film()->subtitle_languages(); + DCPOMATIC_ASSERT (!all.empty()); + all.resize (1); + copy (languages.begin(), languages.end(), back_inserter(all)); + film()->set_subtitle_languages (all); +} +