projects / dcpomatic.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Inherit SMPTEMetadataDialog from a base class.
[dcpomatic.git] / src / wx / dcp_panel.cc
diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc
index 047768f56119c7e03f322e07393795145b62b577..dcb78dc93f8e6b6283839825822a9bbf0fdd7bd0 100644 (file)
--- a/src/wx/dcp_panel.cc
+++ b/src/wx/dcp_panel.cc
@@ -160,8 +160,10 @@ DCPPanel::add_to_grid ()
 {
        int r = 0;
 
-       add_label_to_sizer (_grid, _name_label, true, wxGBPosition (r, 0));
-       _grid->Add (_name, wxGBPosition(r, 1), wxDefaultSpan, wxEXPAND | wxLEFT | wxRIGHT);
+       auto name_sizer = new wxBoxSizer (wxHORIZONTAL);
+       name_sizer->Add (_name_label, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP);
+       name_sizer->Add (_name, 1, wxALIGN_CENTER_VERTICAL);
+       _grid->Add (name_sizer, wxGBPosition(r, 0), wxGBSpan(1, 2), wxEXPAND);
        ++r;
 
        int flags = wxALIGN_CENTER_VERTICAL;
@@ -286,7 +288,7 @@ DCPPanel::resolution_changed ()
                return;
        }
 
-       _film->set_resolution (_resolution->GetSelection() == 0 ? RESOLUTION_2K : RESOLUTION_4K);
+       _film->set_resolution (_resolution->GetSelection() == 0 ? Resolution::TWO_K : Resolution::FOUR_K);
 }
 
 void
@@ -329,39 +331,40 @@ DCPPanel::metadata_clicked ()
                }
 
                _smpte_metadata_dialog = new SMPTEMetadataDialog (_panel, _film);
+               _smpte_metadata_dialog->setup ();
                _smpte_metadata_dialog->Show ();
        }
 }
 
 void
-DCPPanel::film_changed (int p)
+DCPPanel::film_changed (Film::Property p)
 {
        switch (p) {
-       case Film::NONE:
+       case Film::Property::NONE:
                break;
-       case Film::CONTAINER:
+       case Film::Property::CONTAINER:
                setup_container ();
                break;
-       case Film::NAME:
+       case Film::Property::NAME:
                checked_set (_name, _film->name());
                setup_dcp_name ();
                break;
-       case Film::DCP_CONTENT_TYPE:
+       case Film::Property::DCP_CONTENT_TYPE:
                checked_set (_dcp_content_type, DCPContentType::as_index (_film->dcp_content_type ()));
                setup_dcp_name ();
                break;
-       case Film::ENCRYPTED:
+       case Film::Property::ENCRYPTED:
                checked_set (_encrypted, _film->encrypted ());
                break;
-       case Film::RESOLUTION:
-               checked_set (_resolution, _film->resolution() == RESOLUTION_2K ? 0 : 1);
+       case Film::Property::RESOLUTION:
+               checked_set (_resolution, _film->resolution() == Resolution::TWO_K ? 0 : 1);
                setup_container ();
                setup_dcp_name ();
                break;
-       case Film::J2K_BANDWIDTH:
+       case Film::Property::J2K_BANDWIDTH:
                checked_set (_j2k_bandwidth, _film->j2k_bandwidth() / 1000000);
                break;
-       case Film::USE_ISDCF_NAME:
+       case Film::Property::USE_ISDCF_NAME:
        {
                checked_set (_use_isdcf_name, _film->use_isdcf_name ());
                if (_film->use_isdcf_name()) {
@@ -378,11 +381,10 @@ DCPPanel::film_changed (int p)
                _edit_isdcf_button->Enable (_film->use_isdcf_name ());
                break;
        }
-       case Film::ISDCF_METADATA:
-       case Film::SUBTITLE_LANGUAGES:
+       case Film::Property::ISDCF_METADATA:
                setup_dcp_name ();
                break;
-       case Film::VIDEO_FRAME_RATE:
+       case Film::Property::VIDEO_FRAME_RATE:
        {
                bool done = false;
                for (unsigned int i = 0; i < _frame_rate_choice->GetCount(); ++i) {
@@ -403,7 +405,7 @@ DCPPanel::film_changed (int p)
                setup_dcp_name ();
                break;
        }
-       case Film::AUDIO_CHANNELS:
+       case Film::Property::AUDIO_CHANNELS:
                if (_film->audio_channels () < minimum_allowed_audio_channels ()) {
                        _film->set_audio_channels (minimum_allowed_audio_channels ());
                } else {
@@ -411,38 +413,42 @@ DCPPanel::film_changed (int p)
                        setup_dcp_name ();
                }
                break;
-       case Film::THREE_D:
+       case Film::Property::THREE_D:
                checked_set (_three_d, _film->three_d ());
                setup_dcp_name ();
                break;
-       case Film::REENCODE_J2K:
+       case Film::Property::REENCODE_J2K:
                checked_set (_reencode_j2k, _film->reencode_j2k());
                break;
-       case Film::INTEROP:
+       case Film::Property::INTEROP:
                checked_set (_standard, _film->interop() ? 1 : 0);
                setup_dcp_name ();
                _markers->Enable (!_film->interop());
                break;
-       case Film::AUDIO_PROCESSOR:
+       case Film::Property::AUDIO_PROCESSOR:
                if (_film->audio_processor ()) {
                        checked_set (_audio_processor, _film->audio_processor()->id());
                } else {
                        checked_set (_audio_processor, 0);
                }
                setup_audio_channels_choice (_audio_channels, minimum_allowed_audio_channels ());
-               film_changed (Film::AUDIO_CHANNELS);
+               film_changed (Film::Property::AUDIO_CHANNELS);
                break;
-       case Film::REEL_TYPE:
-               checked_set (_reel_type, _film->reel_type ());
-               _reel_length->Enable (_film->reel_type() == REELTYPE_BY_LENGTH);
+       case Film::Property::REEL_TYPE:
+               checked_set (_reel_type, static_cast<int>(_film->reel_type()));
+               _reel_length->Enable (_film->reel_type() == ReelType::BY_LENGTH);
                break;
-       case Film::REEL_LENGTH:
+       case Film::Property::REEL_LENGTH:
                checked_set (_reel_length, _film->reel_length() / 1000000000LL);
                break;
-       case Film::CONTENT:
+       case Film::Property::CONTENT:
                setup_dcp_name ();
                setup_sensitivity ();
                break;
+       case Film::Property::CONTENT_VERSIONS:
+       case Film::Property::VERSION_NUMBER:
+               setup_dcp_name ();
+               break;
        default:
                break;
        }
@@ -452,9 +458,13 @@ void
 DCPPanel::film_content_changed (int property)
 {
        if (property == AudioContentProperty::STREAMS ||
+           property == AudioContentProperty::LANGUAGE ||
            property == TextContentProperty::USE ||
            property == TextContentProperty::BURN ||
+           property == TextContentProperty::LANGUAGE ||
+           property == TextContentProperty::LANGUAGE_IS_ADDITIONAL ||
            property == VideoContentProperty::SCALE ||
+           property == VideoContentProperty::BURNT_SUBTITLE_LANGUAGE ||
            property == DCPContentProperty::REFERENCE_VIDEO ||
            property == DCPContentProperty::REFERENCE_AUDIO ||
            property == DCPContentProperty::REFERENCE_TEXT) {
@@ -547,24 +557,24 @@ DCPPanel::set_film (shared_ptr<Film> film)
                return;
        }
 
-       film_changed (Film::NAME);
-       film_changed (Film::USE_ISDCF_NAME);
-       film_changed (Film::CONTENT);
-       film_changed (Film::DCP_CONTENT_TYPE);
-       film_changed (Film::CONTAINER);
-       film_changed (Film::RESOLUTION);
-       film_changed (Film::ENCRYPTED);
-       film_changed (Film::J2K_BANDWIDTH);
-       film_changed (Film::ISDCF_METADATA);
-       film_changed (Film::VIDEO_FRAME_RATE);
-       film_changed (Film::AUDIO_CHANNELS);
-       film_changed (Film::SEQUENCE);
-       film_changed (Film::THREE_D);
-       film_changed (Film::INTEROP);
-       film_changed (Film::AUDIO_PROCESSOR);
-       film_changed (Film::REEL_TYPE);
-       film_changed (Film::REEL_LENGTH);
-       film_changed (Film::REENCODE_J2K);
+       film_changed (Film::Property::NAME);
+       film_changed (Film::Property::USE_ISDCF_NAME);
+       film_changed (Film::Property::CONTENT);
+       film_changed (Film::Property::DCP_CONTENT_TYPE);
+       film_changed (Film::Property::CONTAINER);
+       film_changed (Film::Property::RESOLUTION);
+       film_changed (Film::Property::ENCRYPTED);
+       film_changed (Film::Property::J2K_BANDWIDTH);
+       film_changed (Film::Property::ISDCF_METADATA);
+       film_changed (Film::Property::VIDEO_FRAME_RATE);
+       film_changed (Film::Property::AUDIO_CHANNELS);
+       film_changed (Film::Property::SEQUENCE);
+       film_changed (Film::Property::THREE_D);
+       film_changed (Film::Property::INTEROP);
+       film_changed (Film::Property::AUDIO_PROCESSOR);
+       film_changed (Film::Property::REEL_TYPE);
+       film_changed (Film::Property::REEL_LENGTH);
+       film_changed (Film::Property::REENCODE_J2K);
 
        set_general_sensitivity(static_cast<bool>(_film));
 }
@@ -586,7 +596,7 @@ DCPPanel::setup_sensitivity ()
        _copy_isdcf_name_button->Enable (_generally_sensitive);
        _encrypted->Enable              (_generally_sensitive);
        _reel_type->Enable              (_generally_sensitive && _film && !_film->references_dcp_video() && !_film->references_dcp_audio());
-       _reel_length->Enable            (_generally_sensitive && _film && _film->reel_type() == REELTYPE_BY_LENGTH);
+       _reel_length->Enable            (_generally_sensitive && _film && _film->reel_type() == ReelType::BY_LENGTH);
        _markers->Enable                (_generally_sensitive && _film && !_film->interop());
        _metadata->Enable               (_generally_sensitive);
        _frame_rate_choice->Enable      (_generally_sensitive && _film && !_film->references_dcp_video() && !_film->contains_atmos_content());
@@ -687,7 +697,7 @@ DCPPanel::config_changed (Config::Property p)
                _audio_processor->Clear ();
                add_audio_processors ();
                if (_film) {
-                       film_changed (Film::AUDIO_PROCESSOR);
+                       film_changed (Film::Property::AUDIO_PROCESSOR);
                }
        }
 }
Development branch of dcpomatic