/*
- Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
#include "dcp_panel.h"
#include "wx_util.h"
-#include "key_dialog.h"
#include "isdcf_metadata_dialog.h"
#include "audio_dialog.h"
#include "focus_manager.h"
#include "lib/dcp_content.h"
#include "lib/audio_content.h"
#include <dcp/locale_convert.h>
-#include <dcp/key.h>
#include <wx/wx.h>
#include <wx/notebook.h>
#include <wx/gbsizer.h>
using boost::lexical_cast;
using boost::shared_ptr;
using boost::weak_ptr;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
using dcp::locale_convert;
DCPPanel::DCPPanel (wxNotebook* n, shared_ptr<Film> film, weak_ptr<FilmViewer> viewer)
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);
_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..."));
_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));
_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));
++r;
- _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_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;
-
add_label_to_sizer (_grid, _reels_label, true, wxGBPosition (r, 0));
_grid->Add (_reel_type, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
++r;
_grid->Add (_standard, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
++r;
- _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);
}
}
-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 ()
{
_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 ()
{
break;
case Film::ENCRYPTED:
checked_set (_encrypted, _film->encrypted ());
- if (_film->encrypted ()) {
- _key->Enable (_generally_sensitive);
- _edit_key->Enable (_generally_sensitive);
- } else {
- _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);
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 ();
+ setup_sensitivity ();
break;
default:
break;
film_changed (Film::CONTAINER);
film_changed (Film::RESOLUTION);
film_changed (Film::ENCRYPTED);
- film_changed (Film::KEY);
film_changed (Film::J2K_BANDWIDTH);
film_changed (Film::ISDCF_METADATA);
film_changed (Film::VIDEO_FRAME_RATE);
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<bool>(_film));
_edit_isdcf_button->Enable (_generally_sensitive);
_dcp_content_type->Enable (_generally_sensitive);
_copy_isdcf_name_button->Enable (_generally_sensitive);
-
- bool si = _generally_sensitive;
- if (_film && _film->encrypted ()) {
- si = false;
- }
-
_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());
+ _frame_rate_choice->Enable (_generally_sensitive && _film && !_film->references_dcp_video() && !_film->contains_atmos_content());
+ _frame_rate_spin->Enable (_generally_sensitive && _film && !_film->references_dcp_video() && !_film->contains_atmos_content());
+ _audio_channels->Enable (_generally_sensitive && _film && !_film->references_dcp_audio() && !_film->contains_atmos_content());
_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 ());
+ _best_frame_rate->Enable (
+ _generally_sensitive &&
+ _film &&
+ _film->best_video_frame_rate () != _film->video_frame_rate() &&
+ !_film->references_dcp_video() &&
+ !_film->contains_atmos_content()
+ );
_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());
+
+ _standard->Enable (
+ _generally_sensitive &&
+ _film &&
+ !_film->references_dcp_video() &&
+ !_film->references_dcp_audio() &&
+ !_film->contains_atmos_content()
+ );
+
_reencode_j2k->Enable (_generally_sensitive && _film);
_show_audio->Enable (_generally_sensitive && _film);
}
_frame_rate_choice->Show ();
_frame_rate_spin->Hide ();
}
-
- _frame_rate_sizer->Layout ();
}
wxPanel *
_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"));
_frame_rate_sizer = new wxBoxSizer (wxHORIZONTAL);
_frame_rate_sizer->Add (_frame_rate_choice, 1, wxALIGN_CENTER_VERTICAL);
_frame_rate_sizer->Add (_frame_rate_spin, 1, wxALIGN_CENTER_VERTICAL);
- _frame_rate_sizer->Add (_best_frame_rate, 1, wxALIGN_CENTER_VERTICAL);
+ _frame_rate_sizer->Add (_best_frame_rate, 1, wxLEFT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP);
_video_grid->Add (_frame_rate_sizer, wxGBPosition (r, 1));
++r;
}
projects / dcpomatic.git / blobdiff