X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fdcp_panel.cc;h=65bf908a799448be8f9521c46a7c4c7d75f56c9f;hb=b85420b326b74c7c8125bf599993d71460ad881e;hp=786f294b0cb03474fbc4f1f46625e27074f58f2d;hpb=8923ed628cff91cb4312f6d1bd27664d3bc6d890;p=dcpomatic.git diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc index 786f294b0..65bf908a7 100644 --- a/src/wx/dcp_panel.cc +++ b/src/wx/dcp_panel.cc @@ -21,6 +21,7 @@ #include "wx_util.h" #include "key_dialog.h" #include "isdcf_metadata_dialog.h" +#include "audio_dialog.h" #include "lib/ratio.h" #include "lib/config.h" #include "lib/dcp_content_type.h" @@ -28,23 +29,30 @@ #include "lib/film.h" #include "lib/ffmpeg_content.h" #include "lib/audio_processor.h" +#include "lib/dcp_content.h" #include +#include #include #include #include #include #include #include +#include using std::cout; using std::list; using std::string; using std::vector; +using std::pair; +using std::max; +using std::make_pair; using boost::lexical_cast; using boost::shared_ptr; -DCPPanel::DCPPanel (wxNotebook* n, boost::shared_ptr f) - : _film (f) +DCPPanel::DCPPanel (wxNotebook* n, boost::shared_ptr film) + : _audio_dialog (0) + , _film (film) , _generally_sensitive (true) { _panel = new wxPanel (n); @@ -55,16 +63,16 @@ DCPPanel::DCPPanel (wxNotebook* n, boost::shared_ptr f) _sizer->Add (grid, 0, wxEXPAND | wxALL, 8); int r = 0; - + add_label_to_grid_bag_sizer (grid, _panel, _("Name"), true, wxGBPosition (r, 0)); _name = new wxTextCtrl (_panel, wxID_ANY); grid->Add (_name, wxGBPosition(r, 1), wxDefaultSpan, wxEXPAND | wxLEFT | wxRIGHT); ++r; - + int flags = wxALIGN_CENTER_VERTICAL; #ifdef __WXOSX__ flags |= wxALIGN_RIGHT; -#endif +#endif _use_isdcf_name = new wxCheckBox (_panel, wxID_ANY, _("Use ISDCF name")); grid->Add (_use_isdcf_name, wxGBPosition (r, 0), wxDefaultSpan, flags); @@ -100,11 +108,11 @@ DCPPanel::DCPPanel (wxNotebook* n, boost::shared_ptr f) _notebook->AddPage (make_video_panel (), _("Video"), false); _notebook->AddPage (make_audio_panel (), _("Audio"), false); - + _signed = new wxCheckBox (_panel, wxID_ANY, _("Signed")); grid->Add (_signed, wxGBPosition (r, 0), wxGBSpan (1, 2)); ++r; - + _encrypted = new wxCheckBox (_panel, wxID_ANY, _("Encrypted")); grid->Add (_encrypted, wxGBPosition (r, 0), wxGBSpan (1, 2)); ++r; @@ -123,7 +131,7 @@ DCPPanel::DCPPanel (wxNotebook* n, boost::shared_ptr f) grid->Add (s, wxGBPosition (r, 1)); ++r; } - + add_label_to_grid_bag_sizer (grid, _panel, _("Standard"), true, wxGBPosition (r, 0)); _standard = new wxChoice (_panel, wxID_ANY); grid->Add (_standard, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); @@ -176,7 +184,7 @@ DCPPanel::j2k_bandwidth_changed () if (!_film) { return; } - + _film->set_j2k_bandwidth (_j2k_bandwidth->GetValue() * 1000000); } @@ -190,16 +198,6 @@ DCPPanel::signed_toggled () _film->set_signed (_signed->GetValue ()); } -void -DCPPanel::burn_subtitles_toggled () -{ - if (!_film) { - return; - } - - _film->set_burn_subtitles (_burn_subtitles->GetValue ()); -} - void DCPPanel::encrypted_toggled () { @@ -209,7 +207,7 @@ DCPPanel::encrypted_toggled () _film->set_encrypted (_encrypted->GetValue ()); } - + /** Called when the frame rate choice widget has been changed */ void DCPPanel::frame_rate_choice_changed () @@ -243,7 +241,7 @@ DCPPanel::audio_channels_changed () return; } - _film->set_audio_channels ((_audio_channels->GetSelection () + 1) * 2); + _film->set_audio_channels (dcp::raw_convert (string_client_data (_audio_channels->GetClientObject (_audio_channels->GetSelection ())))); } void @@ -283,9 +281,6 @@ DCPPanel::film_changed (int p) checked_set (_dcp_content_type, DCPContentType::as_index (_film->dcp_content_type ())); setup_dcp_name (); break; - case Film::BURN_SUBTITLES: - checked_set (_burn_subtitles, _film->burn_subtitles ()); - break; case Film::SIGNED: checked_set (_signed, _film->is_signed ()); break; @@ -344,8 +339,12 @@ DCPPanel::film_changed (int p) break; } case Film::AUDIO_CHANNELS: - checked_set (_audio_channels, (_film->audio_channels () / 2) - 1); - setup_dcp_name (); + if (_film->audio_channels () < minimum_allowed_audio_channels ()) { + _film->set_audio_channels (minimum_allowed_audio_channels ()); + } else { + checked_set (_audio_channels, dcp::raw_convert (max (minimum_allowed_audio_channels(), _film->audio_channels ()))); + setup_dcp_name (); + } break; case Film::THREE_D: checked_set (_three_d, _film->three_d ()); @@ -361,6 +360,8 @@ DCPPanel::film_changed (int p) } else { checked_set (_audio_processor, 0); } + setup_audio_channels_choice (); + film_changed (Film::AUDIO_CHANNELS); break; default: break; @@ -370,9 +371,12 @@ DCPPanel::film_changed (int p) void DCPPanel::film_content_changed (int property) { - if (property == FFmpegContentProperty::AUDIO_STREAMS || + if (property == AudioContentProperty::AUDIO_STREAMS || property == SubtitleContentProperty::USE_SUBTITLES || - property == VideoContentProperty::VIDEO_SCALE) { + property == VideoContentProperty::VIDEO_SCALE || + property == DCPContentProperty::REFERENCE_VIDEO || + property == DCPContentProperty::REFERENCE_AUDIO || + property == DCPContentProperty::REFERENCE_SUBTITLE) { setup_dcp_name (); } } @@ -388,7 +392,7 @@ DCPPanel::setup_container () ++i; ++n; } - + if (i == ratios.end()) { checked_set (_container, -1); checked_set (_container_size, wxT ("")); @@ -397,9 +401,9 @@ DCPPanel::setup_container () dcp::Size const size = fit_ratio_within (_film->container()->ratio(), _film->full_frame ()); checked_set (_container_size, wxString::Format ("%dx%d", size.width, size.height)); } - + setup_dcp_name (); -} +} /** Called when the container widget has been changed */ void @@ -435,7 +439,7 @@ void DCPPanel::set_film (shared_ptr film) { _film = film; - + film_changed (Film::NAME); film_changed (Film::USE_ISDCF_NAME); film_changed (Film::CONTENT); @@ -443,7 +447,6 @@ DCPPanel::set_film (shared_ptr film) film_changed (Film::CONTAINER); film_changed (Film::RESOLUTION); film_changed (Film::SIGNED); - film_changed (Film::BURN_SUBTITLES); film_changed (Film::ENCRYPTED); film_changed (Film::KEY); film_changed (Film::J2K_BANDWIDTH); @@ -469,9 +472,8 @@ DCPPanel::set_general_sensitivity (bool s) if (_film && _film->encrypted ()) { si = false; } - _burn_subtitles->Enable (s); _signed->Enable (si); - + _encrypted->Enable (s); _key->Enable (s && _film && _film->encrypted ()); _edit_key->Enable (s && _film && _film->encrypted ()); @@ -504,7 +506,7 @@ DCPPanel::edit_isdcf_button_clicked () return; } - ISDCFMetadataDialog* d = new ISDCFMetadataDialog (_panel, _film->isdcf_metadata ()); + ISDCFMetadataDialog* d = new ISDCFMetadataDialog (_panel, _film->isdcf_metadata (), _film->three_d ()); d->ShowModal (); _film->set_isdcf_metadata (d->isdcf_metadata ()); d->Destroy (); @@ -522,7 +524,7 @@ DCPPanel::best_frame_rate_clicked () if (!_film) { return; } - + _film->set_video_frame_rate (_film->best_video_frame_rate ()); } @@ -567,7 +569,7 @@ DCPPanel::make_video_panel () panel->SetSizer (sizer); int r = 0; - + add_label_to_grid_bag_sizer (grid, panel, _("Container"), true, wxGBPosition (r, 0)); { wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); @@ -593,10 +595,6 @@ DCPPanel::make_video_panel () ++r; } - _burn_subtitles = new wxCheckBox (panel, wxID_ANY, _("Burn subtitles into image")); - grid->Add (_burn_subtitles, wxGBPosition (r, 0), wxGBSpan (1, 2)); - ++r; - _three_d = new wxCheckBox (panel, wxID_ANY, _("3D")); grid->Add (_three_d, wxGBPosition (r, 0), wxGBSpan (1, 2)); ++r; @@ -620,7 +618,6 @@ DCPPanel::make_video_panel () _frame_rate_choice->Bind(wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DCPPanel::frame_rate_choice_changed, this)); _frame_rate_spin->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&DCPPanel::frame_rate_spin_changed, this)); _best_frame_rate->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&DCPPanel::best_frame_rate_clicked, this)); - _burn_subtitles->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&DCPPanel::burn_subtitles_toggled, this)); _j2k_bandwidth->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&DCPPanel::j2k_bandwidth_changed, this)); /* Also listen to wxEVT_COMMAND_TEXT_UPDATED so that typing numbers directly in is always noticed */ _j2k_bandwidth->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&DCPPanel::j2k_bandwidth_changed, this)); @@ -646,6 +643,32 @@ DCPPanel::make_video_panel () return panel; } +int +DCPPanel::minimum_allowed_audio_channels () const +{ + int min = 2; + if (_film && _film->audio_processor ()) { + min = _film->audio_processor()->out_channels (); + } + + if (min % 2 == 1) { + ++min; + } + + return min; +} + +void +DCPPanel::setup_audio_channels_choice () +{ + vector > items; + for (int i = minimum_allowed_audio_channels(); i <= 12; i += 2) { + items.push_back (make_pair (dcp::raw_convert (i), dcp::raw_convert (i))); + } + + checked_set (_audio_channels, items); +} + wxPanel * DCPPanel::make_audio_panel () { @@ -656,12 +679,10 @@ DCPPanel::make_audio_panel () panel->SetSizer (sizer); int r = 0; - + add_label_to_grid_bag_sizer (grid, panel, _("Channels"), true, wxGBPosition (r, 0)); _audio_channels = new wxChoice (panel, wxID_ANY); - for (int i = 2; i <= 12; i += 2) { - _audio_channels->Append (wxString::Format ("%d", i)); - } + setup_audio_channels_choice (); grid->Add (_audio_channels, wxGBPosition (r, 1)); ++r; @@ -672,11 +693,15 @@ DCPPanel::make_audio_panel () _audio_processor->Append (std_to_wx (ap->name ()), new wxStringClientData (std_to_wx (ap->id ()))); } grid->Add (_audio_processor, wxGBPosition (r, 1)); - + ++r; + + _show_audio = new wxButton (panel, wxID_ANY, _("Show audio...")); + grid->Add (_show_audio, wxGBPosition (r, 0), wxGBSpan (1, 2)); ++r; _audio_channels->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DCPPanel::audio_channels_changed, this)); _audio_processor->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DCPPanel::audio_processor_changed, this)); + _show_audio->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&DCPPanel::show_audio_clicked, this)); return panel; } @@ -696,7 +721,21 @@ DCPPanel::audio_processor_changed () } string const s = string_client_data (_audio_processor->GetClientObject (_audio_processor->GetSelection ())); - if (s != "none") { - _film->set_audio_processor (AudioProcessor::from_id (s)); + _film->set_audio_processor (AudioProcessor::from_id (s)); +} + +void +DCPPanel::show_audio_clicked () +{ + if (!_film) { + return; } + + if (_audio_dialog) { + _audio_dialog->Destroy (); + _audio_dialog = 0; + } + + AudioDialog* d = new AudioDialog (_panel, _film); + d->Show (); }