More enum class additions.

[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 87be156f51ea597a0ee7f43e26034624d6a68cbe..b8a1184e0839bca02df4b35342315a8bbc9168b4 100644 (file)
--- a/src/wx/smpte_metadata_dialog.cc
+++ b/src/wx/smpte_metadata_dialog.cc
@@ -32,8 +32,8 @@
 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
@@ -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::NAME_LANGUAGE);
+       film_changed (ChangeType::DONE, Film::RELEASE_TERRITORY);
+       film_changed (ChangeType::DONE, Film::VERSION_NUMBER);
+       film_changed (ChangeType::DONE, Film::STATUS);
+       film_changed (ChangeType::DONE, Film::CHAIN);
+       film_changed (ChangeType::DONE, Film::DISTRIBUTOR);
+       film_changed (ChangeType::DONE, Film::FACILITY);
+       film_changed (ChangeType::DONE, Film::CONTENT_VERSIONS);
+       film_changed (ChangeType::DONE, Film::LUMINANCE);
+       film_changed (ChangeType::DONE, Film::SUBTITLE_LANGUAGES);
 
        setup_sensitivity ();
 }
@@ -262,25 +262,25 @@ 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) {
                _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())));
+               checked_set (_release_territory, std_to_wx(*dcp::LanguageTag::get_subtag_description(dcp::LanguageTag::SubtagType::REGION, film()->release_territory().subtag())));
        } else if (property == Film::VERSION_NUMBER) {
                checked_set (_version_number, film()->version_number());
        } else if (property == Film::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;
                }
@@ -293,10 +293,10 @@ SMPTEMetadataDialog::film_changed (ChangeType type, Film::Property property)
        } else if (property == Film::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;
                }
@@ -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);