X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwx%2Fdcp_panel.cc;h=b38476dd7a0a8a4d44cb92045903f9a249cc2e91;hb=43877eccbedc0950ab253e76dd0cea691fd7a4b0;hp=24c678c576edbc3bb4ca925e4b41b2316c4bc10b;hpb=f98caf4af896e9be943046b84586da5c2e103f18;p=dcpomatic.git diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc index 24c678c57..b38476dd7 100644 --- a/src/wx/dcp_panel.cc +++ b/src/wx/dcp_panel.cc @@ -30,6 +30,7 @@ #include "lib/ffmpeg_content.h" #include "lib/audio_processor.h" #include +#include #include #include #include @@ -41,12 +42,15 @@ 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) +DCPPanel::DCPPanel (wxNotebook* n, boost::shared_ptr film) : _audio_dialog (0) - , _film (f) + , _film (film) , _generally_sensitive (true) { _panel = new wxPanel (n); @@ -57,16 +61,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); @@ -102,11 +106,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; @@ -125,7 +129,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); @@ -178,7 +182,7 @@ DCPPanel::j2k_bandwidth_changed () if (!_film) { return; } - + _film->set_j2k_bandwidth (_j2k_bandwidth->GetValue() * 1000000); } @@ -192,16 +196,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 () { @@ -211,7 +205,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 () @@ -245,7 +239,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 @@ -285,9 +279,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; @@ -346,8 +337,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 ()); @@ -363,6 +358,8 @@ DCPPanel::film_changed (int p) } else { checked_set (_audio_processor, 0); } + setup_audio_channels_choice (); + film_changed (Film::AUDIO_CHANNELS); break; default: break; @@ -390,7 +387,7 @@ DCPPanel::setup_container () ++i; ++n; } - + if (i == ratios.end()) { checked_set (_container, -1); checked_set (_container_size, wxT ("")); @@ -399,9 +396,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 @@ -437,7 +434,7 @@ void DCPPanel::set_film (shared_ptr film) { _film = film; - + film_changed (Film::NAME); film_changed (Film::USE_ISDCF_NAME); film_changed (Film::CONTENT); @@ -445,7 +442,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); @@ -471,9 +467,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 ()); @@ -524,7 +519,7 @@ DCPPanel::best_frame_rate_clicked () if (!_film) { return; } - + _film->set_video_frame_rate (_film->best_video_frame_rate ()); } @@ -569,7 +564,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); @@ -595,10 +590,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; @@ -622,7 +613,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)); @@ -648,6 +638,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 () { @@ -658,12 +674,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; @@ -716,8 +730,7 @@ DCPPanel::show_audio_clicked () _audio_dialog->Destroy (); _audio_dialog = 0; } - + AudioDialog* d = new AudioDialog (_panel, _film); d->Show (); - d->set_playlist (_film->playlist ()); }