/*
- Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
#include <wx/gbsizer.h>
#include <wx/spinctrl.h>
#include <boost/lexical_cast.hpp>
-#include <boost/foreach.hpp>
#include <iostream>
using std::cout;
using std::max;
using std::make_pair;
using boost::lexical_cast;
-using boost::shared_ptr;
-using boost::weak_ptr;
+using std::shared_ptr;
+using std::weak_ptr;
#if BOOST_VERSION >= 106100
using namespace boost::placeholders;
#endif
_encrypted = new CheckBox (_panel, _("Encrypted"));
wxClientDC dc (_panel);
- wxSize size = dc.GetTextExtent (wxT ("GGGGGGGG..."));
+ auto size = dc.GetTextExtent (wxT ("GGGGGGGG..."));
size.SetHeight (-1);
_reels_label = create_label (_panel, _("Reels"), true);
_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()) {
+ for (auto i: DCPContentType::all()) {
_dcp_content_type->Append (std_to_wx (i->pretty_name ()));
}
{
int r = 0;
- add_label_to_sizer (_grid, _name_label, true, wxGBPosition (r, 0));
- _grid->Add (_name, wxGBPosition(r, 1), wxDefaultSpan, wxEXPAND | wxLEFT | wxRIGHT);
+ auto name_sizer = new wxBoxSizer (wxHORIZONTAL);
+ name_sizer->Add (_name_label, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP);
+ name_sizer->Add (_name, 1, wxALIGN_CENTER_VERTICAL);
+ _grid->Add (name_sizer, wxGBPosition(r, 0), wxGBSpan(1, 2), wxEXPAND);
++r;
int flags = wxALIGN_CENTER_VERTICAL;
{
wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
s->Add (_reel_length);
- add_label_to_sizer (s, _reel_length_gb_label, false);
+ add_label_to_sizer (s, _reel_length_gb_label, false, 0, wxLEFT | wxALIGN_CENTER_VERTICAL);
_grid->Add (s, wxGBPosition (r, 1));
}
++r;
_grid->Add (_standard, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
++r;
- wxBoxSizer* extra = new wxBoxSizer (wxHORIZONTAL);
+ auto 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));
return;
}
- _film->set_resolution (_resolution->GetSelection() == 0 ? RESOLUTION_2K : RESOLUTION_4K);
+ _film->set_resolution (_resolution->GetSelection() == 0 ? Resolution::TWO_K : Resolution::FOUR_K);
}
void
}
void
-DCPPanel::film_changed (int p)
+DCPPanel::film_changed (Film::Property p)
{
switch (p) {
- case Film::NONE:
+ case Film::Property::NONE:
break;
- case Film::CONTAINER:
+ case Film::Property::CONTAINER:
setup_container ();
break;
- case Film::NAME:
+ case Film::Property::NAME:
checked_set (_name, _film->name());
setup_dcp_name ();
break;
- case Film::DCP_CONTENT_TYPE:
+ case Film::Property::DCP_CONTENT_TYPE:
checked_set (_dcp_content_type, DCPContentType::as_index (_film->dcp_content_type ()));
setup_dcp_name ();
break;
- case Film::ENCRYPTED:
+ case Film::Property::ENCRYPTED:
checked_set (_encrypted, _film->encrypted ());
break;
- case Film::RESOLUTION:
- checked_set (_resolution, _film->resolution() == RESOLUTION_2K ? 0 : 1);
+ case Film::Property::RESOLUTION:
+ checked_set (_resolution, _film->resolution() == Resolution::TWO_K ? 0 : 1);
setup_container ();
setup_dcp_name ();
break;
- case Film::J2K_BANDWIDTH:
+ case Film::Property::J2K_BANDWIDTH:
checked_set (_j2k_bandwidth, _film->j2k_bandwidth() / 1000000);
break;
- case Film::USE_ISDCF_NAME:
+ case Film::Property::USE_ISDCF_NAME:
{
checked_set (_use_isdcf_name, _film->use_isdcf_name ());
if (_film->use_isdcf_name()) {
_edit_isdcf_button->Enable (_film->use_isdcf_name ());
break;
}
- case Film::ISDCF_METADATA:
+ case Film::Property::ISDCF_METADATA:
setup_dcp_name ();
break;
- case Film::VIDEO_FRAME_RATE:
+ case Film::Property::VIDEO_FRAME_RATE:
{
bool done = false;
for (unsigned int i = 0; i < _frame_rate_choice->GetCount(); ++i) {
setup_dcp_name ();
break;
}
- case Film::AUDIO_CHANNELS:
+ case Film::Property::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::THREE_D:
+ case Film::Property::THREE_D:
checked_set (_three_d, _film->three_d ());
setup_dcp_name ();
break;
- case Film::REENCODE_J2K:
+ case Film::Property::REENCODE_J2K:
checked_set (_reencode_j2k, _film->reencode_j2k());
break;
- case Film::INTEROP:
+ case Film::Property::INTEROP:
checked_set (_standard, _film->interop() ? 1 : 0);
setup_dcp_name ();
_markers->Enable (!_film->interop());
break;
- case Film::AUDIO_PROCESSOR:
+ case Film::Property::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::AUDIO_CHANNELS);
+ film_changed (Film::Property::AUDIO_CHANNELS);
break;
- case Film::REEL_TYPE:
- checked_set (_reel_type, _film->reel_type ());
- _reel_length->Enable (_film->reel_type() == REELTYPE_BY_LENGTH);
+ case Film::Property::REEL_TYPE:
+ checked_set (_reel_type, static_cast<int>(_film->reel_type()));
+ _reel_length->Enable (_film->reel_type() == ReelType::BY_LENGTH);
break;
- case Film::REEL_LENGTH:
+ case Film::Property::REEL_LENGTH:
checked_set (_reel_length, _film->reel_length() / 1000000000LL);
break;
- case Film::CONTENT:
+ case Film::Property::CONTENT:
setup_dcp_name ();
setup_sensitivity ();
break;
DCPPanel::film_content_changed (int property)
{
if (property == AudioContentProperty::STREAMS ||
+ property == AudioContentProperty::LANGUAGE ||
property == TextContentProperty::USE ||
property == TextContentProperty::BURN ||
+ property == TextContentProperty::LANGUAGE ||
+ property == TextContentProperty::LANGUAGE_IS_ADDITIONAL ||
property == VideoContentProperty::SCALE ||
+ property == VideoContentProperty::BURNT_SUBTITLE_LANGUAGE ||
property == DCPContentProperty::REFERENCE_VIDEO ||
property == DCPContentProperty::REFERENCE_AUDIO ||
property == DCPContentProperty::REFERENCE_TEXT) {
/* We are changing film, so destroy any dialogs for the old one */
if (_audio_dialog) {
_audio_dialog->Destroy ();
- _audio_dialog = 0;
+ _audio_dialog = nullptr;
}
if (_markers_dialog) {
_markers_dialog->Destroy ();
- _markers_dialog = 0;
+ _markers_dialog = nullptr;
}
if (_interop_metadata_dialog) {
_interop_metadata_dialog->Destroy ();
- _interop_metadata_dialog = 0;
+ _interop_metadata_dialog = nullptr;
}
if (_smpte_metadata_dialog) {
_smpte_metadata_dialog->Destroy ();
- _smpte_metadata_dialog = 0;
+ _smpte_metadata_dialog = nullptr;
}
_film = film;
return;
}
- film_changed (Film::NAME);
- film_changed (Film::USE_ISDCF_NAME);
- film_changed (Film::CONTENT);
- film_changed (Film::DCP_CONTENT_TYPE);
- film_changed (Film::CONTAINER);
- film_changed (Film::RESOLUTION);
- film_changed (Film::ENCRYPTED);
- film_changed (Film::J2K_BANDWIDTH);
- film_changed (Film::ISDCF_METADATA);
- film_changed (Film::VIDEO_FRAME_RATE);
- film_changed (Film::AUDIO_CHANNELS);
- 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::REENCODE_J2K);
+ 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::ISDCF_METADATA);
+ 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);
set_general_sensitivity(static_cast<bool>(_film));
}
_copy_isdcf_name_button->Enable (_generally_sensitive);
_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);
+ _reel_length->Enable (_generally_sensitive && _film && _film->reel_type() == ReelType::BY_LENGTH);
_markers->Enable (_generally_sensitive && _film && !_film->interop());
_metadata->Enable (_generally_sensitive);
_frame_rate_choice->Enable (_generally_sensitive && _film && !_film->references_dcp_video() && !_film->contains_atmos_content());
return;
}
- ISDCFMetadataDialog* d = new ISDCFMetadataDialog (_panel, _film->isdcf_metadata (), _film->three_d ());
+ auto d = new ISDCFMetadataDialog (_panel, _film->isdcf_metadata (), _film->three_d ());
d->ShowModal ();
_film->set_isdcf_metadata (d->isdcf_metadata ());
d->Destroy ();
_audio_processor->Clear ();
add_audio_processors ();
if (_film) {
- film_changed (Film::AUDIO_PROCESSOR);
+ film_changed (Film::Property::AUDIO_PROCESSOR);
}
}
}
wxPanel *
DCPPanel::make_video_panel ()
{
- wxPanel* panel = new wxPanel (_notebook);
- wxSizer* sizer = new wxBoxSizer (wxVERTICAL);
+ auto panel = new wxPanel (_notebook);
+ auto sizer = new wxBoxSizer (wxVERTICAL);
_video_grid = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
sizer->Add (_video_grid, 0, wxALL, 8);
panel->SetSizer (sizer);
_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()) {
+ for (auto i: Ratio::containers()) {
_container->Append (std_to_wx(i->container_nickname()));
}
- BOOST_FOREACH (int i, Config::instance()->allowed_dcp_frame_rates()) {
+ for (auto i: Config::instance()->allowed_dcp_frame_rates()) {
_frame_rate_choice->Append (std_to_wx (boost::lexical_cast<string> (i)));
}
++r;
add_label_to_sizer (_video_grid, _j2k_bandwidth_label, true, wxGBPosition (r, 0));
- wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
- s->Add (_j2k_bandwidth, 1);
- add_label_to_sizer (s, _mbits_label, false);
- _video_grid->Add (s, wxGBPosition (r, 1));
+ auto s = new wxBoxSizer (wxHORIZONTAL);
+ s->Add (_j2k_bandwidth, 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, wxEXPAND);
++r;
_video_grid->Add (_reencode_j2k, wxGBPosition(r, 0), wxGBSpan(1, 2));
}
wxPanel *
DCPPanel::make_audio_panel ()
{
- wxPanel* panel = new wxPanel (_notebook);
+ auto 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);
return;
}
- string const s = string_client_data (_audio_processor->GetClientObject (_audio_processor->GetSelection ()));
+ auto const s = string_client_data (_audio_processor->GetClientObject (_audio_processor->GetSelection ()));
_film->set_audio_processor (AudioProcessor::from_id (s));
}
_audio_dialog = 0;
}
- AudioDialog* d = new AudioDialog (_panel, _film, _viewer);
+ auto d = new AudioDialog (_panel, _film, _viewer);
d->Show ();
}
DCPPanel::add_audio_processors ()
{
_audio_processor->Append (_("None"), new wxStringClientData (N_("none")));
- BOOST_FOREACH (AudioProcessor const * ap, AudioProcessor::visible()) {
+ for (auto ap: AudioProcessor::visible()) {
_audio_processor->Append (std_to_wx(ap->name()), new wxStringClientData(std_to_wx(ap->id())));
}
_audio_panel_sizer->Layout();