X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fdcp_panel.cc;h=c4a14a58b3a118bec1c36c4356aea4a1d1c84632;hp=3f4327cf8ffb837a8ddad07c6d1440bdc1d859d1;hb=386e25f3b9d3fa59cbdeed458d9b3e0d21e338b8;hpb=6648949ce34a6fc2b3abe2f1c28848fe6e59dcbd diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc index 3f4327cf8..c4a14a58b 100644 --- a/src/wx/dcp_panel.cc +++ b/src/wx/dcp_panel.cc @@ -1,19 +1,20 @@ /* - Copyright (C) 2012-2015 Carl Hetherington + Copyright (C) 2012-2019 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ @@ -22,6 +23,13 @@ #include "key_dialog.h" #include "isdcf_metadata_dialog.h" #include "audio_dialog.h" +#include "focus_manager.h" +#include "check_box.h" +#include "static_text.h" +#include "check_box.h" +#include "dcpomatic_button.h" +#include "markers_dialog.h" +#include "metadata_dialog.h" #include "lib/ratio.h" #include "lib/config.h" #include "lib/dcp_content_type.h" @@ -29,9 +37,12 @@ #include "lib/film.h" #include "lib/ffmpeg_content.h" #include "lib/audio_processor.h" +#include "lib/video_content.h" +#include "lib/text_content.h" #include "lib/dcp_content.h" +#include "lib/audio_content.h" +#include #include -#include #include #include #include @@ -49,59 +60,68 @@ using std::max; using std::make_pair; using boost::lexical_cast; using boost::shared_ptr; +using boost::weak_ptr; +using dcp::locale_convert; -DCPPanel::DCPPanel (wxNotebook* n, boost::shared_ptr film) +DCPPanel::DCPPanel (wxNotebook* n, shared_ptr film, weak_ptr viewer) : _audio_dialog (0) + , _markers_dialog (0) + , _metadata_dialog (0) , _film (film) + , _viewer (viewer) , _generally_sensitive (true) { _panel = new wxPanel (n); _sizer = new wxBoxSizer (wxVERTICAL); _panel->SetSizer (_sizer); - wxGridBagSizer* grid = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); - _sizer->Add (grid, 0, wxEXPAND | wxALL, 8); - - int r = 0; + _grid = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); + _sizer->Add (_grid, 0, wxEXPAND | wxALL, 8); - add_label_to_sizer (grid, _panel, _("Name"), true, wxGBPosition (r, 0)); + _name_label = create_label (_panel, _("Name"), true); _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 + FocusManager::instance()->add(_name); - _use_isdcf_name = new wxCheckBox (_panel, wxID_ANY, _("Use ISDCF name")); - grid->Add (_use_isdcf_name, wxGBPosition (r, 0), wxDefaultSpan, flags); - - { - 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; - } + _use_isdcf_name = new CheckBox (_panel, _("Use ISDCF name")); + _edit_isdcf_button = new Button (_panel, _("Details...")); + _copy_isdcf_name_button = new Button (_panel, _("Copy as name")); /* 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, + _dcp_name = new StaticText ( + _panel, 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_sizer (grid, _panel, _("Content Type"), true, wxGBPosition (r, 0)); + _dcp_content_type_label = create_label (_panel, _("Content Type"), true); _dcp_content_type = new wxChoice (_panel, wxID_ANY); - grid->Add (_dcp_content_type, wxGBPosition (r, 1)); - ++r; + + _signed = new CheckBox (_panel, _("Signed")); + _encrypted = new CheckBox (_panel, _("Encrypted")); + + wxClientDC dc (_panel); + wxSize size = dc.GetTextExtent (wxT ("GGGGGGGG...")); + size.SetHeight (-1); + + _key_label = create_label (_panel, _("Key"), true); + _key = new StaticText (_panel, "", wxDefaultPosition, size); + _edit_key = new Button (_panel, _("Edit...")); + + _reels_label = create_label (_panel, _("Reels"), true); + _reel_type = new wxChoice (_panel, wxID_ANY); + + _reel_length_label = create_label (_panel, _("Reel length"), true); + _reel_length = new wxSpinCtrl (_panel, wxID_ANY); + _reel_length_gb_label = create_label (_panel, _("GB"), false); + + _standard_label = create_label (_panel, _("Standard"), true); + _standard = new wxChoice (_panel, wxID_ANY); + + _upload_after_make_dcp = new CheckBox (_panel, _("Upload DCP to TMS after it is made")); + + _markers = new Button (_panel, _("Markers...")); + _metadata = new Button (_panel, _("Metadata...")); _notebook = new wxNotebook (_panel, wxID_ANY); _sizer->Add (_notebook, 1, wxEXPAND | wxTOP, 6); @@ -109,77 +129,142 @@ DCPPanel::DCPPanel (wxNotebook* n, boost::shared_ptr film) _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; + _name->Bind (wxEVT_TEXT, boost::bind (&DCPPanel::name_changed, this)); + _use_isdcf_name->Bind (wxEVT_CHECKBOX, boost::bind (&DCPPanel::use_isdcf_name_toggled, this)); + _edit_isdcf_button->Bind (wxEVT_BUTTON, boost::bind (&DCPPanel::edit_isdcf_button_clicked, this)); + _copy_isdcf_name_button->Bind(wxEVT_BUTTON, boost::bind (&DCPPanel::copy_isdcf_name_button_clicked, this)); + _dcp_content_type->Bind (wxEVT_CHOICE, boost::bind (&DCPPanel::dcp_content_type_changed, this)); + _signed->Bind (wxEVT_CHECKBOX, boost::bind (&DCPPanel::signed_toggled, this)); + _encrypted->Bind (wxEVT_CHECKBOX, boost::bind (&DCPPanel::encrypted_toggled, this)); + _edit_key->Bind (wxEVT_BUTTON, boost::bind (&DCPPanel::edit_key_clicked, this)); + _reel_type->Bind (wxEVT_CHOICE, boost::bind (&DCPPanel::reel_type_changed, this)); + _reel_length->Bind (wxEVT_SPINCTRL, boost::bind (&DCPPanel::reel_length_changed, this)); + _standard->Bind (wxEVT_CHOICE, boost::bind (&DCPPanel::standard_changed, this)); + _upload_after_make_dcp->Bind (wxEVT_CHECKBOX, boost::bind (&DCPPanel::upload_after_make_dcp_changed, this)); + _markers->Bind (wxEVT_BUTTON, boost::bind (&DCPPanel::markers_clicked, this)); + _metadata->Bind (wxEVT_BUTTON, boost::bind (&DCPPanel::metadata_clicked, this)); + + BOOST_FOREACH (DCPContentType const * i, DCPContentType::all()) { + _dcp_content_type->Append (std_to_wx (i->pretty_name ())); + } + + _reel_type->Append (_("Single reel")); + _reel_type->Append (_("Split by video content")); + /// TRANSLATORS: translate the word "Custom" here; do not include the "Reel|" prefix + _reel_type->Append (S_("Reel|Custom")); + + _reel_length->SetRange (1, 64); + + _standard->Append (_("SMPTE")); + _standard->Append (_("Interop")); - _encrypted = new wxCheckBox (_panel, wxID_ANY, _("Encrypted")); - grid->Add (_encrypted, wxGBPosition (r, 0), wxGBSpan (1, 2)); + Config::instance()->Changed.connect (boost::bind (&DCPPanel::config_changed, this, _1)); + + add_to_grid (); +} + +void +DCPPanel::add_to_grid () +{ + Config::Interface interface = Config::instance()->interface_complexity (); + + int r = 0; + + add_label_to_sizer (_grid, _name_label, true, wxGBPosition (r, 0)); + _grid->Add (_name, wxGBPosition(r, 1), wxDefaultSpan, wxEXPAND | wxLEFT | wxRIGHT); ++r; - wxClientDC dc (_panel); - wxSize size = dc.GetTextExtent (wxT ("GGGGGGGG...")); - size.SetHeight (-1); + int flags = wxALIGN_CENTER_VERTICAL; +#ifdef __WXOSX__ + flags |= wxALIGN_RIGHT; +#endif - { - add_label_to_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; + bool const full = interface == Config::INTERFACE_FULL; + + _use_isdcf_name->Show (full); + _edit_isdcf_button->Show (full); + _copy_isdcf_name_button->Show (full); + + if (full) { + _grid->Add (_use_isdcf_name, wxGBPosition (r, 0), wxDefaultSpan, flags); + { + wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); + s->Add (_edit_isdcf_button, 1, wxEXPAND | wxRIGHT, DCPOMATIC_SIZER_X_GAP); + s->Add (_copy_isdcf_name_button, 1, wxEXPAND | wxLEFT, DCPOMATIC_SIZER_X_GAP); + _grid->Add (s, wxGBPosition (r, 1), wxDefaultSpan, wxEXPAND); + } + ++r; } - add_label_to_sizer (grid, _panel, _("Reels"), true, wxGBPosition (r, 0)); - _reel_type = new wxChoice (_panel, wxID_ANY); - grid->Add (_reel_type, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); + _grid->Add (_dcp_name, wxGBPosition(r, 0), wxGBSpan (1, 2), wxALIGN_CENTER_VERTICAL | wxEXPAND); ++r; - add_label_to_sizer (grid, _panel, _("Reel length"), true, wxGBPosition (r, 0)); + add_label_to_sizer (_grid, _dcp_content_type_label, true, wxGBPosition (r, 0)); + _grid->Add (_dcp_content_type, wxGBPosition (r, 1)); + ++r; - { - wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); - _reel_length = new wxSpinCtrl (_panel, wxID_ANY); - s->Add (_reel_length); - add_label_to_sizer (s, _panel, _("GB"), false); - grid->Add (s, wxGBPosition (r, 1)); + _signed->Show (full); + if (full) { + _grid->Add (_signed, wxGBPosition (r, 0), wxGBSpan (1, 2)); ++r; } - add_label_to_sizer (grid, _panel, _("Standard"), true, wxGBPosition (r, 0)); - _standard = new wxChoice (_panel, wxID_ANY); - grid->Add (_standard, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); + _grid->Add (_encrypted, wxGBPosition (r, 0), wxGBSpan (1, 2)); ++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)); - _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)); - _reel_type->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DCPPanel::reel_type_changed, this)); - _reel_length->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&DCPPanel::reel_length_changed, 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) { - _dcp_content_type->Append (std_to_wx ((*i)->pretty_name ())); - } + _key_label->Show (full); + _key->Show (full); + _edit_key->Show (full); + _reels_label->Show (full); + _reel_type->Show (full); + _reel_length_label->Show (full); + _reel_length->Show (full); + _reel_length_gb_label->Show (full); + _standard_label->Show (full); + _standard->Show (full); + _upload_after_make_dcp->Show (full); + _markers->Show (full); + _metadata->Show (full); + _reencode_j2k->Show (full); + _encrypted->Show (full); + + if (full) { + add_label_to_sizer (_grid, _key_label, true, wxGBPosition (r, 0)); + { + wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); + s->Add (_key, 1, wxALIGN_CENTER_VERTICAL); + s->Add (_edit_key); + _grid->Add (s, wxGBPosition (r, 1)); + } + ++r; - _reel_type->Append (_("Single reel")); - _reel_type->Append (_("Split by video content")); - _reel_type->Append (_("Custom")); + add_label_to_sizer (_grid, _reels_label, true, wxGBPosition (r, 0)); + _grid->Add (_reel_type, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); + ++r; - _reel_length->SetRange (1, 64); + add_label_to_sizer (_grid, _reel_length_label, true, wxGBPosition (r, 0)); + { + wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); + s->Add (_reel_length); + add_label_to_sizer (s, _reel_length_gb_label, false); + _grid->Add (s, wxGBPosition (r, 1)); + } + ++r; - _standard->Append (_("SMPTE")); - _standard->Append (_("Interop")); + add_label_to_sizer (_grid, _standard_label, true, wxGBPosition (r, 0)); + _grid->Add (_standard, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); + ++r; - Config::instance()->Changed.connect (boost::bind (&DCPPanel::config_changed, this)); + _grid->Add (_upload_after_make_dcp, wxGBPosition (r, 0), wxGBSpan (1, 2)); + ++r; + + wxBoxSizer* extra = new wxBoxSizer (wxHORIZONTAL); + extra->Add (_markers, 1, wxRIGHT, DCPOMATIC_SIZER_X_GAP); + extra->Add (_metadata, 1, wxRIGHT, DCPOMATIC_SIZER_X_GAP); + _grid->Add (extra, wxGBPosition(r, 0), wxGBSpan(1, 2)); + ++r; + } } void @@ -241,9 +326,10 @@ DCPPanel::frame_rate_choice_changed () } _film->set_video_frame_rate ( - boost::lexical_cast ( - wx_to_std (_frame_rate_choice->GetString (_frame_rate_choice->GetSelection ())) - ) + boost::lexical_cast( + wx_to_std(_frame_rate_choice->GetString(_frame_rate_choice->GetSelection())) + ), + true ); } @@ -265,7 +351,7 @@ DCPPanel::audio_channels_changed () return; } - _film->set_audio_channels (dcp::raw_convert (string_client_data (_audio_channels->GetClientObject (_audio_channels->GetSelection ())))); + _film->set_audio_channels (locale_convert (string_client_data (_audio_channels->GetClientObject (_audio_channels->GetSelection ())))); } void @@ -288,6 +374,40 @@ DCPPanel::standard_changed () _film->set_interop (_standard->GetSelection() == 1); } +void +DCPPanel::upload_after_make_dcp_changed () +{ + if (!_film) { + return; + } + + _film->set_upload_after_make_dcp (_upload_after_make_dcp->GetValue ()); +} + +void +DCPPanel::markers_clicked () +{ + if (_markers_dialog) { + _markers_dialog->Destroy (); + _markers_dialog = 0; + } + + _markers_dialog = new MarkersDialog (_panel, _film, _viewer); + _markers_dialog->Show(); +} + +void +DCPPanel::metadata_clicked () +{ + if (_metadata_dialog) { + _metadata_dialog->Destroy (); + _metadata_dialog = 0; + } + + _metadata_dialog = new MetadataDialog (_panel, _film); + _metadata_dialog->Show (); +} + void DCPPanel::film_changed (int p) { @@ -335,6 +455,16 @@ DCPPanel::film_changed (int p) case Film::USE_ISDCF_NAME: { checked_set (_use_isdcf_name, _film->use_isdcf_name ()); + if (_film->use_isdcf_name()) { + /* We are going back to using an ISDCF name. Remove anything after a _ in the current name, + in case the user has clicked 'Copy as name' then re-ticked 'Use ISDCF name' (#1513). + */ + string const name = _film->name (); + string::size_type const u = name.find("_"); + if (u != string::npos) { + _film->set_name (name.substr(0, u)); + } + } setup_dcp_name (); _edit_isdcf_button->Enable (_film->use_isdcf_name ()); break; @@ -360,13 +490,14 @@ DCPPanel::film_changed (int p) checked_set (_frame_rate_spin, _film->video_frame_rate ()); _best_frame_rate->Enable (_film->best_video_frame_rate () != _film->video_frame_rate ()); + setup_dcp_name (); break; } case Film::AUDIO_CHANNELS: 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 ()))); + checked_set (_audio_channels, locale_convert (max (minimum_allowed_audio_channels(), _film->audio_channels ()))); setup_dcp_name (); } break; @@ -374,9 +505,13 @@ DCPPanel::film_changed (int p) checked_set (_three_d, _film->three_d ()); setup_dcp_name (); break; + case Film::REENCODE_J2K: + checked_set (_reencode_j2k, _film->reencode_j2k()); + break; case Film::INTEROP: checked_set (_standard, _film->interop() ? 1 : 0); setup_dcp_name (); + _markers->Enable (!_film->interop()); break; case Film::AUDIO_PROCESSOR: if (_film->audio_processor ()) { @@ -384,7 +519,7 @@ DCPPanel::film_changed (int p) } else { checked_set (_audio_processor, 0); } - setup_audio_channels_choice (); + setup_audio_channels_choice (_audio_channels, minimum_allowed_audio_channels ()); film_changed (Film::AUDIO_CHANNELS); break; case Film::REEL_TYPE: @@ -394,6 +529,12 @@ DCPPanel::film_changed (int p) case Film::REEL_LENGTH: checked_set (_reel_length, _film->reel_length() / 1000000000LL); break; + case Film::UPLOAD_AFTER_MAKE_DCP: + checked_set (_upload_after_make_dcp, _film->upload_after_make_dcp ()); + break; + case Film::CONTENT: + setup_dcp_name (); + break; default: break; } @@ -402,14 +543,15 @@ DCPPanel::film_changed (int p) void DCPPanel::film_content_changed (int property) { - if (property == AudioContentProperty::AUDIO_STREAMS || - property == SubtitleContentProperty::USE_SUBTITLES || - property == SubtitleContentProperty::BURN_SUBTITLES || - property == VideoContentProperty::VIDEO_SCALE || + if (property == AudioContentProperty::STREAMS || + property == TextContentProperty::USE || + property == TextContentProperty::BURN || + property == VideoContentProperty::SCALE || property == DCPContentProperty::REFERENCE_VIDEO || property == DCPContentProperty::REFERENCE_AUDIO || - property == DCPContentProperty::REFERENCE_SUBTITLE) { + property == DCPContentProperty::REFERENCE_TEXT) { setup_dcp_name (); + setup_sensitivity (); } } @@ -418,7 +560,7 @@ void DCPPanel::setup_container () { int n = 0; - vector ratios = Ratio::all (); + vector ratios = Ratio::containers (); vector::iterator i = ratios.begin (); while (i != ratios.end() && *i != _film->container ()) { ++i; @@ -447,7 +589,7 @@ DCPPanel::container_changed () int const n = _container->GetSelection (); if (n >= 0) { - vector ratios = Ratio::all (); + vector ratios = Ratio::containers (); DCPOMATIC_ASSERT (n < int (ratios.size())); _film->set_container (ratios[n]); } @@ -470,8 +612,29 @@ DCPPanel::dcp_content_type_changed () void DCPPanel::set_film (shared_ptr film) { + /* We are changing film, so destroy any dialogs for the old one */ + if (_audio_dialog) { + _audio_dialog->Destroy (); + _audio_dialog = 0; + } + if (_markers_dialog) { + _markers_dialog->Destroy (); + _markers_dialog = 0; + } + if (_metadata_dialog) { + _metadata_dialog->Destroy (); + _metadata_dialog = 0; + } + _film = film; + if (!_film) { + /* Really should all the film_changed below but this might be enough */ + checked_set (_dcp_name, wxT("")); + set_general_sensitivity (false); + return; + } + film_changed (Film::NAME); film_changed (Film::USE_ISDCF_NAME); film_changed (Film::CONTENT); @@ -485,44 +648,60 @@ DCPPanel::set_film (shared_ptr film) film_changed (Film::ISDCF_METADATA); film_changed (Film::VIDEO_FRAME_RATE); film_changed (Film::AUDIO_CHANNELS); - film_changed (Film::SEQUENCE_VIDEO); + film_changed (Film::SEQUENCE); film_changed (Film::THREE_D); film_changed (Film::INTEROP); film_changed (Film::AUDIO_PROCESSOR); film_changed (Film::REEL_TYPE); film_changed (Film::REEL_LENGTH); + film_changed (Film::UPLOAD_AFTER_MAKE_DCP); + film_changed (Film::REENCODE_J2K); + + set_general_sensitivity(static_cast(_film)); } void DCPPanel::set_general_sensitivity (bool s) { - _name->Enable (s); - _use_isdcf_name->Enable (s); - _edit_isdcf_button->Enable (s); - _dcp_content_type->Enable (s); - _copy_isdcf_name_button->Enable (s); + _generally_sensitive = s; + setup_sensitivity (); +} + +void +DCPPanel::setup_sensitivity () +{ + _name->Enable (_generally_sensitive); + _use_isdcf_name->Enable (_generally_sensitive); + _edit_isdcf_button->Enable (_generally_sensitive); + _dcp_content_type->Enable (_generally_sensitive); + _copy_isdcf_name_button->Enable (_generally_sensitive); - bool si = s; + bool si = _generally_sensitive; if (_film && _film->encrypted ()) { si = false; } _signed->Enable (si); - _encrypted->Enable (s); - _key->Enable (s && _film && _film->encrypted ()); - _edit_key->Enable (s && _film && _film->encrypted ()); - _reel_type->Enable (s); - _reel_length->Enable (s && _film && _film->reel_type() == REELTYPE_BY_LENGTH); - _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); - _three_d->Enable (s); - _standard->Enable (s); + _encrypted->Enable (_generally_sensitive); + _key->Enable (_generally_sensitive && _film && _film->encrypted ()); + _edit_key->Enable (_generally_sensitive && _film && _film->encrypted ()); + _reel_type->Enable (_generally_sensitive && _film && !_film->references_dcp_video() && !_film->references_dcp_audio()); + _reel_length->Enable (_generally_sensitive && _film && _film->reel_type() == REELTYPE_BY_LENGTH); + _upload_after_make_dcp->Enable (_generally_sensitive); + _markers->Enable (_generally_sensitive && _film && !_film->interop()); + _metadata->Enable (_generally_sensitive); + _frame_rate_choice->Enable (_generally_sensitive && _film && !_film->references_dcp_video()); + _frame_rate_spin->Enable (_generally_sensitive && _film && !_film->references_dcp_video()); + _audio_channels->Enable (_generally_sensitive && _film && !_film->references_dcp_audio()); + _audio_processor->Enable (_generally_sensitive && _film && !_film->references_dcp_audio()); + _j2k_bandwidth->Enable (_generally_sensitive && _film && !_film->references_dcp_video()); + _container->Enable (_generally_sensitive && _film && !_film->references_dcp_video()); + _best_frame_rate->Enable (_generally_sensitive && _film && _film->best_video_frame_rate () != _film->video_frame_rate ()); + _resolution->Enable (_generally_sensitive && _film && !_film->references_dcp_video()); + _three_d->Enable (_generally_sensitive && _film && !_film->references_dcp_video()); + _standard->Enable (_generally_sensitive && _film && !_film->references_dcp_video() && !_film->references_dcp_audio()); + _reencode_j2k->Enable (_generally_sensitive && _film); + _show_audio->Enable (_generally_sensitive && _film); } void @@ -552,6 +731,7 @@ void DCPPanel::setup_dcp_name () { _dcp_name->SetLabel (std_to_wx (_film->dcp_name (true))); + _dcp_name->SetToolTip (std_to_wx (_film->dcp_name (true))); } void @@ -575,10 +755,41 @@ DCPPanel::three_d_changed () } void -DCPPanel::config_changed () +DCPPanel::reencode_j2k_changed () +{ + if (!_film) { + return; + } + + _film->set_reencode_j2k (_reencode_j2k->GetValue()); +} + +void +DCPPanel::config_changed (Config::Property p) { _j2k_bandwidth->SetRange (1, Config::instance()->maximum_j2k_bandwidth() / 1000000); setup_frame_rate_widget (); + + if (p == Config::INTERFACE_COMPLEXITY) { + _grid->Clear (); + add_to_grid (); + _sizer->Layout (); + _grid->Layout (); + + _video_grid->Clear (); + add_video_panel_to_grid (); + _video_grid->Layout (); + + _audio_grid->Clear (); + add_audio_panel_to_grid (); + _audio_grid->Layout (); + } else if (p == Config::SHOW_EXPERIMENTAL_AUDIO_PROCESSORS) { + _audio_processor->Clear (); + add_audio_processors (); + if (_film) { + film_changed (Film::AUDIO_PROCESSOR); + } + } } void @@ -600,83 +811,111 @@ DCPPanel::make_video_panel () { wxPanel* panel = new wxPanel (_notebook); wxSizer* sizer = new wxBoxSizer (wxVERTICAL); - wxGridBagSizer* grid = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); - sizer->Add (grid, 0, wxALL, 8); + _video_grid = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); + sizer->Add (_video_grid, 0, wxALL, 8); panel->SetSizer (sizer); + _container_label = create_label (panel, _("Container"), true); + _container = new wxChoice (panel, wxID_ANY); + _container_size = new StaticText (panel, wxT ("")); + + _resolution_label = create_label (panel, _("Resolution"), true); + _resolution = new wxChoice (panel, wxID_ANY); + + _frame_rate_label = create_label (panel, _("Frame Rate"), true); + _frame_rate_choice = new wxChoice (panel, wxID_ANY); + _frame_rate_sizer = new wxBoxSizer (wxHORIZONTAL); + _frame_rate_sizer->Add (_frame_rate_choice, 1, wxALIGN_CENTER_VERTICAL); + _frame_rate_spin = new wxSpinCtrl (panel, wxID_ANY); + _frame_rate_sizer->Add (_frame_rate_spin, 1, wxALIGN_CENTER_VERTICAL); + setup_frame_rate_widget (); + _best_frame_rate = new Button (panel, _("Use best")); + _frame_rate_sizer->Add (_best_frame_rate, 1, wxALIGN_CENTER_VERTICAL); + + _three_d = new CheckBox (panel, _("3D")); + + _j2k_bandwidth_label = create_label (panel, _("JPEG2000 bandwidth\nfor newly-encoded data"), true); + _j2k_bandwidth = new wxSpinCtrl (panel, wxID_ANY); + _mbits_label = create_label (panel, _("Mbit/s"), false); + + _reencode_j2k = new CheckBox (panel, _("Re-encode JPEG2000 data from input")); + + _container->Bind (wxEVT_CHOICE, boost::bind(&DCPPanel::container_changed, this)); + _frame_rate_choice->Bind (wxEVT_CHOICE, boost::bind(&DCPPanel::frame_rate_choice_changed, this)); + _frame_rate_spin->Bind (wxEVT_SPINCTRL, boost::bind(&DCPPanel::frame_rate_spin_changed, this)); + _best_frame_rate->Bind (wxEVT_BUTTON, boost::bind(&DCPPanel::best_frame_rate_clicked, this)); + _j2k_bandwidth->Bind (wxEVT_SPINCTRL, boost::bind(&DCPPanel::j2k_bandwidth_changed, this)); + /* Also listen to wxEVT_TEXT so that typing numbers directly in is always noticed */ + _j2k_bandwidth->Bind (wxEVT_TEXT, boost::bind(&DCPPanel::j2k_bandwidth_changed, this)); + _resolution->Bind (wxEVT_CHOICE, boost::bind(&DCPPanel::resolution_changed, this)); + _three_d->Bind (wxEVT_CHECKBOX, boost::bind(&DCPPanel::three_d_changed, this)); + _reencode_j2k->Bind (wxEVT_CHECKBOX, boost::bind(&DCPPanel::reencode_j2k_changed, this)); + + BOOST_FOREACH (Ratio const * i, Ratio::containers()) { + _container->Append (std_to_wx(i->container_nickname())); + } + + BOOST_FOREACH (int i, Config::instance()->allowed_dcp_frame_rates()) { + _frame_rate_choice->Append (std_to_wx (boost::lexical_cast (i))); + } + + _j2k_bandwidth->SetRange (1, Config::instance()->maximum_j2k_bandwidth() / 1000000); + _frame_rate_spin->SetRange (1, 480); + + _resolution->Append (_("2K")); + _resolution->Append (_("4K")); + + add_video_panel_to_grid (); + + return panel; +} + +void +DCPPanel::add_video_panel_to_grid () +{ + bool const full = Config::instance()->interface_complexity() == Config::INTERFACE_FULL; + int r = 0; - add_label_to_sizer (grid, panel, _("Container"), true, wxGBPosition (r, 0)); + add_label_to_sizer (_video_grid, _container_label, true, wxGBPosition (r, 0)); { 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); + _video_grid->Add (s, wxGBPosition(r, 1)); ++r; } - add_label_to_sizer (grid, panel, _("Frame Rate"), true, wxGBPosition (r, 0)); + add_label_to_sizer (_video_grid, _resolution_label, true, wxGBPosition (r, 0)); + _video_grid->Add (_resolution, wxGBPosition (r, 1)); + ++r; + + add_label_to_sizer (_video_grid, _frame_rate_label, 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); - _frame_rate_spin = new wxSpinCtrl (panel, wxID_ANY); _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); - grid->Add (_frame_rate_sizer, wxGBPosition (r, 1)); + _video_grid->Add (_frame_rate_sizer, wxGBPosition (r, 1)); ++r; } - _three_d = new wxCheckBox (panel, wxID_ANY, _("3D")); - grid->Add (_three_d, wxGBPosition (r, 0), wxGBSpan (1, 2)); + _video_grid->Add (_three_d, wxGBPosition (r, 0), wxGBSpan (1, 2)); ++r; - add_label_to_sizer (grid, panel, _("Resolution"), true, wxGBPosition (r, 0)); - _resolution = new wxChoice (panel, wxID_ANY); - grid->Add (_resolution, wxGBPosition (r, 1)); - ++r; + _j2k_bandwidth_label->Show (full); + _j2k_bandwidth->Show (full); + _mbits_label->Show (full); - { - add_label_to_sizer (grid, panel, _("JPEG2000 bandwidth"), true, wxGBPosition (r, 0)); + if (full) { + add_label_to_sizer (_video_grid, _j2k_bandwidth_label, true, wxGBPosition (r, 0)); wxSizer* s = new wxBoxSizer (wxHORIZONTAL); - _j2k_bandwidth = new wxSpinCtrl (panel, wxID_ANY); s->Add (_j2k_bandwidth, 1); - add_label_to_sizer (s, panel, _("Mbit/s"), false); - grid->Add (s, wxGBPosition (r, 1)); - } - ++r; - - _container->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DCPPanel::container_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)); - _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 ratio = Ratio::all (); - for (vector::const_iterator i = ratio.begin(); i != ratio.end(); ++i) { - _container->Append (std_to_wx ((*i)->nickname ())); - } - - list const dfr = Config::instance()->allowed_dcp_frame_rates (); - for (list::const_iterator i = dfr.begin(); i != dfr.end(); ++i) { - _frame_rate_choice->Append (std_to_wx (boost::lexical_cast (*i))); + add_label_to_sizer (s, _mbits_label, false); + _video_grid->Add (s, wxGBPosition (r, 1)); + ++r; + _video_grid->Add (_reencode_j2k, wxGBPosition(r, 0), wxGBSpan(1, 2)); } - - _j2k_bandwidth->SetRange (1, Config::instance()->maximum_j2k_bandwidth() / 1000000); - _frame_rate_spin->SetRange (1, 480); - - _resolution->Append (_("2K")); - _resolution->Append (_("4K")); - - return panel; } int @@ -694,58 +933,67 @@ DCPPanel::minimum_allowed_audio_channels () const return min; } -void -DCPPanel::setup_audio_channels_choice () +wxPanel * +DCPPanel::make_audio_panel () { - vector > items; - for (int i = minimum_allowed_audio_channels(); i <= 16; i += 2) { - items.push_back (make_pair (dcp::raw_convert (i), dcp::raw_convert (i))); - } + wxPanel* panel = new wxPanel (_notebook); + _audio_panel_sizer = new wxBoxSizer (wxVERTICAL); + _audio_grid = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); + _audio_panel_sizer->Add (_audio_grid, 0, wxALL, 8); + panel->SetSizer (_audio_panel_sizer); + + _channels_label = create_label (panel, _("Channels"), true); + _audio_channels = new wxChoice (panel, wxID_ANY); + setup_audio_channels_choice (_audio_channels, minimum_allowed_audio_channels ()); + + _processor_label = create_label (panel, _("Processor"), true); + _audio_processor = new wxChoice (panel, wxID_ANY); + add_audio_processors (); + + _show_audio = new Button (panel, _("Show audio...")); - checked_set (_audio_channels, items); + _audio_channels->Bind (wxEVT_CHOICE, boost::bind (&DCPPanel::audio_channels_changed, this)); + _audio_processor->Bind (wxEVT_CHOICE, boost::bind (&DCPPanel::audio_processor_changed, this)); + _show_audio->Bind (wxEVT_BUTTON, boost::bind (&DCPPanel::show_audio_clicked, this)); + + add_audio_panel_to_grid (); + + return panel; } -wxPanel * -DCPPanel::make_audio_panel () +void +DCPPanel::add_audio_panel_to_grid () { - wxPanel* panel = new wxPanel (_notebook); - wxSizer* sizer = new wxBoxSizer (wxVERTICAL); - wxGridBagSizer* grid = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); - sizer->Add (grid, 0, wxALL, 8); - panel->SetSizer (sizer); + bool const full = Config::instance()->interface_complexity() == Config::INTERFACE_FULL; int r = 0; - add_label_to_sizer (grid, panel, _("Channels"), true, wxGBPosition (r, 0)); - _audio_channels = new wxChoice (panel, wxID_ANY); - setup_audio_channels_choice (); - grid->Add (_audio_channels, wxGBPosition (r, 1)); - ++r; + _channels_label->Show (full); + _audio_channels->Show (full); - add_label_to_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 ()))); + if (full) { + add_label_to_sizer (_audio_grid, _channels_label, true, wxGBPosition (r, 0)); + _audio_grid->Add (_audio_channels, wxGBPosition (r, 1)); + ++r; } - 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; + _processor_label->Show (full); + _audio_processor->Show (full); - _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)); + if (full) { + add_label_to_sizer (_audio_grid, _processor_label, true, wxGBPosition (r, 0)); + _audio_grid->Add (_audio_processor, wxGBPosition (r, 1)); + ++r; + } - return panel; + _audio_grid->Add (_show_audio, wxGBPosition (r, 0), wxGBSpan (1, 2)); + ++r; } void DCPPanel::copy_isdcf_name_button_clicked () { - _film->set_name (_film->isdcf_name (false)); + _film->set_name (_film->isdcf_name (true)); _film->set_use_isdcf_name (false); } @@ -795,3 +1043,13 @@ DCPPanel::reel_length_changed () _film->set_reel_length (_reel_length->GetValue() * 1000000000LL); } + +void +DCPPanel::add_audio_processors () +{ + _audio_processor->Append (_("None"), new wxStringClientData (N_("none"))); + BOOST_FOREACH (AudioProcessor const * ap, AudioProcessor::visible()) { + _audio_processor->Append (std_to_wx(ap->name()), new wxStringClientData(std_to_wx(ap->id()))); + } + _audio_panel_sizer->Layout(); +}