X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_editor.cc;h=7ef18165f25fd70d9f7c8950acb191bf3d7f89eb;hb=1e99bbf5062904095e5fb304271247eb78324016;hp=e8590e280080ed1158fb0c2e63ffa3ab9458a51e;hpb=2851a385540353b21c8a45247ab54091bd2d70c2;p=dcpomatic.git diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc index e8590e280..7ef18165f 100644 --- a/src/wx/film_editor.cc +++ b/src/wx/film_editor.cc @@ -149,6 +149,11 @@ FilmEditor::make_dcp_panel () } ++r; + add_label_to_grid_bag_sizer (grid, _dcp_panel, _("DCP audio channels"), true, wxGBPosition (r, 0)); + _dcp_audio_channels = new wxSpinCtrl (_dcp_panel, wxID_ANY); + grid->Add (_dcp_audio_channels, wxGBPosition (r, 1)); + ++r; + { add_label_to_grid_bag_sizer (grid, _dcp_panel, _("JPEG2000 bandwidth"), true, wxGBPosition (r, 0)); wxSizer* s = new wxBoxSizer (wxHORIZONTAL); @@ -184,6 +189,7 @@ FilmEditor::make_dcp_panel () _dcp_frame_rate->Append (std_to_wx (boost::lexical_cast (*i))); } + _dcp_audio_channels->SetRange (0, MAX_AUDIO_CHANNELS); _j2k_bandwidth->SetRange (50, 250); } @@ -211,10 +217,10 @@ FilmEditor::connect_to_widgets () _dcp_content_type->Connect (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler (FilmEditor::dcp_content_type_changed), 0, this); _dcp_frame_rate->Connect (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler (FilmEditor::dcp_frame_rate_changed), 0, this); _best_dcp_frame_rate->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (FilmEditor::best_dcp_frame_rate_clicked), 0, this); + _dcp_audio_channels->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::dcp_audio_channels_changed), 0, this); _with_subtitles->Connect (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler (FilmEditor::with_subtitles_toggled), 0, this); _subtitle_offset->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::subtitle_offset_changed), 0, this); _subtitle_scale->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::subtitle_scale_changed), 0, this); - _colour_lut->Connect (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler (FilmEditor::colour_lut_changed), 0, this); _j2k_bandwidth->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::j2k_bandwidth_changed), 0, this); _audio_gain->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::audio_gain_changed), 0, this); _audio_gain_calculate_button->Connect ( @@ -285,15 +291,6 @@ FilmEditor::make_video_panel () } ++r; - add_label_to_grid_bag_sizer (grid, _video_panel, _("Colour look-up table"), true, 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, wxGBPosition (r, 1), wxDefaultSpan, wxEXPAND); - ++r; - _left_crop->SetRange (0, 1024); _top_crop->SetRange (0, 1024); _right_crop->SetRange (0, 1024); @@ -393,7 +390,7 @@ FilmEditor::make_audio_panel () add_label_to_sizer (grid, _audio_panel, _("Audio Stream"), true); _audio_stream = new wxChoice (_audio_panel, wxID_ANY); - grid->Add (_audio_stream, 1); + grid->Add (_audio_stream, 1, wxEXPAND); _audio_description = new wxStaticText (_audio_panel, wxID_ANY, wxT ("")); grid->AddSpacer (0); @@ -426,7 +423,7 @@ FilmEditor::make_subtitle_panel () wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); _subtitle_offset = new wxSpinCtrl (_subtitle_panel); s->Add (_subtitle_offset); - add_label_to_sizer (s, _subtitle_panel, _("pixels"), false); + add_label_to_sizer (s, _subtitle_panel, _("%"), false); grid->Add (s); } @@ -441,11 +438,11 @@ FilmEditor::make_subtitle_panel () add_label_to_sizer (grid, _subtitle_panel, _("Subtitle Stream"), true); _subtitle_stream = new wxChoice (_subtitle_panel, wxID_ANY); - grid->Add (_subtitle_stream, 1, wxEXPAND | wxALL, 6); - grid->AddSpacer (0); + grid->Add (_subtitle_stream, 1, wxEXPAND); - _subtitle_offset->SetRange (-1024, 1024); + _subtitle_offset->SetRange (-100, 100); _subtitle_scale->SetRange (1, 1000); + _subtitle_scale->SetValue (100); } void @@ -528,31 +525,23 @@ FilmEditor::name_changed (wxCommandEvent &) void FilmEditor::subtitle_offset_changed (wxCommandEvent &) { - if (!_film) { + shared_ptr c = selected_subtitle_content (); + if (!c) { return; } - _film->set_subtitle_offset (_subtitle_offset->GetValue ()); + c->set_subtitle_offset (_subtitle_offset->GetValue() / 100.0); } void FilmEditor::subtitle_scale_changed (wxCommandEvent &) { - if (!_film) { + shared_ptr c = selected_subtitle_content (); + if (!c) { return; } - _film->set_subtitle_scale (_subtitle_scale->GetValue() / 100.0); -} - -void -FilmEditor::colour_lut_changed (wxCommandEvent &) -{ - if (!_film) { - return; - } - - _film->set_colour_lut (_colour_lut->GetSelection ()); + c->set_subtitle_scale (_subtitle_scale->GetValue() / 100.0); } void @@ -579,6 +568,16 @@ FilmEditor::dcp_frame_rate_changed (wxCommandEvent &) ); } +void +FilmEditor::dcp_audio_channels_changed (wxCommandEvent &) +{ + if (!_film) { + return; + } + + _film->set_dcp_audio_channels (_dcp_audio_channels->GetValue ()); +} + /** Called when the metadata stored in the Film object has changed; * so that we can update the GUI. @@ -627,15 +626,6 @@ FilmEditor::film_changed (Film::Property p) setup_subtitle_control_sensitivity (); setup_dcp_name (); break; - case Film::SUBTITLE_OFFSET: - checked_set (_subtitle_offset, _film->subtitle_offset ()); - break; - case Film::SUBTITLE_SCALE: - checked_set (_subtitle_scale, _film->subtitle_scale() * 100); - break; - case Film::COLOUR_LUT: - checked_set (_colour_lut, _film->colour_lut ()); - break; case Film::J2K_BANDWIDTH: checked_set (_j2k_bandwidth, double (_film->j2k_bandwidth()) / 1e6); break; @@ -664,6 +654,11 @@ FilmEditor::film_changed (Film::Property p) _best_dcp_frame_rate->Enable (_film->best_dcp_video_frame_rate () != _film->dcp_video_frame_rate ()); break; } + case Film::DCP_AUDIO_CHANNELS: + _dcp_audio_channels->SetValue (_film->dcp_audio_channels ()); + _audio_mapping->set_channels (_film->dcp_audio_channels ()); + break; + } } void @@ -679,10 +674,12 @@ FilmEditor::film_content_changed (weak_ptr weak_content, int property) shared_ptr content = weak_content.lock (); shared_ptr video_content; shared_ptr audio_content; + shared_ptr subtitle_content; shared_ptr ffmpeg_content; if (content) { video_content = dynamic_pointer_cast (content); audio_content = dynamic_pointer_cast (content); + subtitle_content = dynamic_pointer_cast (content); ffmpeg_content = dynamic_pointer_cast (content); } @@ -701,9 +698,9 @@ FilmEditor::film_content_changed (weak_ptr weak_content, int property) _length->set (0, 24); } } else if (property == VideoContentProperty::VIDEO_CROP) { - checked_set (_left_crop, video_content ? video_content->crop().left : 0); - checked_set (_right_crop, video_content ? video_content->crop().right : 0); - checked_set (_top_crop, video_content ? video_content->crop().top : 0); + checked_set (_left_crop, video_content ? video_content->crop().left : 0); + checked_set (_right_crop, video_content ? video_content->crop().right : 0); + checked_set (_top_crop, video_content ? video_content->crop().top : 0); checked_set (_bottom_crop, video_content ? video_content->crop().bottom : 0); setup_scaling_description (); } else if (property == VideoContentProperty::VIDEO_RATIO) { @@ -724,6 +721,7 @@ FilmEditor::film_content_changed (weak_ptr weak_content, int property) } else { checked_set (_ratio, -1); } + setup_scaling_description (); } else if (property == AudioContentProperty::AUDIO_GAIN) { checked_set (_audio_gain, audio_content ? audio_content->audio_gain() : 0); } else if (property == AudioContentProperty::AUDIO_DELAY) { @@ -775,6 +773,10 @@ FilmEditor::film_content_changed (weak_ptr weak_content, int property) } _dcp_sizer->Layout (); } + } else if (property == SubtitleContentProperty::SUBTITLE_OFFSET) { + checked_set (_subtitle_offset, subtitle_content ? (subtitle_content->subtitle_offset() * 100) : 0); + } else if (property == SubtitleContentProperty::SUBTITLE_SCALE) { + checked_set (_subtitle_scale, subtitle_content ? (subtitle_content->subtitle_scale() * 100) : 100); } } @@ -860,12 +862,14 @@ FilmEditor::set_film (shared_ptr f) film_changed (Film::CONTAINER); film_changed (Film::SCALER); film_changed (Film::WITH_SUBTITLES); - film_changed (Film::SUBTITLE_OFFSET); - film_changed (Film::SUBTITLE_SCALE); - film_changed (Film::COLOUR_LUT); film_changed (Film::J2K_BANDWIDTH); film_changed (Film::DCI_METADATA); film_changed (Film::DCP_VIDEO_FRAME_RATE); + film_changed (Film::DCP_AUDIO_CHANNELS); + + if (!_film->content().empty ()) { + set_selection (_film->content().front ()); + } wxListEvent ev; content_selection_changed (ev); @@ -891,9 +895,8 @@ FilmEditor::set_things_sensitive (bool s) _filters_button->Enable (s); _scaler->Enable (s); _dcp_content_type->Enable (s); - _best_dcp_frame_rate->Enable (s); _dcp_frame_rate->Enable (s); - _colour_lut->Enable (s); + _dcp_audio_channels->Enable (s); _j2k_bandwidth->Enable (s); _audio_gain->Enable (s); _audio_gain_calculate_button->Enable (s); @@ -906,6 +909,7 @@ FilmEditor::set_things_sensitive (bool s) setup_subtitle_control_sensitivity (); setup_show_audio_sensitivity (); setup_content_sensitivity (); + _best_dcp_frame_rate->Enable (s && _film && _film->best_dcp_video_frame_rate () != _film->dcp_video_frame_rate ()); } /** Called when the `Edit filters' button has been clicked */ @@ -1191,6 +1195,9 @@ FilmEditor::content_remove_clicked (wxCommandEvent &) if (c) { _film->remove_content (c); } + + wxListEvent ev; + content_selection_changed (ev); } void @@ -1202,7 +1209,7 @@ FilmEditor::content_selection_changed (wxListEvent &) if (_audio_dialog && s && dynamic_pointer_cast (s)) { _audio_dialog->set_content (dynamic_pointer_cast (s)); } - + film_content_changed (s, ContentProperty::START); film_content_changed (s, ContentProperty::LENGTH); film_content_changed (s, VideoContentProperty::VIDEO_CROP); @@ -1213,6 +1220,10 @@ FilmEditor::content_selection_changed (wxListEvent &) film_content_changed (s, FFmpegContentProperty::AUDIO_STREAM); film_content_changed (s, FFmpegContentProperty::AUDIO_STREAMS); film_content_changed (s, FFmpegContentProperty::SUBTITLE_STREAM); + film_content_changed (s, FFmpegContentProperty::SUBTITLE_STREAMS); + film_content_changed (s, FFmpegContentProperty::FILTERS); + film_content_changed (s, SubtitleContentProperty::SUBTITLE_OFFSET); + film_content_changed (s, SubtitleContentProperty::SUBTITLE_SCALE); } void @@ -1269,27 +1280,44 @@ FilmEditor::selected_audio_content () return dynamic_pointer_cast (c); } +shared_ptr +FilmEditor::selected_subtitle_content () +{ + shared_ptr c = selected_content (); + if (!c) { + return shared_ptr (); + } + + return dynamic_pointer_cast (c); +} + void FilmEditor::setup_scaling_description () { + shared_ptr vc = selected_video_content (); + if (!vc) { + _scaling_description->SetLabel (""); + return; + } + wxString d; -#if 0 -XXX int lines = 0; - if (_film->video_size().width && _film->video_size().height) { + if (vc->video_size().width && vc->video_size().height) { d << wxString::Format ( _("Original video is %dx%d (%.2f:1)\n"), - _film->video_size().width, _film->video_size().height, - float (_film->video_size().width) / _film->video_size().height + vc->video_size().width, vc->video_size().height, + float (vc->video_size().width) / vc->video_size().height ); ++lines; } - Crop const crop = _film->crop (); - if ((crop.left || crop.right || crop.top || crop.bottom) && _film->size() != libdcp::Size (0, 0)) { - libdcp::Size const cropped = _film->cropped_size (_film->size ()); + Crop const crop = vc->crop (); + if ((crop.left || crop.right || crop.top || crop.bottom) && vc->video_size() != libdcp::Size (0, 0)) { + libdcp::Size cropped = vc->video_size (); + cropped.width -= crop.left + crop.right; + cropped.height -= crop.top + crop.bottom; d << wxString::Format ( _("Cropped to %dx%d (%.2f:1)\n"), cropped.width, cropped.height, @@ -1298,11 +1326,11 @@ XXX ++lines; } - Format const * format = _film->format (); - if (format) { - int const padding = format->dcp_padding (_film); - libdcp::Size scaled = format->dcp_size (); - scaled.width -= padding * 2; + Ratio const * ratio = vc->ratio (); + if (ratio) { + libdcp::Size container_size = _film->container()->size (_film->full_frame ()); + + libdcp::Size const scaled = ratio->size (container_size); d << wxString::Format ( _("Scaled to %dx%d (%.2f:1)\n"), scaled.width, scaled.height, @@ -1310,11 +1338,11 @@ XXX ); ++lines; - if (padding) { + if (scaled != container_size) { d << wxString::Format ( _("Padded with black to %dx%d (%.2f:1)\n"), - format->dcp_size().width, format->dcp_size().height, - float (format->dcp_size().width) / format->dcp_size().height + container_size.width, container_size.height, + float (container_size.width) / container_size.height ); ++lines; } @@ -1324,7 +1352,6 @@ XXX d << wxT ("\n "); } -#endif _scaling_description->SetLabel (d); }