#include "dcp_panel.h"
#include "wx_util.h"
-#include "isdcf_metadata_dialog.h"
#include "audio_dialog.h"
#include "focus_manager.h"
#include "check_box.h"
FocusManager::instance()->add(_name);
_use_isdcf_name = new CheckBox (_panel, _("Use ISDCF name"));
- _edit_isdcf_button = new Button (_panel, _("Details..."));
_copy_isdcf_name_button = new Button (_panel, _("Copy as name"));
/* wxST_ELLIPSIZE_MIDDLE works around a bug in GTK2 and/or wxWidgets, see
_name->Bind (wxEVT_TEXT, boost::bind (&DCPPanel::name_changed, this));
_use_isdcf_name->Bind (wxEVT_CHECKBOX, boost::bind (&DCPPanel::use_isdcf_name_toggled, this));
- _edit_isdcf_button->Bind (wxEVT_BUTTON, boost::bind (&DCPPanel::edit_isdcf_button_clicked, this));
_copy_isdcf_name_button->Bind(wxEVT_BUTTON, boost::bind (&DCPPanel::copy_isdcf_name_button_clicked, this));
_dcp_content_type->Bind (wxEVT_CHOICE, boost::bind (&DCPPanel::dcp_content_type_changed, this));
_encrypted->Bind (wxEVT_CHECKBOX, boost::bind (&DCPPanel::encrypted_toggled, this));
{
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, wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP);
+ _grid->Add (name_sizer, wxGBPosition(r, 0), wxGBSpan(1, 2), wxRIGHT | wxEXPAND, DCPOMATIC_DIALOG_BORDER);
++r;
int flags = wxALIGN_CENTER_VERTICAL;
_grid->Add (_use_isdcf_name, wxGBPosition (r, 0), wxDefaultSpan, flags);
{
- wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
- s->Add (_edit_isdcf_button, 1, wxEXPAND | wxRIGHT, DCPOMATIC_SIZER_X_GAP);
- s->Add (_copy_isdcf_name_button, 1, wxEXPAND | wxLEFT, DCPOMATIC_SIZER_X_GAP);
+ auto s = new wxBoxSizer (wxHORIZONTAL);
+ s->Add (_copy_isdcf_name_button, 0, wxLEFT, DCPOMATIC_SIZER_X_GAP);
_grid->Add (s, wxGBPosition (r, 1), wxDefaultSpan, wxEXPAND);
}
++r;
- _grid->Add (_dcp_name, wxGBPosition(r, 0), wxGBSpan (1, 2), wxALIGN_CENTER_VERTICAL | wxEXPAND);
+ _grid->Add (_dcp_name, wxGBPosition(r, 0), wxGBSpan(1, 2), wxALIGN_CENTER_VERTICAL);
++r;
add_label_to_sizer (_grid, _dcp_content_type_label, true, wxGBPosition (r, 0));
}
_interop_metadata_dialog = new InteropMetadataDialog (_panel, _film);
+ _interop_metadata_dialog->setup ();
_interop_metadata_dialog->Show ();
} else {
if (_smpte_metadata_dialog) {
}
_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:
+ 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()) {
}
}
setup_dcp_name ();
- _edit_isdcf_button->Enable (_film->use_isdcf_name ());
break;
}
- case Film::ISDCF_METADATA:
- case Film::SUBTITLE_LANGUAGES:
- 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) {
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 {
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:
+ 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:
+ case Film::Property::RELEASE_TERRITORY:
+ case Film::Property::RATINGS:
+ case Film::Property::FACILITY:
+ case Film::Property::STUDIO:
+ case Film::Property::TEMP_VERSION:
+ case Film::Property::PRE_RELEASE:
+ case Film::Property::RED_BAND:
+ case Film::Property::TWO_D_VERSION_OF_THREE_D:
+ case Film::Property::CHAIN:
+ case Film::Property::LUMINANCE:
+ setup_dcp_name ();
+ break;
default:
break;
}
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) {
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::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));
}
{
_name->Enable (_generally_sensitive);
_use_isdcf_name->Enable (_generally_sensitive);
- _edit_isdcf_button->Enable (_generally_sensitive);
_dcp_content_type->Enable (_generally_sensitive);
_copy_isdcf_name_button->Enable (_generally_sensitive);
_encrypted->Enable (_generally_sensitive);
_film->set_use_isdcf_name (_use_isdcf_name->GetValue ());
}
-void
-DCPPanel::edit_isdcf_button_clicked ()
-{
- if (!_film) {
- return;
- }
-
- auto d = new ISDCFMetadataDialog (_panel, _film->isdcf_metadata (), _film->three_d ());
- d->ShowModal ();
- _film->set_isdcf_metadata (d->isdcf_metadata ());
- d->Destroy ();
-}
-
void
DCPPanel::setup_dcp_name ()
{
_audio_processor->Clear ();
add_audio_processors ();
if (_film) {
- film_changed (Film::AUDIO_PROCESSOR);
+ film_changed (Film::Property::AUDIO_PROCESSOR);
}
}
}
projects / dcpomatic.git / blobdiff