/*
- Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
#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 "lib/ratio.h"
#include "lib/config.h"
#include "lib/dcp_content_type.h"
_name = new wxTextCtrl (_panel, wxID_ANY);
FocusManager::instance()->add(_name);
- _use_isdcf_name = new wxCheckBox (_panel, wxID_ANY, _("Use ISDCF name"));
- _edit_isdcf_button = new wxButton (_panel, wxID_ANY, _("Details..."));
- _copy_isdcf_name_button = new wxButton (_panel, wxID_ANY, _("Copy as name"));
+ _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
);
_dcp_content_type_label = create_label (_panel, _("Content Type"), true);
_dcp_content_type = new wxChoice (_panel, wxID_ANY);
- _signed = new wxCheckBox (_panel, wxID_ANY, _("Signed"));
- _encrypted = new wxCheckBox (_panel, wxID_ANY, _("Encrypted"));
+ _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 wxStaticText (_panel, wxID_ANY, "", wxDefaultPosition, size);
- _edit_key = new wxButton (_panel, wxID_ANY, _("Edit..."));
+ _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 wxCheckBox (_panel, wxID_ANY, _("Upload DCP to TMS after it is made"));
+ _upload_after_make_dcp = new CheckBox (_panel, _("Upload DCP to TMS after it is made"));
_notebook = new wxNotebook (_panel, wxID_ANY);
_sizer->Add (_notebook, 1, wxEXPAND | wxTOP, 6);
flags |= wxALIGN_RIGHT;
#endif
- _use_isdcf_name->Show (interface == Config::INTERFACE_FULL);
- _edit_isdcf_button->Show (interface == Config::INTERFACE_FULL);
- _copy_isdcf_name_button->Show (interface == Config::INTERFACE_FULL);
+ bool const full = interface == Config::INTERFACE_FULL;
- if (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);
_grid->Add (_dcp_content_type, wxGBPosition (r, 1));
++r;
- _signed->Show (interface == Config::INTERFACE_FULL);
- if (interface == Config::INTERFACE_FULL) {
+ _signed->Show (full);
+ if (full) {
_grid->Add (_signed, wxGBPosition (r, 0), wxGBSpan (1, 2));
++r;
}
_grid->Add (_encrypted, wxGBPosition (r, 0), wxGBSpan (1, 2));
++r;
- _key_label->Show (interface == Config::INTERFACE_FULL);
- _key->Show (interface == Config::INTERFACE_FULL);
- _edit_key->Show (interface == Config::INTERFACE_FULL);
- _reels_label->Show (interface == Config::INTERFACE_FULL);
- _reel_type->Show (interface == Config::INTERFACE_FULL);
- _reel_length_label->Show (interface == Config::INTERFACE_FULL);
- _reel_length->Show (interface == Config::INTERFACE_FULL);
- _reel_length_gb_label->Show (interface == Config::INTERFACE_FULL);
- _standard_label->Show (interface == Config::INTERFACE_FULL);
- _standard->Show (interface == Config::INTERFACE_FULL);
- _upload_after_make_dcp->Show (interface == Config::INTERFACE_FULL);
-
- if (interface == Config::INTERFACE_FULL) {
+
+ _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);
+ _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);
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 ();
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));
}
_film->set_three_d (_three_d->GetValue ());
}
+void
+DCPPanel::reencode_j2k_changed ()
+{
+ if (!_film) {
+ return;
+ }
+
+ _film->set_reencode_j2k (_reencode_j2k->GetValue());
+}
+
void
DCPPanel::config_changed (Config::Property p)
{
sizer->Add (_video_grid, 0, wxALL, 8);
panel->SetSizer (sizer);
- int r = 0;
-
_container_label = create_label (panel, _("Container"), true);
_container = new wxChoice (panel, wxID_ANY);
- _container_size = new wxStaticText (panel, wxID_ANY, wxT (""));
+ _container_size = new StaticText (panel, wxT (""));
_resolution_label = create_label (panel, _("Resolution"), true);
_resolution = new wxChoice (panel, wxID_ANY);
_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"));
+ _best_frame_rate = new Button (panel, _("Use best"));
_frame_rate_sizer->Add (_best_frame_rate, 1, wxALIGN_CENTER_VERTICAL);
- _three_d = new wxCheckBox (panel, wxID_ANY, _("3D"));
- ++r;
+ _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);
- _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));
+ _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));
+ _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()));
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));
}
}
_audio_processor->Append (std_to_wx (ap->name ()), new wxStringClientData (std_to_wx (ap->id ())));
}
- _show_audio = new wxButton (panel, wxID_ANY, _("Show audio..."));
+ _show_audio = new Button (panel, _("Show audio..."));
_audio_channels->Bind (wxEVT_CHOICE, boost::bind (&DCPPanel::audio_channels_changed, this));
_audio_processor->Bind (wxEVT_CHOICE, boost::bind (&DCPPanel::audio_processor_changed, this));
int r = 0;
- add_label_to_sizer (_audio_grid, _channels_label, true, wxGBPosition (r, 0));
- _audio_grid->Add (_audio_channels, wxGBPosition (r, 1));
- ++r;
+ _channels_label->Show (full);
+ _audio_channels->Show (full);
+
+ if (full) {
+ add_label_to_sizer (_audio_grid, _channels_label, true, wxGBPosition (r, 0));
+ _audio_grid->Add (_audio_channels, wxGBPosition (r, 1));
+ ++r;
+ }
_processor_label->Show (full);
_audio_processor->Show (full);
projects / dcpomatic.git / blobdiff