X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fdcp_panel.cc;h=cf5c509773dc19fbee844283fd1bbef212f4ae50;hb=1b47a935c742ccd036312c694d17d1d9778b1b12;hp=5b2d18f23da12e65edd02607f21ddea67893af18;hpb=4dbc6ef917aeceb906b1ef1caf6911033e7e2c54;p=dcpomatic.git diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc index 5b2d18f23..cf5c50977 100644 --- a/src/wx/dcp_panel.cc +++ b/src/wx/dcp_panel.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2014 Carl Hetherington + Copyright (C) 2012-2015 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -19,19 +19,22 @@ #include "dcp_panel.h" #include "wx_util.h" +#include "key_dialog.h" #include "isdcf_metadata_dialog.h" #include "lib/ratio.h" -#include "lib/scaler.h" #include "lib/config.h" #include "lib/dcp_content_type.h" #include "lib/util.h" #include "lib/film.h" #include "lib/ffmpeg_content.h" +#include "lib/audio_processor.h" +#include #include #include #include #include #include +#include using std::cout; using std::list; @@ -76,9 +79,15 @@ DCPPanel::DCPPanel (wxNotebook* n, boost::shared_ptr f) ++r; } - add_label_to_grid_bag_sizer (grid, _panel, _("DCP Name"), true, wxGBPosition (r, 0)); - _dcp_name = new wxStaticText (_panel, wxID_ANY, wxT (""), wxDefaultPosition, wxDefaultSize, wxST_ELLIPSIZE_END); - grid->Add (_dcp_name, wxGBPosition(r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL | wxEXPAND); + /* wxST_ELLIPSIZE_MIDDLE works around a bug in GTK2 and/or wxWidgets, see + http://trac.wxwidgets.org/ticket/12539 + */ + _dcp_name = new wxStaticText ( + _panel, wxID_ANY, wxT (""), wxDefaultPosition, wxDefaultSize, + wxALIGN_CENTRE_HORIZONTAL | wxST_NO_AUTORESIZE | wxST_ELLIPSIZE_MIDDLE + ); + + grid->Add (_dcp_name, wxGBPosition(r, 0), wxGBSpan (1, 2), wxALIGN_CENTER_VERTICAL | wxEXPAND); ++r; add_label_to_grid_bag_sizer (grid, _panel, _("Content Type"), true, wxGBPosition (r, 0)); @@ -100,6 +109,21 @@ DCPPanel::DCPPanel (wxNotebook* n, boost::shared_ptr f) grid->Add (_encrypted, wxGBPosition (r, 0), wxGBSpan (1, 2)); ++r; + wxClientDC dc (_panel); + wxSize size = dc.GetTextExtent (wxT ("GGGGGGGG...")); + size.SetHeight (-1); + + { + add_label_to_grid_bag_sizer (grid, _panel, _("Key"), true, wxGBPosition (r, 0)); + wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); + _key = new wxStaticText (_panel, wxID_ANY, "", wxDefaultPosition, size); + s->Add (_key, 1, wxALIGN_CENTER_VERTICAL); + _edit_key = new wxButton (_panel, wxID_ANY, _("Edit...")); + s->Add (_edit_key); + 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); @@ -112,6 +136,7 @@ DCPPanel::DCPPanel (wxNotebook* n, boost::shared_ptr f) _dcp_content_type->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DCPPanel::dcp_content_type_changed, this)); _signed->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&DCPPanel::signed_toggled, this)); _encrypted->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&DCPPanel::encrypted_toggled, this)); + _edit_key->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&DCPPanel::edit_key_clicked, this)); _standard->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DCPPanel::standard_changed, this)); vector const ct = DCPContentType::all (); @@ -125,6 +150,16 @@ DCPPanel::DCPPanel (wxNotebook* n, boost::shared_ptr f) Config::instance()->Changed.connect (boost::bind (&DCPPanel::config_changed, this)); } +void +DCPPanel::edit_key_clicked () +{ + KeyDialog* d = new KeyDialog (_panel, _film->key ()); + if (d->ShowModal () == wxID_OK) { + _film->set_key (d->key ()); + } + d->Destroy (); +} + void DCPPanel::name_changed () { @@ -208,7 +243,7 @@ DCPPanel::audio_channels_changed () return; } - _film->set_audio_channels (_audio_channels->GetValue ()); + _film->set_audio_channels ((_audio_channels->GetSelection () + 1) * 2); } void @@ -248,9 +283,6 @@ DCPPanel::film_changed (int p) checked_set (_dcp_content_type, DCPContentType::as_index (_film->dcp_content_type ())); setup_dcp_name (); break; - case Film::SCALER: - checked_set (_scaler, Scaler::as_index (_film->scaler ())); - break; case Film::BURN_SUBTITLES: checked_set (_burn_subtitles, _film->burn_subtitles ()); break; @@ -262,12 +294,20 @@ DCPPanel::film_changed (int p) if (_film->encrypted ()) { _film->set_signed (true); _signed->Enable (false); + _key->Enable (_generally_sensitive); + _edit_key->Enable (_generally_sensitive); } else { _signed->Enable (_generally_sensitive); + _key->Enable (false); + _edit_key->Enable (false); } break; + case Film::KEY: + checked_set (_key, _film->key().hex().substr (0, 8) + "..."); + break; case Film::RESOLUTION: checked_set (_resolution, _film->resolution() == RESOLUTION_2K ? 0 : 1); + setup_container (); setup_dcp_name (); break; case Film::J2K_BANDWIDTH: @@ -304,7 +344,7 @@ DCPPanel::film_changed (int p) break; } case Film::AUDIO_CHANNELS: - checked_set (_audio_channels, _film->audio_channels ()); + checked_set (_audio_channels, (_film->audio_channels () / 2) - 1); setup_dcp_name (); break; case Film::THREE_D: @@ -313,6 +353,7 @@ DCPPanel::film_changed (int p) break; case Film::INTEROP: checked_set (_standard, _film->interop() ? 1 : 0); + setup_dcp_name (); break; default: break; @@ -322,7 +363,7 @@ DCPPanel::film_changed (int p) void DCPPanel::film_content_changed (int property) { - if (property == FFmpegContentProperty::AUDIO_STREAM || + if (property == FFmpegContentProperty::AUDIO_STREAMS || property == SubtitleContentProperty::USE_SUBTITLES || property == VideoContentProperty::VIDEO_SCALE) { setup_dcp_name (); @@ -343,8 +384,11 @@ DCPPanel::setup_container () if (i == ratios.end()) { checked_set (_container, -1); + checked_set (_container_size, wxT ("")); } else { checked_set (_container, n); + 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 (); @@ -391,10 +435,10 @@ DCPPanel::set_film (shared_ptr film) film_changed (Film::DCP_CONTENT_TYPE); film_changed (Film::CONTAINER); film_changed (Film::RESOLUTION); - film_changed (Film::SCALER); film_changed (Film::SIGNED); film_changed (Film::BURN_SUBTITLES); film_changed (Film::ENCRYPTED); + film_changed (Film::KEY); film_changed (Film::J2K_BANDWIDTH); film_changed (Film::ISDCF_METADATA); film_changed (Film::VIDEO_FRAME_RATE); @@ -421,32 +465,20 @@ DCPPanel::set_general_sensitivity (bool s) _signed->Enable (si); _encrypted->Enable (s); + _key->Enable (s && _film && _film->encrypted ()); + _edit_key->Enable (s && _film && _film->encrypted ()); _frame_rate_choice->Enable (s); _frame_rate_spin->Enable (s); _audio_channels->Enable (s); + _audio_processor->Enable (s); _j2k_bandwidth->Enable (s); _container->Enable (s); _best_frame_rate->Enable (s && _film && _film->best_video_frame_rate () != _film->video_frame_rate ()); _resolution->Enable (s); - _scaler->Enable (s); _three_d->Enable (s); _standard->Enable (s); } -/** Called when the scaler widget has been changed */ -void -DCPPanel::scaler_changed () -{ - if (!_film) { - return; - } - - int const n = _scaler->GetSelection (); - if (n >= 0) { - _film->set_scaler (Scaler::from_index (n)); - } -} - void DCPPanel::use_isdcf_name_toggled () { @@ -473,13 +505,7 @@ DCPPanel::edit_isdcf_button_clicked () void DCPPanel::setup_dcp_name () { - string s = _film->dcp_name (true); - if (s.length() > 28) { - _dcp_name->SetLabel (std_to_wx (s.substr (0, 28)) + N_("...")); - _dcp_name->SetToolTip (std_to_wx (s)); - } else { - _dcp_name->SetLabel (std_to_wx (s)); - } + _dcp_name->SetLabel (std_to_wx (_film->dcp_name (true))); } void @@ -535,12 +561,18 @@ DCPPanel::make_video_panel () int r = 0; add_label_to_grid_bag_sizer (grid, panel, _("Container"), true, wxGBPosition (r, 0)); - _container = new wxChoice (panel, wxID_ANY); - grid->Add (_container, wxGBPosition (r, 1)); - ++r; + { + wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); + _container = new wxChoice (panel, wxID_ANY); + s->Add (_container, 1, wxEXPAND | wxRIGHT, DCPOMATIC_SIZER_X_GAP); + _container_size = new wxStaticText (panel, wxID_ANY, wxT ("")); + s->Add (_container_size, 1, wxLEFT | wxALIGN_CENTER_VERTICAL); + grid->Add (s, wxGBPosition (r,1 ), wxDefaultSpan, wxEXPAND); + ++r; + } + add_label_to_grid_bag_sizer (grid, panel, _("Frame Rate"), true, wxGBPosition (r, 0)); { - add_label_to_grid_bag_sizer (grid, panel, _("Frame Rate"), true, wxGBPosition (r, 0)); _frame_rate_sizer = new wxBoxSizer (wxHORIZONTAL); _frame_rate_choice = new wxChoice (panel, wxID_ANY); _frame_rate_sizer->Add (_frame_rate_choice, 1, wxALIGN_CENTER_VERTICAL); @@ -550,8 +582,8 @@ DCPPanel::make_video_panel () _best_frame_rate = new wxButton (panel, wxID_ANY, _("Use best")); _frame_rate_sizer->Add (_best_frame_rate, 1, wxALIGN_CENTER_VERTICAL); grid->Add (_frame_rate_sizer, wxGBPosition (r, 1)); + ++r; } - ++r; _burn_subtitles = new wxCheckBox (panel, wxID_ANY, _("Burn subtitles into image")); grid->Add (_burn_subtitles, wxGBPosition (r, 0), wxGBSpan (1, 2)); @@ -576,26 +608,17 @@ DCPPanel::make_video_panel () } ++r; - add_label_to_grid_bag_sizer (grid, panel, _("Scaler"), true, wxGBPosition (r, 0)); - _scaler = new wxChoice (panel, wxID_ANY); - grid->Add (_scaler, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); - ++r; - _container->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DCPPanel::container_changed, this)); - _scaler->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DCPPanel::scaler_changed, this)); _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)); _resolution->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DCPPanel::resolution_changed, this)); _three_d->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&DCPPanel::three_d_changed, this)); - vector const sc = Scaler::all (); - for (vector::const_iterator i = sc.begin(); i != sc.end(); ++i) { - _scaler->Append (std_to_wx ((*i)->name())); - } - vector const ratio = Ratio::all (); for (vector::const_iterator i = ratio.begin(); i != ratio.end(); ++i) { _container->Append (std_to_wx ((*i)->nickname ())); @@ -625,14 +648,26 @@ 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 wxSpinCtrl (panel, wxID_ANY); + _audio_channels = new wxChoice (panel, wxID_ANY); + for (int i = 2; i <= 12; i += 2) { + _audio_channels->Append (wxString::Format ("%d", i)); + } grid->Add (_audio_channels, wxGBPosition (r, 1)); - ++r; - _audio_channels->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&DCPPanel::audio_channels_changed, this)); + add_label_to_grid_bag_sizer (grid, panel, _("Processor"), true, wxGBPosition (r, 0)); + _audio_processor = new wxChoice (panel, wxID_ANY); + _audio_processor->Append (_("None"), new wxStringClientData (N_("none"))); + BOOST_FOREACH (AudioProcessor const * ap, AudioProcessor::all ()) { + _audio_processor->Append (std_to_wx (ap->name ()), new wxStringClientData (std_to_wx (ap->id ()))); + } + grid->Add (_audio_processor, wxGBPosition (r, 1)); + + ++r; - _audio_channels->SetRange (0, MAX_DCP_AUDIO_CHANNELS); + _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)); return panel; } @@ -643,3 +678,16 @@ DCPPanel::copy_isdcf_name_button_clicked () _film->set_name (_film->isdcf_name (false)); _film->set_use_isdcf_name (false); } + +void +DCPPanel::audio_processor_changed () +{ + if (!_film) { + return; + } + + string const s = string_client_data (_audio_processor->GetClientObject (_audio_processor->GetSelection ())); + if (s != "none") { + _film->set_audio_processor (AudioProcessor::from_id (s)); + } +}