#include "check_box.h"
#include "check_box.h"
#include "dcp_panel.h"
+#include "dcp_timeline_dialog.h"
#include "dcpomatic_button.h"
+#include "dcpomatic_choice.h"
#include "dcpomatic_spin_ctrl.h"
#include "focus_manager.h"
#include "interop_metadata_dialog.h"
#include "smpte_metadata_dialog.h"
#include "static_text.h"
#include "wx_util.h"
-#include "lib/ratio.h"
+#include "lib/audio_content.h"
+#include "lib/audio_processor.h"
#include "lib/config.h"
+#include "lib/dcp_content.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 "lib/video_content.h"
+#include "lib/film.h"
+#include "lib/ratio.h"
#include "lib/text_content.h"
-#include "lib/dcp_content.h"
-#include "lib/audio_content.h"
+#include "lib/util.h"
+#include "lib/video_content.h"
#include <dcp/locale_convert.h>
-#include <wx/wx.h>
-#include <wx/notebook.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <wx/gbsizer.h>
+#include <wx/notebook.h>
#include <wx/spinctrl.h>
+#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
#include <boost/lexical_cast.hpp>
-#include <iostream>
-using std::cout;
using std::list;
-using std::string;
-using std::vector;
-using std::pair;
-using std::max;
using std::make_pair;
-using boost::lexical_cast;
+using std::max;
+using std::pair;
using std::shared_ptr;
+using std::string;
+using std::vector;
using std::weak_ptr;
+using boost::lexical_cast;
#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)
+DCPPanel::DCPPanel(wxNotebook* n, shared_ptr<Film> film, FilmViewer& viewer)
: _film (film)
, _viewer (viewer)
, _generally_sensitive (true)
wxALIGN_CENTRE_HORIZONTAL | wxST_NO_AUTORESIZE | wxST_ELLIPSIZE_MIDDLE
);
- _enable_audio_language = new wxCheckBox (_panel, wxID_ANY, _("Audio language"));
- _audio_language = new wxStaticText (_panel, wxID_ANY, wxT(""));
- _edit_audio_language = new Button (_panel, _("Edit..."));
-
_dcp_content_type_label = create_label (_panel, _("Content Type"), true);
- _dcp_content_type = new wxChoice (_panel, wxID_ANY);
+ _dcp_content_type = new Choice(_panel);
_encrypted = new CheckBox (_panel, _("Encrypted"));
auto size = dc.GetTextExtent (wxT ("GGGGGGGG..."));
size.SetHeight (-1);
- _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 SpinCtrl (_panel, DCPOMATIC_SPIN_CTRL_WIDTH);
- _reel_length_gb_label = create_label (_panel, _("GB"), false);
-
_standard_label = create_label (_panel, _("Standard"), true);
- _standard = new wxChoice (_panel, wxID_ANY);
+ _standard = new Choice(_panel);
_markers = new Button (_panel, _("Markers..."));
_metadata = new Button (_panel, _("Metadata..."));
+ _reels = new Button(_panel, _("Reels..."));
_notebook = new wxNotebook (_panel, wxID_ANY);
_sizer->Add (_notebook, 1, wxEXPAND | wxTOP, 6);
_notebook->AddPage (make_audio_panel (), _("Audio"), false);
_name->Bind (wxEVT_TEXT, boost::bind(&DCPPanel::name_changed, this));
- _use_isdcf_name->Bind (wxEVT_CHECKBOX, boost::bind(&DCPPanel::use_isdcf_name_toggled, this));
+ _use_isdcf_name->bind(&DCPPanel::use_isdcf_name_toggled, 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));
- _encrypted->Bind (wxEVT_CHECKBOX, boost::bind(&DCPPanel::encrypted_toggled, 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));
+ _encrypted->bind(&DCPPanel::encrypted_toggled, this);
_standard->Bind (wxEVT_CHOICE, boost::bind(&DCPPanel::standard_changed, this));
_markers->Bind (wxEVT_BUTTON, boost::bind(&DCPPanel::markers_clicked, this));
_metadata->Bind (wxEVT_BUTTON, boost::bind(&DCPPanel::metadata_clicked, this));
- _enable_audio_language->Bind (wxEVT_CHECKBOX, boost::bind(&DCPPanel::enable_audio_language_toggled, this));
- _edit_audio_language->Bind (wxEVT_BUTTON, boost::bind(&DCPPanel::edit_audio_language_clicked, this));
+ _reels->Bind(wxEVT_BUTTON, boost::bind(&DCPPanel::reels_clicked, this));
for (auto i: DCPContentType::all()) {
- _dcp_content_type->Append (std_to_wx(i->pretty_name()));
+ _dcp_content_type->add_entry(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"));
+ add_standards();
+ _standard->SetToolTip(_("The standard that the DCP should use. Interop is older, and SMPTE is the newer (current) standard. If in doubt, choose 'SMPTE'"));
Config::instance()->Changed.connect (boost::bind(&DCPPanel::config_changed, this, _1));
add_to_grid ();
}
+
+void
+DCPPanel::add_standards()
+{
+ _standard->add_entry(_("SMPTE"), N_("smpte"));
+ if (Config::instance()->allow_smpte_bv20() || (_film && _film->limit_to_smpte_bv20())) {
+ _standard->add_entry(_("SMPTE (Bv2.0 only)"), N_("smpte-bv20"));
+ }
+ _standard->add_entry(_("Interop"), N_("interop"));
+ _standard->add_entry(_("MPEG2 Interop"), N_("mpeg2-interop"));
+ _sizer->Layout();
+}
+
+
+void
+DCPPanel::set_standard()
+{
+ DCPOMATIC_ASSERT(_film);
+ DCPOMATIC_ASSERT(!_film->limit_to_smpte_bv20() || _standard->GetCount() == 3);
+
+ if (_film->interop()) {
+ if (_film->video_encoding() == VideoEncoding::JPEG2000) {
+ checked_set(_standard, "interop");
+ } else {
+ checked_set(_standard, "mpeg2-interop");
+ }
+ } else {
+ checked_set(_standard, _film->limit_to_smpte_bv20() ? "smpte-bv20" : "smpte");
+ }
+}
+
+
+void
+DCPPanel::standard_changed ()
+{
+ if (!_film || !_standard->get()) {
+ return;
+ }
+
+ auto const data = _standard->get_data();
+ if (!data) {
+ return;
+ }
+
+ if (*data == N_("interop")) {
+ _film->set_interop(true);
+ _film->set_limit_to_smpte_bv20(false);
+ _film->set_video_encoding(VideoEncoding::JPEG2000);
+ } else if (*data == N_("smpte")) {
+ _film->set_interop(false);
+ _film->set_limit_to_smpte_bv20(false);
+ _film->set_video_encoding(VideoEncoding::JPEG2000);
+ } else if (*data == N_("smpte-bv20")) {
+ _film->set_interop(false);
+ _film->set_limit_to_smpte_bv20(true);
+ _film->set_video_encoding(VideoEncoding::JPEG2000);
+ } else if (*data == N_("mpeg2-interop")) {
+ _film->set_interop(true);
+ _film->set_video_encoding(VideoEncoding::MPEG2);
+ }
+}
+
+
void
DCPPanel::add_to_grid ()
{
{
auto s = new wxBoxSizer (wxHORIZONTAL);
s->Add (_copy_isdcf_name_button, 0, wxLEFT, DCPOMATIC_SIZER_X_GAP);
- _grid->Add (s, wxGBPosition(r, 1), wxDefaultSpan, wxEXPAND);
+ _grid->Add (s, wxGBPosition(r, 1), wxDefaultSpan, wxEXPAND | wxBOTTOM, DCPOMATIC_CHECKBOX_BOTTOM_PAD);
}
++r;
_grid->Add (_dcp_name, wxGBPosition(r, 0), wxGBSpan(1, 2), wxALIGN_CENTER_VERTICAL | wxEXPAND);
++r;
- {
- auto s = new wxBoxSizer (wxHORIZONTAL);
- s->Add (_enable_audio_language, 0, wxALIGN_CENTER_VERTICAL);
- s->Add (_audio_language, 1, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT, DCPOMATIC_SIZER_GAP);
- s->Add (_edit_audio_language, 0, wxALIGN_CENTER_VERTICAL | wxLEFT, DCPOMATIC_SIZER_GAP);
- _grid->Add (s, wxGBPosition(r, 0), wxGBSpan(1, 2), wxEXPAND | wxALIGN_CENTER_VERTICAL);
- }
- ++r;
-
add_label_to_sizer (_grid, _dcp_content_type_label, true, wxGBPosition(r, 0));
_grid->Add (_dcp_content_type, wxGBPosition(r, 1));
++r;
_grid->Add (_encrypted, wxGBPosition(r, 0), wxGBSpan(1, 2));
++r;
- add_label_to_sizer (_grid, _reels_label, true, wxGBPosition(r, 0));
- _grid->Add (_reel_type, wxGBPosition(r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
- ++r;
-
- add_label_to_sizer (_grid, _reel_length_label, true, wxGBPosition(r, 0));
- {
- auto s = new wxBoxSizer (wxHORIZONTAL);
- s->Add (_reel_length);
- add_label_to_sizer (s, _reel_length_gb_label, false, 0, wxLEFT | wxALIGN_CENTER_VERTICAL);
- _grid->Add (s, wxGBPosition(r, 1));
- }
- ++r;
-
add_label_to_sizer (_grid, _standard_label, true, wxGBPosition(r, 0));
_grid->Add (_standard, wxGBPosition(r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
++r;
auto extra = new wxBoxSizer (wxHORIZONTAL);
extra->Add (_markers, 1, wxRIGHT, DCPOMATIC_SIZER_X_GAP);
extra->Add (_metadata, 1, wxRIGHT, DCPOMATIC_SIZER_X_GAP);
+ extra->Add(_reels, 1, wxRIGHT, DCPOMATIC_SIZER_X_GAP);
_grid->Add (extra, wxGBPosition(r, 0), wxGBSpan(1, 2));
++r;
}
void
-DCPPanel::j2k_bandwidth_changed ()
+DCPPanel::video_bit_rate_changed()
{
if (!_film) {
return;
}
- _film->set_j2k_bandwidth (_j2k_bandwidth->GetValue() * 1000000);
+ _film->set_video_bit_rate(_film->video_encoding(), _video_bit_rate->GetValue() * 1000000);
}
void
DCPPanel::frame_rate_choice_changed ()
{
- if (!_film) {
+ if (!_film || !_frame_rate_choice->get()) {
return;
}
_film->set_video_frame_rate (
boost::lexical_cast<int>(
- wx_to_std(_frame_rate_choice->GetString(_frame_rate_choice->GetSelection()))
+ wx_to_std(_frame_rate_choice->GetString(*_frame_rate_choice->get()))
),
true
);
return;
}
- _film->set_audio_channels (locale_convert<int>(string_client_data(_audio_channels->GetClientObject(_audio_channels->GetSelection()))));
+ _film->set_audio_channels(locale_convert<int>(string_client_data(_audio_channels->GetClientObject(*_audio_channels->get()))));
}
void
DCPPanel::resolution_changed ()
{
- if (!_film) {
+ if (!_film || !_resolution->get()) {
return;
}
- _film->set_resolution (_resolution->GetSelection() == 0 ? Resolution::TWO_K : Resolution::FOUR_K);
+ _film->set_resolution(*_resolution->get() == 0 ? Resolution::TWO_K : Resolution::FOUR_K);
}
-void
-DCPPanel::standard_changed ()
-{
- if (!_film) {
- return;
- }
-
- _film->set_interop (_standard->GetSelection() == 1);
-
-}
-
void
DCPPanel::markers_clicked ()
{
- if (_markers_dialog) {
- _markers_dialog->Destroy ();
- _markers_dialog = nullptr;
- }
-
- _markers_dialog = new MarkersDialog (_panel, _film, _viewer);
+ _markers_dialog.reset(_panel, _film, _viewer);
_markers_dialog->Show();
}
DCPPanel::metadata_clicked ()
{
if (_film->interop()) {
- if (_interop_metadata_dialog) {
- _interop_metadata_dialog->Destroy ();
- _interop_metadata_dialog = nullptr;
- }
-
- _interop_metadata_dialog = new InteropMetadataDialog (_panel, _film);
+ _interop_metadata_dialog.reset(_panel, _film);
_interop_metadata_dialog->setup ();
_interop_metadata_dialog->Show ();
} else {
- if (_smpte_metadata_dialog) {
- _smpte_metadata_dialog->Destroy ();
- _smpte_metadata_dialog = nullptr;
- }
-
- _smpte_metadata_dialog = new SMPTEMetadataDialog (_panel, _film);
+ _smpte_metadata_dialog.reset(_panel, _film);
_smpte_metadata_dialog->setup ();
_smpte_metadata_dialog->Show ();
}
void
-DCPPanel::film_changed (Film::Property p)
+DCPPanel::reels_clicked()
+{
+ _dcp_timeline.reset(_panel, _film);
+ _dcp_timeline->Show();
+}
+
+
+void
+DCPPanel::film_changed(FilmProperty p)
{
switch (p) {
- case Film::Property::NONE:
+ case FilmProperty::NONE:
break;
- case Film::Property::CONTAINER:
+ case FilmProperty::CONTAINER:
setup_container ();
break;
- case Film::Property::NAME:
+ case FilmProperty::NAME:
checked_set (_name, _film->name());
setup_dcp_name ();
break;
- case Film::Property::DCP_CONTENT_TYPE:
+ case FilmProperty::DCP_CONTENT_TYPE:
{
auto index = DCPContentType::as_index(_film->dcp_content_type());
DCPOMATIC_ASSERT (index);
setup_dcp_name ();
break;
}
- case Film::Property::ENCRYPTED:
+ case FilmProperty::ENCRYPTED:
checked_set (_encrypted, _film->encrypted ());
break;
- case Film::Property::RESOLUTION:
+ case FilmProperty::RESOLUTION:
checked_set (_resolution, _film->resolution() == Resolution::TWO_K ? 0 : 1);
setup_container ();
setup_dcp_name ();
break;
- case Film::Property::J2K_BANDWIDTH:
- checked_set (_j2k_bandwidth, _film->j2k_bandwidth() / 1000000);
+ case FilmProperty::VIDEO_BIT_RATE:
+ checked_set(_video_bit_rate, _film->video_bit_rate(_film->video_encoding()) / 1000000);
break;
- case Film::Property::USE_ISDCF_NAME:
+ case FilmProperty::USE_ISDCF_NAME:
{
checked_set (_use_isdcf_name, _film->use_isdcf_name());
if (_film->use_isdcf_name()) {
setup_dcp_name ();
break;
}
- case Film::Property::VIDEO_FRAME_RATE:
+ case FilmProperty::VIDEO_FRAME_RATE:
{
bool done = false;
for (unsigned int i = 0; i < _frame_rate_choice->GetCount(); ++i) {
setup_dcp_name ();
break;
}
- case Film::Property::AUDIO_CHANNELS:
+ case FilmProperty::AUDIO_CHANNELS:
if (_film->audio_channels() < minimum_allowed_audio_channels()) {
_film->set_audio_channels (minimum_allowed_audio_channels());
} else {
setup_dcp_name ();
}
break;
- case Film::Property::THREE_D:
+ case FilmProperty::THREE_D:
checked_set (_three_d, _film->three_d());
setup_dcp_name ();
break;
- case Film::Property::REENCODE_J2K:
+ case FilmProperty::REENCODE_J2K:
checked_set (_reencode_j2k, _film->reencode_j2k());
break;
- case Film::Property::INTEROP:
- checked_set (_standard, _film->interop() ? 1 : 0);
+ case FilmProperty::INTEROP:
+ set_standard();
setup_dcp_name ();
_markers->Enable (!_film->interop());
break;
- case Film::Property::AUDIO_PROCESSOR:
+ case FilmProperty::VIDEO_ENCODING:
+ set_standard();
+ setup_container();
+ setup_sensitivity();
+ film_changed(FilmProperty::VIDEO_BIT_RATE);
+ break;
+ case FilmProperty::LIMIT_TO_SMPTE_BV20:
+ set_standard();
+ break;
+ case FilmProperty::AUDIO_PROCESSOR:
if (_film->audio_processor()) {
checked_set (_audio_processor, _film->audio_processor()->id());
} else {
checked_set (_audio_processor, 0);
}
setup_audio_channels_choice (_audio_channels, minimum_allowed_audio_channels());
- film_changed (Film::Property::AUDIO_CHANNELS);
- break;
- case Film::Property::REEL_TYPE:
- checked_set (_reel_type, static_cast<int>(_film->reel_type()));
- _reel_length->Enable (_film->reel_type() == ReelType::BY_LENGTH);
+ film_changed (FilmProperty::AUDIO_CHANNELS);
break;
- case Film::Property::REEL_LENGTH:
- checked_set (_reel_length, _film->reel_length() / 1000000000LL);
- break;
- case Film::Property::CONTENT:
+ case FilmProperty::CONTENT:
setup_dcp_name ();
setup_sensitivity ();
+ /* Maybe we now have ATMOS content which changes our minimum_allowed_audio_channels */
+ setup_audio_channels_choice(_audio_channels, minimum_allowed_audio_channels());
+ film_changed(FilmProperty::AUDIO_CHANNELS);
break;
- case Film::Property::AUDIO_LANGUAGE:
+ case FilmProperty::AUDIO_LANGUAGE:
{
auto al = _film->audio_language();
checked_set (_enable_audio_language, static_cast<bool>(al));
checked_set (_audio_language, al ? std_to_wx(al->to_string()) : wxT(""));
setup_dcp_name ();
setup_sensitivity ();
+ _audio_panel_sizer->Layout();
break;
}
- case Film::Property::CONTENT_VERSIONS:
- case Film::Property::VERSION_NUMBER:
- case Film::Property::RELEASE_TERRITORY:
- case Film::Property::RATINGS:
- case Film::Property::FACILITY:
- case Film::Property::STUDIO:
- case Film::Property::TEMP_VERSION:
- case Film::Property::PRE_RELEASE:
- case Film::Property::RED_BAND:
- case Film::Property::TWO_D_VERSION_OF_THREE_D:
- case Film::Property::CHAIN:
- case Film::Property::LUMINANCE:
+ case FilmProperty::AUDIO_FRAME_RATE:
+ if (_audio_sample_rate) {
+ checked_set (_audio_sample_rate, _film->audio_frame_rate() == 48000 ? 0 : 1);
+ }
+ break;
+ case FilmProperty::CONTENT_VERSIONS:
+ case FilmProperty::VERSION_NUMBER:
+ case FilmProperty::RELEASE_TERRITORY:
+ case FilmProperty::RATINGS:
+ case FilmProperty::FACILITY:
+ case FilmProperty::STUDIO:
+ case FilmProperty::TEMP_VERSION:
+ case FilmProperty::PRE_RELEASE:
+ case FilmProperty::RED_BAND:
+ case FilmProperty::TWO_D_VERSION_OF_THREE_D:
+ case FilmProperty::CHAIN:
+ case FilmProperty::LUMINANCE:
+ case FilmProperty::TERRITORY_TYPE:
setup_dcp_name ();
break;
default:
property == TextContentProperty::BURN ||
property == TextContentProperty::LANGUAGE ||
property == TextContentProperty::LANGUAGE_IS_ADDITIONAL ||
- property == VideoContentProperty::SCALE ||
+ property == TextContentProperty::TYPE ||
+ property == TextContentProperty::DCP_TRACK ||
+ property == VideoContentProperty::CUSTOM_RATIO ||
+ property == VideoContentProperty::CUSTOM_SIZE ||
property == VideoContentProperty::BURNT_SUBTITLE_LANGUAGE ||
property == VideoContentProperty::CROP ||
property == DCPContentProperty::REFERENCE_VIDEO ||
void
DCPPanel::setup_container ()
{
- int n = 0;
- auto ratios = Ratio::containers ();
- auto i = ratios.begin ();
- while (i != ratios.end() && *i != _film->container()) {
- ++i;
- ++n;
+ auto ratios = Ratio::containers();
+ if (std::find(ratios.begin(), ratios.end(), _film->container()) == ratios.end()) {
+ ratios.push_back(_film->container());
}
- if (i == ratios.end()) {
- checked_set (_container, -1);
- checked_set (_container_size, wxT(""));
- } else {
- checked_set (_container, n);
- auto const size = fit_ratio_within (_film->container()->ratio(), _film->full_frame ());
- checked_set (_container_size, wxString::Format("%dx%d", size.width, size.height));
+ wxArrayString new_ratios;
+ for (auto ratio: ratios) {
+ new_ratios.Add(std_to_wx(ratio->container_nickname()));
}
+ _container->set_entries(new_ratios);
+
+ auto iter = std::find_if(ratios.begin(), ratios.end(), [this](Ratio const* ratio) { return ratio == _film->container(); });
+ DCPOMATIC_ASSERT(iter != ratios.end());
+
+ checked_set(_container, iter - ratios.begin());
+ auto 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 ();
+
+ _video_grid->Layout();
}
return;
}
- int const n = _container->GetSelection ();
- if (n >= 0) {
+ if (auto const container = _container->get()) {
auto ratios = Ratio::containers ();
- DCPOMATIC_ASSERT (n < int(ratios.size()));
- _film->set_container (ratios[n]);
+ DCPOMATIC_ASSERT(*container < int(ratios.size()));
+ _film->set_container(ratios[*container]);
}
}
return;
}
- int const n = _dcp_content_type->GetSelection ();
- if (n != wxNOT_FOUND) {
- _film->set_dcp_content_type (DCPContentType::from_index(n));
+ if (auto const type = _dcp_content_type->get()) {
+ _film->set_dcp_content_type(DCPContentType::from_index(*type));
}
}
DCPPanel::set_film (shared_ptr<Film> film)
{
/* We are changing film, so destroy any dialogs for the old one */
- if (_audio_dialog) {
- _audio_dialog->Destroy ();
- _audio_dialog = nullptr;
- }
- if (_markers_dialog) {
- _markers_dialog->Destroy ();
- _markers_dialog = nullptr;
- }
- if (_interop_metadata_dialog) {
- _interop_metadata_dialog->Destroy ();
- _interop_metadata_dialog = nullptr;
- }
- if (_smpte_metadata_dialog) {
- _smpte_metadata_dialog->Destroy ();
- _smpte_metadata_dialog = nullptr;
- }
+ _audio_dialog.reset();
+ _markers_dialog.reset();
+ _interop_metadata_dialog.reset();
+ _smpte_metadata_dialog.reset();
_film = film;
return;
}
- film_changed (Film::Property::NAME);
- film_changed (Film::Property::USE_ISDCF_NAME);
- film_changed (Film::Property::CONTENT);
- film_changed (Film::Property::DCP_CONTENT_TYPE);
- film_changed (Film::Property::CONTAINER);
- film_changed (Film::Property::RESOLUTION);
- film_changed (Film::Property::ENCRYPTED);
- film_changed (Film::Property::J2K_BANDWIDTH);
- film_changed (Film::Property::VIDEO_FRAME_RATE);
- film_changed (Film::Property::AUDIO_CHANNELS);
- film_changed (Film::Property::SEQUENCE);
- film_changed (Film::Property::THREE_D);
- film_changed (Film::Property::INTEROP);
- film_changed (Film::Property::AUDIO_PROCESSOR);
- film_changed (Film::Property::REEL_TYPE);
- film_changed (Film::Property::REEL_LENGTH);
- film_changed (Film::Property::REENCODE_J2K);
- film_changed (Film::Property::AUDIO_LANGUAGE);
+ _standard->Clear();
+ add_standards();
+
+ film_changed(FilmProperty::NAME);
+ film_changed(FilmProperty::USE_ISDCF_NAME);
+ film_changed(FilmProperty::CONTENT);
+ film_changed(FilmProperty::DCP_CONTENT_TYPE);
+ film_changed(FilmProperty::CONTAINER);
+ film_changed(FilmProperty::RESOLUTION);
+ film_changed(FilmProperty::ENCRYPTED);
+ film_changed(FilmProperty::VIDEO_BIT_RATE);
+ film_changed(FilmProperty::VIDEO_FRAME_RATE);
+ film_changed(FilmProperty::AUDIO_CHANNELS);
+ film_changed(FilmProperty::SEQUENCE);
+ film_changed(FilmProperty::THREE_D);
+ film_changed(FilmProperty::INTEROP);
+ film_changed(FilmProperty::AUDIO_PROCESSOR);
+ film_changed(FilmProperty::REEL_TYPE);
+ film_changed(FilmProperty::REEL_LENGTH);
+ film_changed(FilmProperty::REENCODE_J2K);
+ film_changed(FilmProperty::AUDIO_LANGUAGE);
+ film_changed(FilmProperty::AUDIO_FRAME_RATE);
+ film_changed(FilmProperty::LIMIT_TO_SMPTE_BV20);
set_general_sensitivity(static_cast<bool>(_film));
}
void
DCPPanel::setup_sensitivity ()
{
+ auto const mpeg2 = _film && _film->video_encoding() == VideoEncoding::MPEG2;
+
_name->Enable (_generally_sensitive);
_use_isdcf_name->Enable (_generally_sensitive);
_dcp_content_type->Enable (_generally_sensitive);
_audio_language->Enable (_enable_audio_language->GetValue());
_edit_audio_language->Enable (_enable_audio_language->GetValue());
_encrypted->Enable (_generally_sensitive);
- _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);
_markers->Enable (_generally_sensitive && _film && !_film->interop());
_metadata->Enable (_generally_sensitive);
+ _reels->Enable (_generally_sensitive && _film);
_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_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());
+ _video_bit_rate->Enable (_generally_sensitive && _film && !_film->references_dcp_video());
+ _container->Enable (_generally_sensitive && _film && !_film->references_dcp_video() && !mpeg2);
_best_frame_rate->Enable (
_generally_sensitive &&
_film &&
!_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());
+ _resolution->Enable (_generally_sensitive && _film && !_film->references_dcp_video() && !mpeg2);
+ _three_d->Enable (_generally_sensitive && _film && !_film->references_dcp_video() && !mpeg2);
_standard->Enable (
_generally_sensitive &&
void
DCPPanel::setup_dcp_name ()
{
+ if (!_film) {
+ return;
+ }
+
_dcp_name->SetLabel (std_to_wx(_film->dcp_name(true)));
_dcp_name->SetToolTip (std_to_wx(_film->dcp_name(true)));
}
void
DCPPanel::config_changed (Config::Property p)
{
- _j2k_bandwidth->SetRange (1, Config::instance()->maximum_j2k_bandwidth() / 1000000);
+ VideoEncoding const encoding = _film ? _film->video_encoding() : VideoEncoding::JPEG2000;
+ _video_bit_rate->SetRange(1, Config::instance()->maximum_video_bit_rate(encoding) / 1000000);
setup_frame_rate_widget ();
if (p == Config::SHOW_EXPERIMENTAL_AUDIO_PROCESSORS) {
_audio_processor->Clear ();
add_audio_processors ();
if (_film) {
- film_changed (Film::Property::AUDIO_PROCESSOR);
+ film_changed(FilmProperty::AUDIO_PROCESSOR);
+ }
+ } else if (p == Config::ALLOW_SMPTE_BV20) {
+ _standard->Clear();
+ add_standards();
+ if (_film) {
+ film_changed(FilmProperty::INTEROP);
+ film_changed(FilmProperty::LIMIT_TO_SMPTE_BV20);
}
+ } else if (p == Config::ISDCF_NAME_PART_LENGTH) {
+ setup_dcp_name();
+ } else if (p == Config::ALLOW_ANY_CONTAINER) {
+ setup_container();
}
}
_frame_rate_choice->Show ();
_frame_rate_spin->Hide ();
}
+ _frame_rate_sizer->Layout();
}
panel->SetSizer (sizer);
_container_label = create_label (panel, _("Container"), true);
- _container = new wxChoice (panel, wxID_ANY);
+ _container = new Choice(panel);
_container_size = new StaticText (panel, wxT (""));
_resolution_label = create_label (panel, _("Resolution"), true);
- _resolution = new wxChoice (panel, wxID_ANY);
+ _resolution = new Choice(panel);
_frame_rate_label = create_label (panel, _("Frame Rate"), true);
- _frame_rate_choice = new wxChoice (panel, wxID_ANY);
+ _frame_rate_choice = new Choice(panel);
_frame_rate_spin = new SpinCtrl (panel, DCPOMATIC_SPIN_CTRL_WIDTH);
- setup_frame_rate_widget ();
_best_frame_rate = new Button (panel, _("Use best"));
_three_d = new CheckBox (panel, _("3D"));
- _j2k_bandwidth_label = create_label (panel, _("JPEG2000 bandwidth\nfor newly-encoded data"), true);
- _j2k_bandwidth = new SpinCtrl (panel, DCPOMATIC_SPIN_CTRL_WIDTH);
+ _video_bit_rate_label = create_label(panel, _("Video bit rate\nfor newly-encoded data"), true);
+ _video_bit_rate = new SpinCtrl(panel, DCPOMATIC_SPIN_CTRL_WIDTH);
_mbits_label = create_label (panel, _("Mbit/s"), false);
_reencode_j2k = new CheckBox (panel, _("Re-encode JPEG2000 data from input"));
_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));
+ _video_bit_rate->Bind (wxEVT_SPINCTRL, boost::bind(&DCPPanel::video_bit_rate_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));
+ _video_bit_rate->Bind (wxEVT_TEXT, boost::bind(&DCPPanel::video_bit_rate_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));
-
- for (auto i: Ratio::containers()) {
- _container->Append (std_to_wx(i->container_nickname()));
- }
+ _three_d->bind(&DCPPanel::three_d_changed, this);
+ _reencode_j2k->bind(&DCPPanel::reencode_j2k_changed, this);
for (auto i: Config::instance()->allowed_dcp_frame_rates()) {
- _frame_rate_choice->Append (std_to_wx (boost::lexical_cast<string> (i)));
+ _frame_rate_choice->add_entry(boost::lexical_cast<string>(i));
}
- _j2k_bandwidth->SetRange (1, Config::instance()->maximum_j2k_bandwidth() / 1000000);
+ VideoEncoding const encoding = _film ? _film->video_encoding() : VideoEncoding::JPEG2000;
+ _video_bit_rate->SetRange(1, Config::instance()->maximum_video_bit_rate(encoding) / 1000000);
_frame_rate_spin->SetRange (1, 480);
- _resolution->Append (_("2K"));
- _resolution->Append (_("4K"));
+ _resolution->add_entry(_("2K"));
+ _resolution->add_entry(_("4K"));
add_video_panel_to_grid ();
+ setup_frame_rate_widget();
return panel;
}
_video_grid->Add (_three_d, wxGBPosition (r, 0), wxGBSpan (1, 2));
++r;
- add_label_to_sizer (_video_grid, _j2k_bandwidth_label, true, wxGBPosition (r, 0));
+ add_label_to_sizer(_video_grid, _video_bit_rate_label, true, wxGBPosition (r, 0));
auto s = new wxBoxSizer (wxHORIZONTAL);
- s->Add (_j2k_bandwidth, 0, wxALIGN_CENTER_VERTICAL);
+ s->Add(_video_bit_rate, 0, wxALIGN_CENTER_VERTICAL);
add_label_to_sizer (s, _mbits_label, false, 0, wxLEFT | wxALIGN_CENTER_VERTICAL);
_video_grid->Add (s, wxGBPosition(r, 1), wxDefaultSpan);
++r;
DCPPanel::minimum_allowed_audio_channels () const
{
int min = 2;
- if (_film && _film->audio_processor ()) {
- min = _film->audio_processor()->out_channels ();
+ if (_film) {
+ if (_film->audio_processor()) {
+ min = _film->audio_processor()->out_channels();
+ }
+ if (_film->contains_atmos_content()) {
+ min = std::max(min, 14);
+ }
}
if (min % 2 == 1) {
panel->SetSizer (_audio_panel_sizer);
_channels_label = create_label (panel, _("Channels"), true);
- _audio_channels = new wxChoice (panel, wxID_ANY);
+ _audio_channels = new Choice(panel);
setup_audio_channels_choice (_audio_channels, minimum_allowed_audio_channels ());
+ if (Config::instance()->allow_96khz_audio()) {
+ _audio_sample_rate_label = create_label (panel, _("Sample rate"), true);
+ _audio_sample_rate = new wxChoice (panel, wxID_ANY);
+ }
+
_processor_label = create_label (panel, _("Processor"), true);
- _audio_processor = new wxChoice (panel, wxID_ANY);
+ _audio_processor = new Choice(panel);
add_audio_processors ();
+ _enable_audio_language = new CheckBox(panel, _("Language"));
+ _audio_language = new wxStaticText(panel, wxID_ANY, wxT(""));
+ _edit_audio_language = new Button(panel, _("Edit..."));
+
_show_audio = new Button (panel, _("Show graph of audio levels..."));
_audio_channels->Bind (wxEVT_CHOICE, boost::bind (&DCPPanel::audio_channels_changed, this));
+ if (_audio_sample_rate) {
+ _audio_sample_rate->Bind (wxEVT_CHOICE, boost::bind(&DCPPanel::audio_sample_rate_changed, this));
+ }
_audio_processor->Bind (wxEVT_CHOICE, boost::bind (&DCPPanel::audio_processor_changed, this));
+
+ _enable_audio_language->bind(&DCPPanel::enable_audio_language_toggled, this);
+ _edit_audio_language->Bind(wxEVT_BUTTON, boost::bind(&DCPPanel::edit_audio_language_clicked, this));
+
_show_audio->Bind (wxEVT_BUTTON, boost::bind (&DCPPanel::show_audio_clicked, this));
+ if (_audio_sample_rate) {
+ _audio_sample_rate->Append (_("48kHz"));
+ _audio_sample_rate->Append (_("96kHz"));
+ }
+
add_audio_panel_to_grid ();
return panel;
_audio_grid->Add (_audio_channels, wxGBPosition (r, 1));
++r;
+ if (_audio_sample_rate_label && _audio_sample_rate) {
+ add_label_to_sizer (_audio_grid, _audio_sample_rate_label, true, wxGBPosition(r, 0));
+ _audio_grid->Add (_audio_sample_rate, wxGBPosition(r, 1));
+ ++r;
+ }
+
add_label_to_sizer (_audio_grid, _processor_label, true, wxGBPosition (r, 0));
_audio_grid->Add (_audio_processor, wxGBPosition (r, 1));
++r;
+ {
+ auto s = new wxBoxSizer (wxHORIZONTAL);
+ s->Add(_enable_audio_language, 0, wxALIGN_CENTER_VERTICAL | wxRIGHT, DCPOMATIC_SIZER_GAP);
+ s->Add(_audio_language, 1, wxALIGN_CENTER_VERTICAL | wxBOTTOM, DCPOMATIC_CHECKBOX_BOTTOM_PAD);
+ s->Add(DCPOMATIC_SIZER_X_GAP, 0);
+ s->Add(_edit_audio_language, 0, wxALIGN_CENTER_VERTICAL | wxBOTTOM, DCPOMATIC_CHECKBOX_BOTTOM_PAD);
+ _audio_grid->Add(s, wxGBPosition(r, 0), wxGBSpan(1, 2), wxEXPAND | wxALIGN_CENTER_VERTICAL);
+ }
+ ++r;
+
_audio_grid->Add (_show_audio, wxGBPosition (r, 0), wxGBSpan (1, 2));
++r;
}
void
DCPPanel::audio_processor_changed ()
{
- if (!_film) {
+ if (!_film || !_audio_processor->get()) {
return;
}
- auto const s = string_client_data (_audio_processor->GetClientObject (_audio_processor->GetSelection ()));
+ auto const s = string_client_data(_audio_processor->GetClientObject(*_audio_processor->get()));
_film->set_audio_processor (AudioProcessor::from_id (s));
}
return;
}
- if (_audio_dialog) {
- _audio_dialog->Destroy ();
- _audio_dialog = nullptr;
- }
-
- auto d = new AudioDialog (_panel, _film, _viewer);
- d->Show ();
-}
-
-
-void
-DCPPanel::reel_type_changed ()
-{
- if (!_film) {
- return;
- }
-
- _film->set_reel_type (static_cast<ReelType>(_reel_type->GetSelection()));
-}
-
-
-void
-DCPPanel::reel_length_changed ()
-{
- if (!_film) {
- return;
- }
-
- _film->set_reel_length (_reel_length->GetValue() * 1000000000LL);
+ _audio_dialog.reset(_panel, _film, _viewer);
+ _audio_dialog->Show();
}
void
DCPPanel::add_audio_processors ()
{
- _audio_processor->Append (_("None"), new wxStringClientData(N_("none")));
+ _audio_processor->add_entry(_("None"), new wxStringClientData(N_("none")));
for (auto ap: AudioProcessor::visible()) {
- _audio_processor->Append (std_to_wx(ap->name()), new wxStringClientData(std_to_wx(ap->id())));
+ _audio_processor->add_entry(std_to_wx(ap->name()), new wxStringClientData(std_to_wx(ap->id())));
}
_audio_panel_sizer->Layout();
}
DCPPanel::edit_audio_language_clicked ()
{
DCPOMATIC_ASSERT (_film->audio_language());
- auto d = new LanguageTagDialog (_panel, *_film->audio_language());
- d->ShowModal ();
- _film->set_audio_language(d->get());
- d->Destroy ();
+ auto d = make_wx<LanguageTagDialog>(_panel, *_film->audio_language());
+ if (d->ShowModal() == wxID_OK) {
+ _film->set_audio_language(d->get());
+ }
+}
+
+
+void
+DCPPanel::audio_sample_rate_changed ()
+{
+ if (_audio_sample_rate) {
+ _film->set_audio_frame_rate (_audio_sample_rate->GetSelection() == 0 ? 48000 : 96000);
+ }
}