Don't insist on writing optional metadata (#1923).

diff --git a/src/lib/film.cc b/src/lib/film.cc
index a51ec0ad9ac58f35a3b49724fc588437ec44b794..321a932d17751f9fb6b75210195fcf73d35bca30 100644 (file)
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -170,7 +170,6 @@ Film::Film (optional<boost::filesystem::path> dir)
        , _user_explicit_resolution (false)
        , _name_language (dcp::LanguageTag("en-US"))
        , _audio_language (dcp::LanguageTag("en-US"))
-       , _release_territory (dcp::LanguageTag::RegionSubtag("US"))
        , _version_number (1)
        , _status (dcp::Status::FINAL)
        , _luminance (dcp::Luminance(4.5, dcp::Luminance::Unit::FOOT_LAMBERT))
@@ -477,14 +476,24 @@ Film::metadata (bool with_content_paths) const
        }
        root->add_child("NameLanguage")->add_child_text(_name_language.to_string());
        root->add_child("AudioLanguage")->add_child_text(_audio_language.to_string());
-       root->add_child("ReleaseTerritory")->add_child_text(_release_territory.subtag());
+       if (_release_territory) {
+               root->add_child("ReleaseTerritory")->add_child_text(_release_territory->subtag());
+       }
        root->add_child("VersionNumber")->add_child_text(raw_convert<string>(_version_number));
        root->add_child("Status")->add_child_text(dcp::status_to_string(_status));
-       root->add_child("Chain")->add_child_text(_chain);
-       root->add_child("Distributor")->add_child_text(_distributor);
-       root->add_child("Facility")->add_child_text(_facility);
-       root->add_child("LuminanceValue")->add_child_text(raw_convert<string>(_luminance.value()));
-       root->add_child("LuminanceUnit")->add_child_text(dcp::Luminance::unit_to_string(_luminance.unit()));
+       if (_chain) {
+               root->add_child("Chain")->add_child_text(*_chain);
+       }
+       if (_distributor) {
+               root->add_child("Distributor")->add_child_text(*_distributor);
+       }
+       if (_facility) {
+               root->add_child("Facility")->add_child_text(*_facility);
+       }
+       if (_luminance) {
+               root->add_child("LuminanceValue")->add_child_text(raw_convert<string>(_luminance->value()));
+               root->add_child("LuminanceUnit")->add_child_text(dcp::Luminance::unit_to_string(_luminance->unit()));
+       }
        root->add_child("UserExplicitContainer")->add_child_text(_user_explicit_container ? "1" : "0");
        root->add_child("UserExplicitResolution")->add_child_text(_user_explicit_resolution ? "1" : "0");
        for (auto i: _subtitle_languages) {
@@ -657,14 +666,14 @@ Film::read_metadata (optional<boost::filesystem::path> path)
                _status = dcp::string_to_status (*status);
        }
 
-       _chain = f.optional_string_child("Chain").get_value_or("");
-       _distributor = f.optional_string_child("Distributor").get_value_or("");
-       _facility = f.optional_string_child("Facility").get_value_or("");
+       _chain = f.optional_string_child("Chain");
+       _distributor = f.optional_string_child("Distributor");
+       _facility = f.optional_string_child("Facility");
 
-       auto value = f.optional_number_child<float>("LuminanceValue").get_value_or(4.5);
+       auto value = f.optional_number_child<float>("LuminanceValue");
        auto unit = f.optional_string_child("LuminanceUnit");
-       if (unit) {
-               _luminance = dcp::Luminance (value, dcp::Luminance::string_to_unit(*unit));
+       if (value && unit) {
+               _luminance = dcp::Luminance (*value, dcp::Luminance::string_to_unit(*unit));
        }
 
        /* Disable guessing for files made in previous DCP-o-matic versions */
@@ -1932,6 +1941,7 @@ Film::set_marker (dcp::Marker type, DCPTime time)
        _markers[type] = time;
 }
 
+
 void
 Film::unset_marker (dcp::Marker type)
 {
@@ -1980,7 +1990,7 @@ Film::set_audio_language (dcp::LanguageTag lang)
 
 
 void
-Film::set_release_territory (dcp::LanguageTag::RegionSubtag region)
+Film::set_release_territory (optional<dcp::LanguageTag::RegionSubtag> region)
 {
        FilmChangeSignaller ch (this, Property::RELEASE_TERRITORY);
        _release_territory = region;
@@ -2004,7 +2014,7 @@ Film::set_version_number (int v)
 
 
 void
-Film::set_chain (string c)
+Film::set_chain (optional<string> c)
 {
        FilmChangeSignaller ch (this, Property::CHAIN);
        _chain = c;
@@ -2012,7 +2022,7 @@ Film::set_chain (string c)
 
 
 void
-Film::set_distributor (string d)
+Film::set_distributor (optional<string> d)
 {
        FilmChangeSignaller ch (this, Property::DISTRIBUTOR);
        _distributor = d;
@@ -2020,7 +2030,7 @@ Film::set_distributor (string d)
 
 
 void
-Film::set_luminance (dcp::Luminance l)
+Film::set_luminance (optional<dcp::Luminance> l)
 {
        FilmChangeSignaller ch (this, Property::LUMINANCE);
        _luminance = l;
@@ -2051,7 +2061,7 @@ Film::set_subtitle_languages (vector<dcp::LanguageTag> languages)
 
 
 void
-Film::set_facility (string f)
+Film::set_facility (optional<string> f)
 {
        FilmChangeSignaller ch (this, Property::FACILITY);
        _facility = f;

diff --git a/src/lib/film.h b/src/lib/film.h
index c354b646c5361a1a5f356045b6bd109b90fe6475..9b45fd073c64fb1fdb3025949fe957b6afb3951b 100644 (file)
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -348,7 +348,7 @@ public:
                return _audio_language;
        }
 
-       dcp::LanguageTag::RegionSubtag release_territory () const {
+       boost::optional<dcp::LanguageTag::RegionSubtag> release_territory () const {
                return _release_territory;
        }
 
@@ -360,19 +360,19 @@ public:
                return _status;
        }
 
-       std::string chain () const {
+       boost::optional<std::string> chain () const {
                return _chain;
        }
 
-       std::string distributor () const {
+       boost::optional<std::string> distributor () const {
                return _distributor;
        }
 
-       std::string facility () const {
+       boost::optional<std::string> facility () const {
                return _facility;
        }
 
-       dcp::Luminance luminance () const {
+       boost::optional<dcp::Luminance> luminance () const {
                return _luminance;
        }
 
@@ -414,13 +414,13 @@ public:
        void set_content_versions (std::vector<std::string> v);
        void set_name_language (dcp::LanguageTag lang);
        void set_audio_language (dcp::LanguageTag lang);
-       void set_release_territory (dcp::LanguageTag::RegionSubtag region);
+       void set_release_territory (boost::optional<dcp::LanguageTag::RegionSubtag> region = boost::none);
        void set_version_number (int v);
        void set_status (dcp::Status s);
-       void set_chain (std::string c);
-       void set_facility (std::string f);
-       void set_distributor (std::string d);
-       void set_luminance (dcp::Luminance l);
+       void set_chain (boost::optional<std::string> c = boost::none);
+       void set_facility (boost::optional<std::string> f = boost::none);
+       void set_distributor (boost::optional<std::string> d = boost::none);
+       void set_luminance (boost::optional<dcp::Luminance> l = boost::none);
        void set_subtitle_language (dcp::LanguageTag language);
        void unset_subtitle_language ();
        void set_subtitle_languages (std::vector<dcp::LanguageTag> languages);
@@ -522,13 +522,13 @@ private:
        std::vector<std::string> _content_versions;
        dcp::LanguageTag _name_language;
        dcp::LanguageTag _audio_language;
-       dcp::LanguageTag::RegionSubtag _release_territory;
+       boost::optional<dcp::LanguageTag::RegionSubtag> _release_territory;
        int _version_number;
        dcp::Status _status;
-       std::string _chain;
-       std::string _distributor;
-       std::string _facility;
-       dcp::Luminance _luminance;
+       boost::optional<std::string> _chain;
+       boost::optional<std::string> _distributor;
+       boost::optional<std::string> _facility;
+       boost::optional<dcp::Luminance> _luminance;
        std::vector<dcp::LanguageTag> _subtitle_languages;
 
        int _state_version;

diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 54e7473e88e61c92313a0af3d2ad7ddadc56f523..839156d34be51534db48b7894373c98e9ce08cef 100644 (file)
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -622,13 +622,23 @@ Writer::finish (boost::filesystem::path output_dcp)
 
        cpl->set_full_content_title_text (film()->name());
        cpl->set_full_content_title_text_language (film()->name_language());
-       cpl->set_release_territory (film()->release_territory());
+       if (film()->release_territory()) {
+               cpl->set_release_territory (*film()->release_territory());
+       }
        cpl->set_version_number (film()->version_number());
        cpl->set_status (film()->status());
-       cpl->set_chain (film()->chain());
-       cpl->set_distributor (film()->distributor());
-       cpl->set_facility (film()->facility());
-       cpl->set_luminance (film()->luminance());
+       if (film()->chain()) {
+               cpl->set_chain (*film()->chain());
+       }
+       if (film()->distributor()) {
+               cpl->set_distributor (*film()->distributor());
+       }
+       if (film()->facility()) {
+               cpl->set_facility (*film()->facility());
+       }
+       if (film()->luminance()) {
+               cpl->set_luminance (*film()->luminance());
+       }
 
        auto ac = film()->mapped_audio_channels();
        dcp::MCASoundField field = (

diff --git a/src/wx/smpte_metadata_dialog.cc b/src/wx/smpte_metadata_dialog.cc
index 61bccbee5cc74113ba7210bbc792c84b915c7fec..36cf4848918d756e8b088c9ee83637819446ce4d 100644 (file)
--- a/src/wx/smpte_metadata_dialog.cc
+++ b/src/wx/smpte_metadata_dialog.cc
@@ -93,7 +93,7 @@ SMPTEMetadataDialog::main_panel (wxWindow* parent)
 
        _enable_main_subtitle_language = new wxCheckBox (panel, wxID_ANY, _("Main subtitle language"));
        sizer->Add (_enable_main_subtitle_language, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_GAP);
-       vector<dcp::LanguageTag> subtitle_languages = film()->subtitle_languages();
+       auto subtitle_languages = film()->subtitle_languages();
        _main_subtitle_language = new LanguageTagWidget(
                panel,
                _("The main language that is displayed in the film's subtitles"),
@@ -162,14 +162,14 @@ SMPTEMetadataDialog::advanced_panel (wxWindow* parent)
        auto sizer = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
        sizer->AddGrowableCol (1, 1);
 
-       Button* edit_release_territory = nullptr;
-       add_label_to_sizer (sizer, panel, _("Release territory"), true, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL);
+       _enable_release_territory = new wxCheckBox (panel, wxID_ANY, _("Release territory"));
+       sizer->Add (_enable_release_territory, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_GAP);
        {
-               wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-               _release_territory = new wxStaticText (panel, wxID_ANY, wxT(""));
-               s->Add (_release_territory, 1, wxLEFT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP);
-               edit_release_territory = new Button (panel, _("Edit..."));
-               s->Add (edit_release_territory, 0, wxLEFT, DCPOMATIC_SIZER_GAP);
+               auto s = new wxBoxSizer (wxHORIZONTAL);
+               _release_territory_text = new wxStaticText (panel, wxID_ANY, wxT(""));
+               s->Add (_release_territory_text, 1, wxLEFT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP);
+               _edit_release_territory = new Button (panel, _("Edit..."));
+               s->Add (_edit_release_territory, 0, wxLEFT, DCPOMATIC_SIZER_GAP);
                sizer->Add (s, 0, wxEXPAND);
        }
 
@@ -181,15 +181,18 @@ SMPTEMetadataDialog::advanced_panel (wxWindow* parent)
        _status = new wxChoice (panel, wxID_ANY);
        sizer->Add (_status, 0);
 
-       add_label_to_sizer (sizer, panel, _("Chain"), true, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL);
+       _enable_chain = new wxCheckBox (panel, wxID_ANY, _("Chain"));
+       sizer->Add (_enable_chain, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL);
        _chain = new wxTextCtrl (panel, wxID_ANY);
        sizer->Add (_chain, 1, wxEXPAND);
 
-       add_label_to_sizer (sizer, panel, _("Distributor"), true, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL);
+       _enable_distributor = new wxCheckBox (panel, wxID_ANY, _("Distributor"));
+       sizer->Add (_enable_distributor, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL);
        _distributor = new wxTextCtrl (panel, wxID_ANY);
        sizer->Add (_distributor, 1, wxEXPAND);
 
-       add_label_to_sizer (sizer, panel, _("Facility"), true, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL);
+       _enable_facility = new wxCheckBox (panel, wxID_ANY, _("Facility"));
+       sizer->Add (_enable_facility, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL);
        _facility = new wxTextCtrl (panel, wxID_ANY);
        sizer->Add (_facility, 1, wxEXPAND);
 
@@ -231,8 +234,6 @@ SMPTEMetadataDialog::advanced_panel (wxWindow* parent)
        overall_sizer->Add (sizer, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER);
        panel->SetSizer (overall_sizer);
 
-       edit_release_territory->Bind (wxEVT_BUTTON, boost::bind(&SMPTEMetadataDialog::edit_release_territory, this));
-
        return panel;
 }
 
@@ -261,20 +262,25 @@ SMPTEMetadataDialog::SMPTEMetadataDialog (wxWindow* parent, weak_ptr<Film> weak_
        _status->Append (_("Pre-release"));
        _status->Append (_("Final"));
 
-       _luminance_unit->Append (_("candela per m²"));
+       _luminance_unit->Append (wxString::FromUTF8(_("candela per m²")));
        _luminance_unit->Append (_("foot lambert"));
 
        _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));
+       _edit_release_territory->Bind (wxEVT_BUTTON, boost::bind(&SMPTEMetadataDialog::edit_release_territory, this));
        _main_subtitle_language->Changed.connect (boost::bind(&SMPTEMetadataDialog::main_subtitle_language_changed, this, _1));
        _version_number->Bind (wxEVT_SPINCTRL, boost::bind(&SMPTEMetadataDialog::version_number_changed, this));
        _status->Bind (wxEVT_CHOICE, boost::bind(&SMPTEMetadataDialog::status_changed, this));
+       _enable_chain->Bind (wxEVT_CHECKBOX, boost::bind(&SMPTEMetadataDialog::enable_chain_changed, this));
        _chain->Bind (wxEVT_TEXT, boost::bind(&SMPTEMetadataDialog::chain_changed, this));
+       _enable_distributor->Bind (wxEVT_CHECKBOX, boost::bind(&SMPTEMetadataDialog::enable_distributor_changed, this));
        _distributor->Bind (wxEVT_TEXT, boost::bind(&SMPTEMetadataDialog::distributor_changed, this));
+       _enable_facility->Bind (wxEVT_CHECKBOX, boost::bind(&SMPTEMetadataDialog::enable_facility_changed, this));
        _facility->Bind (wxEVT_TEXT, boost::bind(&SMPTEMetadataDialog::facility_changed, this));
        _luminance_value->Bind (wxEVT_SPINCTRLDOUBLE, boost::bind(&SMPTEMetadataDialog::luminance_changed, this));
        _luminance_unit->Bind (wxEVT_CHOICE, boost::bind(&SMPTEMetadataDialog::luminance_changed, this));
+       _enable_release_territory->Bind (wxEVT_CHECKBOX, boost::bind(&SMPTEMetadataDialog::enable_release_territory_changed, this));
 
        _version_number->SetFocus ();
 
@@ -305,7 +311,12 @@ SMPTEMetadataDialog::film_changed (ChangeType type, Film::Property property)
        if (property == Film::Property::NAME_LANGUAGE) {
                _name_language->set (film()->name_language());
        } 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())));
+               auto rt = film()->release_territory();
+               checked_set (_enable_release_territory, static_cast<bool>(rt));
+               if (rt) {
+                       _release_territory = *rt;
+                       checked_set (_release_territory_text, std_to_wx(*dcp::LanguageTag::get_subtag_description(*_release_territory)));
+               }
        } else if (property == Film::Property::VERSION_NUMBER) {
                checked_set (_version_number, film()->version_number());
        } else if (property == Film::Property::STATUS) {
@@ -321,23 +332,38 @@ SMPTEMetadataDialog::film_changed (ChangeType type, Film::Property property)
                        break;
                }
        } else if (property == Film::Property::CHAIN) {
-               checked_set (_chain, film()->chain());
+               checked_set (_enable_chain, static_cast<bool>(film()->chain()));
+               if (film()->chain()) {
+                       checked_set (_chain, *film()->chain());
+               }
        } else if (property == Film::Property::DISTRIBUTOR) {
-               checked_set (_distributor, film()->distributor());
+               checked_set (_enable_distributor, static_cast<bool>(film()->distributor()));
+               if (film()->distributor()) {
+                       checked_set (_distributor, *film()->distributor());
+               }
        } else if (property == Film::Property::FACILITY) {
-               checked_set (_facility, film()->facility());
+               checked_set (_enable_facility, static_cast<bool>(film()->facility()));
+               if (film()->facility()) {
+                       checked_set (_facility, *film()->facility());
+               }
        } else if (property == Film::Property::LUMINANCE) {
-               checked_set (_luminance_value, film()->luminance().value());
-               switch (film()->luminance().unit()) {
-               case dcp::Luminance::Unit::CANDELA_PER_SQUARE_METRE:
-                       checked_set (_luminance_unit, 0);
-                       break;
-               case dcp::Luminance::Unit::FOOT_LAMBERT:
+               auto lum = film()->luminance();
+               if (lum) {
+                       checked_set (_luminance_value, lum->value());
+                       switch (lum->unit()) {
+                       case dcp::Luminance::Unit::CANDELA_PER_SQUARE_METRE:
+                               checked_set (_luminance_unit, 0);
+                               break;
+                       case dcp::Luminance::Unit::FOOT_LAMBERT:
+                               checked_set (_luminance_unit, 1);
+                               break;
+                       }
+               } else {
+                       checked_set (_luminance_value, 4.5);
                        checked_set (_luminance_unit, 1);
-                       break;
                }
        } else if (property == Film::Property::SUBTITLE_LANGUAGES) {
-               vector<dcp::LanguageTag> languages = film()->subtitle_languages();
+               auto languages = film()->subtitle_languages();
                checked_set (_enable_main_subtitle_language, !languages.empty());
                if (!languages.empty()) {
                        _main_subtitle_language->set (languages.front());
@@ -393,10 +419,12 @@ SMPTEMetadataDialog::audio_language_changed (dcp::LanguageTag tag)
 void
 SMPTEMetadataDialog::edit_release_territory ()
 {
-       auto d = new RegionSubtagDialog(this, film()->release_territory());
+       DCPOMATIC_ASSERT (film()->release_territory());
+       auto d = new RegionSubtagDialog(this, *film()->release_territory());
        d->ShowModal ();
        auto tag = d->get();
        if (tag) {
+               _release_territory = *tag;
                film()->set_release_territory(*tag);
        }
        d->Destroy ();
@@ -471,8 +499,7 @@ void
 SMPTEMetadataDialog::enable_main_subtitle_changed ()
 {
        setup_sensitivity ();
-       bool enabled = _enable_main_subtitle_language->GetValue ();
-       if (enabled) {
+       if (_enable_main_subtitle_language->GetValue()) {
                film()->set_subtitle_language (_main_subtitle_language->get());
        } else {
                set_additional_subtitle_languages (vector<dcp::LanguageTag>());
@@ -485,9 +512,21 @@ SMPTEMetadataDialog::enable_main_subtitle_changed ()
 void
 SMPTEMetadataDialog::setup_sensitivity ()
 {
-       bool const enabled = _enable_main_subtitle_language->GetValue ();
-       _main_subtitle_language->enable (enabled);
-       _additional_subtitle_languages->Enable (enabled);
+       {
+               auto const enabled = _enable_release_territory->GetValue();
+               _release_territory_text->Enable (enabled);
+               _edit_release_territory->Enable (enabled);
+       }
+
+       _chain->Enable (_enable_chain->GetValue());
+       _distributor->Enable (_enable_distributor->GetValue());
+       _facility->Enable (_enable_facility->GetValue());
+
+       {
+               auto const enabled = _enable_main_subtitle_language->GetValue();
+               _main_subtitle_language->enable (enabled);
+               _additional_subtitle_languages->Enable (enabled);
+       }
 }
 
 
@@ -527,3 +566,52 @@ SMPTEMetadataDialog::set_additional_subtitle_languages (vector<dcp::LanguageTag>
        film()->set_subtitle_languages (all);
 }
 
+
+void
+SMPTEMetadataDialog::enable_release_territory_changed ()
+{
+       setup_sensitivity ();
+       if (_enable_release_territory->GetValue()) {
+               film()->set_release_territory (_release_territory.get_value_or(dcp::LanguageTag::RegionSubtag("US")));
+       } else {
+               film()->set_release_territory ();
+       }
+}
+
+
+void
+SMPTEMetadataDialog::enable_chain_changed ()
+{
+       setup_sensitivity ();
+       if (_enable_chain->GetValue()) {
+               film()->set_chain (wx_to_std(_chain->GetValue()));
+       } else {
+               film()->set_chain ();
+       }
+}
+
+
+void
+SMPTEMetadataDialog::enable_distributor_changed ()
+{
+       setup_sensitivity ();
+       if (_enable_distributor->GetValue()) {
+               film()->set_distributor (wx_to_std(_distributor->GetValue()));
+       } else {
+               film()->set_distributor ();
+       }
+}
+
+
+void
+SMPTEMetadataDialog::enable_facility_changed ()
+{
+       setup_sensitivity ();
+       if (_enable_facility->GetValue()) {
+               film()->set_facility (wx_to_std(_facility->GetValue()));
+       } else {
+               film()->set_facility ();
+       }
+}
+
+

diff --git a/src/wx/smpte_metadata_dialog.h b/src/wx/smpte_metadata_dialog.h
index dcca0e420683f323d63ceac11a1e11f7dd079b7d..63d90249c212fc69ea2147b48a600980c2e16643 100644 (file)
--- a/src/wx/smpte_metadata_dialog.h
+++ b/src/wx/smpte_metadata_dialog.h
@@ -62,17 +62,31 @@ private:
        void luminance_changed ();
        void film_changed (ChangeType type, Film::Property property);
        void setup_sensitivity ();
+       void enable_release_territory_changed ();
+       void enable_chain_changed ();
+       void enable_distributor_changed ();
+       void enable_facility_changed ();
 
        LanguageTagWidget* _name_language;
        LanguageTagWidget* _audio_language;
        wxCheckBox* _enable_main_subtitle_language;
        LanguageTagWidget* _main_subtitle_language;
        EditableList<dcp::LanguageTag, LanguageTagDialog>* _additional_subtitle_languages;
-       wxStaticText* _release_territory;
+       wxCheckBox* _enable_release_territory;
+       /** The current release territory displayed in the UI; since we can't easily convert
+        *  the string in _release_territory_text to a RegionSubtag we just store the RegionSubtag
+        *  alongside.
+        */
+       boost::optional<dcp::LanguageTag::RegionSubtag> _release_territory;
+       wxStaticText* _release_territory_text;
+       Button* _edit_release_territory;
        wxSpinCtrl* _version_number;
        wxChoice* _status;
+       wxCheckBox* _enable_chain;
        wxTextCtrl* _chain;
+       wxCheckBox* _enable_distributor;
        wxTextCtrl* _distributor;
+       wxCheckBox* _enable_facility;
        wxTextCtrl* _facility;
        wxSpinCtrlDouble* _luminance_value;
        wxChoice* _luminance_unit;

diff --git a/src/wx/timeline_audio_content_view.cc b/src/wx/timeline_audio_content_view.cc
index 03481343c6bfb097ec4b284554d0b7d72261cb4f..057ebb944b8b8d632b53c36ba93410fe3a4cbb85 100644 (file)
--- a/src/wx/timeline_audio_content_view.cc
+++ b/src/wx/timeline_audio_content_view.cc
@@ -70,7 +70,7 @@ TimelineAudioContentView::label () const
 
        list<int> mapped = ac->mapping().mapped_output_channels();
        if (!mapped.empty ()) {
-               s += " → ";
+               s += wxString::FromUTF8(" → ");
                for (auto i: mapped) {
                        s += std_to_wx(short_audio_channel_name(i)) + ", ";
                }