grid->Add (_name, wxGBPosition(r, 1), wxDefaultSpan, wxEXPAND | wxLEFT | wxRIGHT);
++r;
- add_label_to_grid_bag_sizer (grid, _panel, _("DCP Name"), true, wxGBPosition (r, 0));
- _dcp_name = new wxStaticText (_panel, wxID_ANY, wxT (""), wxDefaultPosition, wxDefaultSize, wxST_ELLIPSIZE_END);
- grid->Add (_dcp_name, wxGBPosition(r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL | wxEXPAND);
- ++r;
-
int flags = wxALIGN_CENTER_VERTICAL;
#ifdef __WXOSX__
flags |= wxALIGN_RIGHT;
grid->Add (_edit_isdcf_button, wxGBPosition (r, 1));
++r;
+ add_label_to_grid_bag_sizer (grid, _panel, _("DCP Name"), true, wxGBPosition (r, 0));
+ _dcp_name = new wxStaticText (_panel, wxID_ANY, wxT (""), wxDefaultPosition, wxDefaultSize, wxST_ELLIPSIZE_END);
+ grid->Add (_dcp_name, wxGBPosition(r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL | wxEXPAND);
+ ++r;
+
add_label_to_grid_bag_sizer (grid, _panel, _("Content Type"), true, wxGBPosition (r, 0));
_dcp_content_type = new wxChoice (_panel, wxID_ANY);
grid->Add (_dcp_content_type, wxGBPosition (r, 1));
checked_set (_j2k_bandwidth, _film->j2k_bandwidth() / 1000000);
break;
case Film::USE_ISDCF_NAME:
+ {
checked_set (_use_isdcf_name, _film->use_isdcf_name ());
setup_dcp_name ();
+ bool const i = _film->use_isdcf_name ();
+ if (!i) {
+ _film->set_name (_film->isdcf_name (true));
+ }
+ _edit_isdcf_button->Enable (i);
break;
+ }
case Film::ISDCF_METADATA:
setup_dcp_name ();
break;
void
DCPPanel::film_content_changed (int property)
{
- if (property == FFmpegContentProperty::AUDIO_STREAM || property == SubtitleContentProperty::USE_SUBTITLES) {
+ if (property == FFmpegContentProperty::AUDIO_STREAM ||
+ property == SubtitleContentProperty::USE_SUBTITLES ||
+ property == VideoContentProperty::VIDEO_SCALE) {
setup_dcp_name ();
}
}