Rename LanguageTagDialog -> FullLanguageTagDialog.

[dcpomatic.git] / src / wx / smpte_metadata_dialog.cc

diff --git a/src/wx/smpte_metadata_dialog.cc b/src/wx/smpte_metadata_dialog.cc
index c44e38146a0c4e3a91daf98938662eb80c345136..2f3869d5866e504bd102bd7862f4b5be7b45b38d 100644 (file)
--- a/src/wx/smpte_metadata_dialog.cc
+++ b/src/wx/smpte_metadata_dialog.cc
@@ -20,7 +20,7 @@
 
 #include "content_version_dialog.h"
 #include "editable_list.h"
-#include "language_tag_dialog.h"
+#include "full_language_tag_dialog.h"
 #include "language_tag_widget.h"
 #include "smpte_metadata_dialog.h"
 #include "rating_dialog.h"
@@ -111,7 +111,7 @@ SMPTEMetadataDialog::SMPTEMetadataDialog (wxWindow* parent, weak_ptr<Film> weak_
 
        vector<EditableListColumn> columns;
        columns.push_back (EditableListColumn("Language", 250, true));
-       _additional_subtitle_languages = new EditableList<dcp::LanguageTag, LanguageTagDialog> (
+       _additional_subtitle_languages = new EditableList<dcp::LanguageTag, FullLanguageTagDialog> (
                this,
                columns,
                boost::bind(&SMPTEMetadataDialog::additional_subtitle_languages, this),
@@ -244,16 +244,16 @@ SMPTEMetadataDialog::SMPTEMetadataDialog (wxWindow* parent, weak_ptr<Film> 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 (CHANGE_TYPE_DONE, Film::SUBTITLE_LANGUAGES);
+       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 ();
 }
@@ -262,45 +262,45 @@ SMPTEMetadataDialog::SMPTEMetadataDialog (wxWindow* parent, weak_ptr<Film> weak_
 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::SUBTITLE_LANGUAGES) {
+       } else if (property == Film::Property::SUBTITLE_LANGUAGES) {
                vector<dcp::LanguageTag> languages = film()->subtitle_languages();
                checked_set (_enable_main_subtitle_language, !languages.empty());
                if (!languages.empty()) {
@@ -357,11 +357,11 @@ 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<dcp::LanguageTag::RegionSubtag> tag = d->get();
+       auto tag = d->get();
        if (tag) {
-               film()->set_release_territory (*tag);
+               film()->set_release_territory(*tag);
        }
        d->Destroy ();
 }
@@ -379,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;
        }
 }
@@ -418,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);