X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fdcp_panel.cc;h=0759694f8802db016c07506b36559049c95e0ba0;hb=d71b3fffa09263a2116b3f91981c1999b4ae873c;hp=f042e5eb139a29f8930097c7f2e8fb440273c6ec;hpb=7979aeb87a83de31c4cf25f88eef4fbca4b56553;p=dcpomatic.git diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc index f042e5eb1..0759694f8 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,29 +19,37 @@ #include "dcp_panel.h" #include "wx_util.h" +#include "key_dialog.h" #include "isdcf_metadata_dialog.h" +#include "audio_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 +#include using std::cout; using std::list; using std::string; using std::vector; +using std::pair; +using std::make_pair; using boost::lexical_cast; using boost::shared_ptr; DCPPanel::DCPPanel (wxNotebook* n, boost::shared_ptr f) - : _film (f) + : _audio_dialog (0) + , _film (f) , _generally_sensitive (true) { _panel = new wxPanel (n); @@ -65,13 +73,26 @@ DCPPanel::DCPPanel (wxNotebook* n, boost::shared_ptr f) _use_isdcf_name = new wxCheckBox (_panel, wxID_ANY, _("Use ISDCF name")); grid->Add (_use_isdcf_name, wxGBPosition (r, 0), wxDefaultSpan, flags); - _edit_isdcf_button = new wxButton (_panel, wxID_ANY, _("Details...")); - grid->Add (_edit_isdcf_button, wxGBPosition (r, 1)); - ++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); + { + wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); + _edit_isdcf_button = new wxButton (_panel, wxID_ANY, _("Details...")); + s->Add (_edit_isdcf_button, 1, wxEXPAND | wxRIGHT, DCPOMATIC_SIZER_X_GAP); + _copy_isdcf_name_button = new wxButton (_panel, wxID_ANY, _("Copy as name")); + s->Add (_copy_isdcf_name_button, 1, wxEXPAND | wxLEFT, DCPOMATIC_SIZER_X_GAP); + grid->Add (s, wxGBPosition (r, 1), wxDefaultSpan, wxEXPAND); + ++r; + } + + /* 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)); @@ -93,18 +114,35 @@ 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); ++r; - _name->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&DCPPanel::name_changed, this)); - _use_isdcf_name->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&DCPPanel::use_isdcf_name_toggled, this)); - _edit_isdcf_button->Bind(wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&DCPPanel::edit_isdcf_button_clicked, this)); - _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)); - _standard->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DCPPanel::standard_changed, this)); + _name->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&DCPPanel::name_changed, this)); + _use_isdcf_name->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&DCPPanel::use_isdcf_name_toggled, this)); + _edit_isdcf_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&DCPPanel::edit_isdcf_button_clicked, this)); + _copy_isdcf_name_button->Bind(wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&DCPPanel::copy_isdcf_name_button_clicked, this)); + _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 (); for (vector::const_iterator i = ct.begin(); i != ct.end(); ++i) { @@ -117,6 +155,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 () { @@ -200,7 +248,7 @@ DCPPanel::audio_channels_changed () return; } - _film->set_audio_channels (_audio_channels->GetValue ()); + _film->set_audio_channels (dcp::raw_convert (string_client_data (_audio_channels->GetClientObject (_audio_channels->GetSelection ())))); } void @@ -240,9 +288,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; @@ -254,12 +299,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: @@ -269,11 +322,7 @@ DCPPanel::film_changed (int p) { checked_set (_use_isdcf_name, _film->use_isdcf_name ()); setup_dcp_name (); - bool const i = _film->use_isdcf_name (); - if (!i) { - _film->set_name (_film->isdcf_name (true)); - } - _edit_isdcf_button->Enable (i); + _edit_isdcf_button->Enable (_film->use_isdcf_name ()); break; } case Film::ISDCF_METADATA: @@ -300,7 +349,7 @@ DCPPanel::film_changed (int p) break; } case Film::AUDIO_CHANNELS: - checked_set (_audio_channels, _film->audio_channels ()); + checked_set (_audio_channels, dcp::raw_convert (_film->audio_channels ())); setup_dcp_name (); break; case Film::THREE_D: @@ -309,6 +358,16 @@ DCPPanel::film_changed (int p) break; case Film::INTEROP: checked_set (_standard, _film->interop() ? 1 : 0); + setup_dcp_name (); + break; + case Film::AUDIO_PROCESSOR: + if (_film->audio_processor ()) { + checked_set (_audio_processor, _film->audio_processor()->id()); + } else { + checked_set (_audio_processor, 0); + } + setup_audio_channels_choice (); + film_changed (Film::AUDIO_CHANNELS); break; default: break; @@ -318,7 +377,7 @@ DCPPanel::film_changed (int p) void DCPPanel::film_content_changed (int property) { - if (property == FFmpegContentProperty::AUDIO_STREAM || + if (property == AudioContentProperty::AUDIO_STREAMS || property == SubtitleContentProperty::USE_SUBTITLES || property == VideoContentProperty::VIDEO_SCALE) { setup_dcp_name (); @@ -339,8 +398,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 (); @@ -357,7 +419,7 @@ DCPPanel::container_changed () int const n = _container->GetSelection (); if (n >= 0) { vector ratios = Ratio::all (); - assert (n < int (ratios.size())); + DCPOMATIC_ASSERT (n < int (ratios.size())); _film->set_container (ratios[n]); } } @@ -387,10 +449,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); @@ -398,6 +460,7 @@ DCPPanel::set_film (shared_ptr film) film_changed (Film::SEQUENCE_VIDEO); film_changed (Film::THREE_D); film_changed (Film::INTEROP); + film_changed (Film::AUDIO_PROCESSOR); } void @@ -407,6 +470,7 @@ DCPPanel::set_general_sensitivity (bool s) _use_isdcf_name->Enable (s); _edit_isdcf_button->Enable (s); _dcp_content_type->Enable (s); + _copy_isdcf_name_button->Enable (s); bool si = s; if (_film && _film->encrypted ()) { @@ -416,32 +480,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 () { @@ -468,13 +520,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 @@ -530,12 +576,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); @@ -543,10 +595,10 @@ DCPPanel::make_video_panel () _frame_rate_sizer->Add (_frame_rate_spin, 1, wxALIGN_CENTER_VERTICAL); setup_frame_rate_widget (); _best_frame_rate = new wxButton (panel, wxID_ANY, _("Use best")); - _frame_rate_sizer->Add (_best_frame_rate, 1, wxALIGN_CENTER_VERTICAL | wxEXPAND); + _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)); @@ -571,26 +623,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 ())); @@ -610,6 +653,26 @@ DCPPanel::make_video_panel () return panel; } +void +DCPPanel::setup_audio_channels_choice () +{ + int min = 2; + if (_film && _film->audio_processor ()) { + min = _film->audio_processor()->out_channels (); + } + + if (min % 2 == 1) { + ++min; + } + + vector > items; + for (int i = min; 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 () { @@ -620,14 +683,64 @@ 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); + setup_audio_channels_choice (); 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; + + _show_audio = new wxButton (panel, wxID_ANY, _("Show audio...")); + grid->Add (_show_audio, wxGBPosition (r, 0), wxGBSpan (1, 2)); + ++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)); + _show_audio->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&DCPPanel::show_audio_clicked, this)); return panel; } + +void +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 ())); + _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 (); + d->set_playlist (_film->playlist ()); +}