_film_sizer = new wxBoxSizer (wxVERTICAL);
_film_panel->SetSizer (_film_sizer);
- wxGridBagSizer* grid = new wxGridBagSizer (6, 6);
+ wxGridBagSizer* grid = new wxGridBagSizer (4, 4);
_film_sizer->Add (grid, 0, wxALL, 8);
int r = 0;
add_label_to_grid_bag_sizer (grid, _film_panel, _("Name"), wxGBPosition (r, 0));
_name = new wxTextCtrl (_film_panel, wxID_ANY);
- grid->Add (_name, wxGBPosition(r, 1));
+ grid->Add (_name, wxGBPosition(r, 1), wxDefaultSpan, wxEXPAND);
++r;
add_label_to_grid_bag_sizer (grid, _film_panel, _("DCP Name"), wxGBPosition (r, 0));
++r;
_use_dci_name = new wxCheckBox (_film_panel, wxID_ANY, _("Use DCI name"));
- grid->Add (_use_dci_name, wxGBPosition (r, 0));
+ grid->Add (_use_dci_name, wxGBPosition (r, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
_edit_dci_button = new wxButton (_film_panel, wxID_ANY, _("Details..."));
grid->Add (_edit_dci_button, wxGBPosition (r, 1), wxDefaultSpan);
++r;
}
++r;
- _frame_rate_explanation = new wxStaticText (_film_panel, wxID_ANY, wxT (""), wxDefaultPosition, wxDefaultSize, wxST_NO_AUTORESIZE);
- grid->Add (video_control (_frame_rate_explanation), wxGBPosition (r, 0), wxGBSpan (1, 2), wxEXPAND | wxALIGN_CENTER_VERTICAL);
- wxFont font = _frame_rate_explanation->GetFont();
+ _frame_rate_description = new wxStaticText (_film_panel, wxID_ANY, wxT (" \n "), wxDefaultPosition, wxDefaultSize);
+ grid->Add (video_control (_frame_rate_description), wxGBPosition (r, 0), wxGBSpan (1, 2), wxEXPAND | wxALIGN_CENTER_VERTICAL | wxALL, 6);
+ wxFont font = _frame_rate_description->GetFont();
font.SetStyle(wxFONTSTYLE_ITALIC);
font.SetPointSize(font.GetPointSize() - 1);
- _frame_rate_explanation->SetFont(font);
+ _frame_rate_description->SetFont(font);
++r;
video_control (add_label_to_grid_bag_sizer (grid, _film_panel, _("Original Size"), wxGBPosition (r, 0)));
_video_sizer = new wxBoxSizer (wxVERTICAL);
_video_panel->SetSizer (_video_sizer);
- wxFlexGridSizer* grid = new wxFlexGridSizer (2, 4, 4);
+ wxGridBagSizer* grid = new wxGridBagSizer (4, 4);
_video_sizer->Add (grid, 0, wxALL, 8);
- add_label_to_sizer (grid, _video_panel, _("Format"));
+ int r = 0;
+ add_label_to_grid_bag_sizer (grid, _video_panel, _("Format"), wxGBPosition (r, 0));
_format = new wxChoice (_video_panel, wxID_ANY);
- grid->Add (_format);
+ grid->Add (_format, wxGBPosition (r, 1));
+ ++r;
+
+ _format_description = new wxStaticText (_video_panel, wxID_ANY, wxT (""), wxDefaultPosition, wxDefaultSize);
+ grid->Add (_format_description, wxGBPosition (r, 0), wxGBSpan (1, 2), wxEXPAND | wxALIGN_CENTER_VERTICAL | wxALL, 6);
+ wxFont font = _format_description->GetFont();
+ font.SetStyle(wxFONTSTYLE_ITALIC);
+ font.SetPointSize(font.GetPointSize() - 1);
+ _format_description->SetFont(font);
+ ++r;
- add_label_to_sizer (grid, _video_panel, _("Left crop"));
+ add_label_to_grid_bag_sizer (grid, _video_panel, _("Left crop"), wxGBPosition (r, 0));
_left_crop = new wxSpinCtrl (_video_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1));
- grid->Add (_left_crop);
+ grid->Add (_left_crop, wxGBPosition (r, 1));
+ ++r;
- add_label_to_sizer (grid, _video_panel, _("Right crop"));
+ add_label_to_grid_bag_sizer (grid, _video_panel, _("Right crop"), wxGBPosition (r, 0));
_right_crop = new wxSpinCtrl (_video_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1));
- grid->Add (_right_crop);
+ grid->Add (_right_crop, wxGBPosition (r, 1));
+ ++r;
- add_label_to_sizer (grid, _video_panel, _("Top crop"));
+ add_label_to_grid_bag_sizer (grid, _video_panel, _("Top crop"), wxGBPosition (r, 0));
_top_crop = new wxSpinCtrl (_video_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1));
- grid->Add (_top_crop);
+ grid->Add (_top_crop, wxGBPosition (r, 1));
+ ++r;
- add_label_to_sizer (grid, _video_panel, _("Bottom crop"));
+ add_label_to_grid_bag_sizer (grid, _video_panel, _("Bottom crop"), wxGBPosition (r, 0));
_bottom_crop = new wxSpinCtrl (_video_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1));
- grid->Add (_bottom_crop);
+ grid->Add (_bottom_crop, wxGBPosition (r, 1));
+ ++r;
/* VIDEO-only stuff */
{
- video_control (add_label_to_sizer (grid, _video_panel, _("Filters")));
+ video_control (add_label_to_grid_bag_sizer (grid, _video_panel, _("Filters"), wxGBPosition (r, 0)));
wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
_filters = new wxStaticText (_video_panel, wxID_ANY, _("None"));
video_control (_filters);
_filters_button = new wxButton (_video_panel, wxID_ANY, _("Edit..."));
video_control (_filters_button);
s->Add (_filters_button, 0);
- grid->Add (s, 1);
+ grid->Add (s, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
}
+ ++r;
- video_control (add_label_to_sizer (grid, _video_panel, _("Scaler")));
+ video_control (add_label_to_grid_bag_sizer (grid, _video_panel, _("Scaler"), wxGBPosition (r, 0)));
_scaler = new wxChoice (_video_panel, wxID_ANY);
- grid->Add (video_control (_scaler), 1);
+ grid->Add (video_control (_scaler), wxGBPosition (r, 1));
+ ++r;
vector<Scaler const *> const sc = Scaler::all ();
for (vector<Scaler const *>::const_iterator i = sc.begin(); i != sc.end(); ++i) {
_scaler->Append (std_to_wx ((*i)->name()));
}
- add_label_to_sizer (grid, _video_panel, _("Colour look-up table"));
+ add_label_to_grid_bag_sizer (grid, _video_panel, _("Colour look-up table"), wxGBPosition (r, 0));
_colour_lut = new wxChoice (_video_panel, wxID_ANY);
for (int i = 0; i < 2; ++i) {
_colour_lut->Append (std_to_wx (colour_lut_index_to_name (i)));
}
_colour_lut->SetSelection (0);
- grid->Add (_colour_lut, 1, wxEXPAND);
+ grid->Add (_colour_lut, wxGBPosition (r, 1), wxDefaultSpan, wxEXPAND);
+ ++r;
{
- add_label_to_sizer (grid, _video_panel, _("JPEG2000 bandwidth"));
+ add_label_to_grid_bag_sizer (grid, _video_panel, _("JPEG2000 bandwidth"), wxGBPosition (r, 0));
wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
_j2k_bandwidth = new wxSpinCtrl (_video_panel, wxID_ANY);
s->Add (_j2k_bandwidth, 1);
add_label_to_sizer (s, _video_panel, _("MBps"));
- grid->Add (s, 1);
+ grid->Add (s, wxGBPosition (r, 1));
}
+ ++r;
_left_crop->SetRange (0, 1024);
_top_crop->SetRange (0, 1024);
setup_formats ();
setup_subtitle_control_sensitivity ();
setup_streams ();
+ setup_show_audio_sensitivity ();
break;
case Film::TRUST_CONTENT_HEADER:
checked_set (_trust_content_header, _film->trust_content_header ());
break;
case Film::CONTENT_AUDIO_STREAMS:
setup_streams ();
+ setup_show_audio_sensitivity ();
break;
case Film::FORMAT:
{
checked_set (_format, n);
}
setup_dcp_name ();
+
+ if (_film->format ()) {
+ _format_description->SetLabel (std_to_wx (_film->format()->description ()));
+ } else {
+ _format_description->SetLabel (wxT (""));
+ }
break;
}
case Film::CROP:
_trim_end->SetRange (0, _film->length().get());
}
break;
- case Film::DCP_INTRINSIC_DURATION:
- break;
case Film::DCP_CONTENT_TYPE:
checked_set (_dcp_content_type, DCPContentType::as_index (_film->dcp_content_type ()));
setup_dcp_name ();
setup_dcp_name ();
setup_audio_details ();
setup_audio_control_sensitivity ();
+ setup_show_audio_sensitivity ();
break;
case Film::USE_CONTENT_AUDIO:
checked_set (_use_content_audio, _film->use_content_audio());
setup_dcp_name ();
setup_audio_details ();
setup_audio_control_sensitivity ();
+ setup_show_audio_sensitivity ();
break;
case Film::SUBTITLE_STREAM:
if (_film->subtitle_stream()) {
checked_set (_external_audio[i], a[i]);
}
setup_audio_details ();
+ setup_show_audio_sensitivity ();
break;
}
case Film::DCP_FRAME_RATE:
}
}
}
- _frame_rate_explanation->SetLabel (std_to_wx (FrameRateConversion (_film->source_frame_rate(), _film->dcp_frame_rate()).explanation));
+
+ if (_film->source_frame_rate()) {
+ _frame_rate_description->SetLabel (std_to_wx (FrameRateConversion (_film->source_frame_rate(), _film->dcp_frame_rate()).description));
+ _best_dcp_frame_rate->Enable (best_dcp_frame_rate (_film->source_frame_rate ()) != _film->dcp_frame_rate ());
+ } else {
+ _frame_rate_description->SetLabel (wxT (""));
+ _best_dcp_frame_rate->Disable ();
+ }
}
}
setup_subtitle_control_sensitivity ();
setup_audio_control_sensitivity ();
+ setup_show_audio_sensitivity ();
}
/** Called when the `Edit filters' button has been clicked */
vector<Format const *> fmt = Format::all ();
for (vector<Format const *>::iterator i = fmt.begin(); i != fmt.end(); ++i) {
- if (c == VIDEO && dynamic_cast<FixedFormat const *> (*i)) {
- _formats.push_back (*i);
- } else if (c == STILL && dynamic_cast<VariableFormat const *> (*i)) {
+ if (c == VIDEO || (c == STILL && dynamic_cast<VariableFormat const *> (*i))) {
_formats.push_back (*i);
}
}
void
FilmEditor::setup_audio_control_sensitivity ()
{
- _use_content_audio->Enable (_generally_sensitive);
+ _use_content_audio->Enable (_generally_sensitive && _film && !_film->content_audio_streams().empty());
_use_external_audio->Enable (_generally_sensitive);
bool const source = _generally_sensitive && _use_content_audio->GetValue();
void
FilmEditor::setup_audio_details ()
{
- if (!_film->audio_stream()) {
+ if (!_film->content_audio_stream()) {
_audio->SetLabel (wxT (""));
} else {
stringstream s;
_film->set_dcp_frame_rate (best_dcp_frame_rate (_film->source_frame_rate ()));
}
+
+void
+FilmEditor::setup_show_audio_sensitivity ()
+{
+ _show_audio->Enable (_film && _film->has_audio ());
+}
projects / dcpomatic.git / blobdiff