/*
- Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2021 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 "check_box.h"
#include "dcpomatic_button.h"
#include "markers_dialog.h"
+#include "interop_metadata_dialog.h"
+#include "smpte_metadata_dialog.h"
#include "lib/ratio.h"
#include "lib/config.h"
#include "lib/dcp_content_type.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>
#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
using dcp::locale_convert;
DCPPanel::DCPPanel (wxNotebook* n, shared_ptr<Film> film, weak_ptr<FilmViewer> viewer)
: _audio_dialog (0)
, _markers_dialog (0)
+ , _interop_metadata_dialog (0)
+ , _smpte_metadata_dialog (0)
, _film (film)
, _viewer (viewer)
, _generally_sensitive (true)
_dcp_content_type_label = create_label (_panel, _("Content Type"), true);
_dcp_content_type = new wxChoice (_panel, wxID_ANY);
- _signed = new CheckBox (_panel, _("Signed"));
_encrypted = new CheckBox (_panel, _("Encrypted"));
wxClientDC dc (_panel);
- wxSize size = dc.GetTextExtent (wxT ("GGGGGGGG..."));
+ auto 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..."));
_notebook = new wxNotebook (_panel, wxID_ANY);
_sizer->Add (_notebook, 1, wxEXPAND | wxTOP, 6);
_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()) {
+ for (auto i: DCPContentType::all()) {
_dcp_content_type->Append (std_to_wx (i->pretty_name ()));
}
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));
flags |= wxALIGN_RIGHT;
#endif
- 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;
+ _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;
_grid->Add (_dcp_name, wxGBPosition(r, 0), wxGBSpan (1, 2), wxALIGN_CENTER_VERTICAL | wxEXPAND);
++r;
_grid->Add (_dcp_content_type, wxGBPosition (r, 1));
++r;
- _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;
+ add_label_to_sizer (_grid, _reels_label, true, wxGBPosition (r, 0));
+ _grid->Add (_reel_type, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
+ ++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->Show (full);
- _reel_length_gb_label->Show (full);
- _standard_label->Show (full);
- _standard->Show (full);
- _upload_after_make_dcp->Show (full);
- _markers->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;
-
- 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;
-
- add_label_to_sizer (_grid, _standard_label, true, wxGBPosition (r, 0));
- _grid->Add (_standard, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
- ++r;
-
- _grid->Add (_upload_after_make_dcp, wxGBPosition (r, 0), wxGBSpan (1, 2));
- ++r;
-
- _grid->Add (_markers, wxGBPosition(r, 0), wxGBSpan(1, 2));
- ++r;
+ 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, 0, wxLEFT | wxALIGN_CENTER_VERTICAL);
+ _grid->Add (s, wxGBPosition (r, 1));
}
-}
+ ++r;
-void
-DCPPanel::edit_key_clicked ()
-{
- KeyDialog* d = new KeyDialog (_panel, _film->key ());
- if (d->ShowModal () == wxID_OK) {
- _film->set_key (d->key ());
- }
- d->Destroy ();
+ 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);
+ _grid->Add (extra, wxGBPosition(r, 0), wxGBSpan(1, 2));
+ ++r;
}
void
_film->set_j2k_bandwidth (_j2k_bandwidth->GetValue() * 1000000);
}
-void
-DCPPanel::signed_toggled ()
-{
- if (!_film) {
- return;
- }
-
- _film->set_signed (_signed->GetValue ());
-}
-
void
DCPPanel::encrypted_toggled ()
{
return;
}
- _film->set_resolution (_resolution->GetSelection() == 0 ? RESOLUTION_2K : RESOLUTION_4K);
+ _film->set_resolution (_resolution->GetSelection() == 0 ? Resolution::TWO_K : Resolution::FOUR_K);
}
void
_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 ()
{
_markers_dialog->Show();
}
+void
+DCPPanel::metadata_clicked ()
+{
+ if (_film->interop()) {
+ if (_interop_metadata_dialog) {
+ _interop_metadata_dialog->Destroy ();
+ _interop_metadata_dialog = 0;
+ }
+
+ _interop_metadata_dialog = new InteropMetadataDialog (_panel, _film);
+ _interop_metadata_dialog->Show ();
+ } else {
+ if (_smpte_metadata_dialog) {
+ _smpte_metadata_dialog->Destroy ();
+ _smpte_metadata_dialog = 0;
+ }
+
+ _smpte_metadata_dialog = new SMPTEMetadataDialog (_panel, _film);
+ _smpte_metadata_dialog->Show ();
+ }
+}
+
void
DCPPanel::film_changed (int p)
{
checked_set (_dcp_content_type, DCPContentType::as_index (_film->dcp_content_type ()));
setup_dcp_name ();
break;
- case Film::SIGNED:
- checked_set (_signed, _film->is_signed ());
- break;
case Film::ENCRYPTED:
checked_set (_encrypted, _film->encrypted ());
- if (_film->encrypted ()) {
- _film->set_signed (true);
- _signed->Enable (false);
- _key->Enable (_generally_sensitive);
- _edit_key->Enable (_generally_sensitive);
- } else {
- _signed->Enable (_generally_sensitive);
- _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);
+ checked_set (_resolution, _film->resolution() == Resolution::TWO_K ? 0 : 1);
setup_container ();
setup_dcp_name ();
break;
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;
}
case Film::ISDCF_METADATA:
+ case Film::SUBTITLE_LANGUAGES:
setup_dcp_name ();
break;
case Film::VIDEO_FRAME_RATE:
film_changed (Film::AUDIO_CHANNELS);
break;
case Film::REEL_TYPE:
- checked_set (_reel_type, _film->reel_type ());
- _reel_length->Enable (_film->reel_type() == REELTYPE_BY_LENGTH);
+ checked_set (_reel_type, static_cast<int>(_film->reel_type()));
+ _reel_length->Enable (_film->reel_type() == ReelType::BY_LENGTH);
break;
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;
/* 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 = nullptr;
+ }
+ if (_smpte_metadata_dialog) {
+ _smpte_metadata_dialog->Destroy ();
+ _smpte_metadata_dialog = nullptr;
}
_film = film;
film_changed (Film::DCP_CONTENT_TYPE);
film_changed (Film::CONTAINER);
film_changed (Film::RESOLUTION);
- film_changed (Film::SIGNED);
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;
- }
- _signed->Enable (si);
-
_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);
- _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());
+ _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());
+ _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);
}
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 ();
_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 ();
+ if (p == Config::SHOW_EXPERIMENTAL_AUDIO_PROCESSORS) {
+ _audio_processor->Clear ();
+ add_audio_processors ();
+ if (_film) {
+ film_changed (Film::AUDIO_PROCESSOR);
+ }
}
}
_frame_rate_choice->Show ();
_frame_rate_spin->Hide ();
}
-
- _frame_rate_sizer->Layout ();
}
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);
_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"));
_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)));
}
void
DCPPanel::add_video_panel_to_grid ()
{
- bool const full = Config::instance()->interface_complexity() == Config::INTERFACE_FULL;
-
int r = 0;
add_label_to_sizer (_video_grid, _container_label, true, wxGBPosition (r, 0));
_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;
}
_video_grid->Add (_three_d, wxGBPosition (r, 0), wxGBSpan (1, 2));
++r;
- _j2k_bandwidth_label->Show (full);
- _j2k_bandwidth->Show (full);
- _mbits_label->Show (full);
-
- if (full) {
- 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));
- ++r;
- _video_grid->Add (_reencode_j2k, wxGBPosition(r, 0), wxGBSpan(1, 2));
- }
+ add_label_to_sizer (_video_grid, _j2k_bandwidth_label, true, wxGBPosition (r, 0));
+ 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));
}
int
wxPanel *
DCPPanel::make_audio_panel ()
{
- wxPanel* panel = new wxPanel (_notebook);
- wxSizer* sizer = new wxBoxSizer (wxVERTICAL);
+ auto panel = new wxPanel (_notebook);
+ _audio_panel_sizer = new wxBoxSizer (wxVERTICAL);
_audio_grid = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
- sizer->Add (_audio_grid, 0, wxALL, 8);
- panel->SetSizer (sizer);
+ _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);
_processor_label = create_label (panel, _("Processor"), true);
_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 ())));
- }
+ add_audio_processors ();
_show_audio = new Button (panel, _("Show audio..."));
void
DCPPanel::add_audio_panel_to_grid ()
{
- bool const full = Config::instance()->interface_complexity() == Config::INTERFACE_FULL;
-
int r = 0;
- _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);
+ add_label_to_sizer (_audio_grid, _channels_label, true, wxGBPosition (r, 0));
+ _audio_grid->Add (_audio_channels, wxGBPosition (r, 1));
+ ++r;
- if (full) {
- add_label_to_sizer (_audio_grid, _processor_label, true, wxGBPosition (r, 0));
- _audio_grid->Add (_audio_processor, 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;
_audio_grid->Add (_show_audio, wxGBPosition (r, 0), wxGBSpan (1, 2));
++r;
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);
+ auto d = new AudioDialog (_panel, _film, _viewer);
d->Show ();
}
_film->set_reel_length (_reel_length->GetValue() * 1000000000LL);
}
+
+void
+DCPPanel::add_audio_processors ()
+{
+ _audio_processor->Append (_("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_panel_sizer->Layout();
+}