#include "check_box.h"
#include "dcp_panel.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)
_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"));
size.SetHeight (-1);
_reels_label = create_label (_panel, _("Reels"), true);
- _reel_type = new wxChoice (_panel, wxID_ANY);
+ _reel_type = new Choice(_panel);
_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..."));
_edit_audio_language->Bind (wxEVT_BUTTON, boost::bind(&DCPPanel::edit_audio_language_clicked, this));
for (auto i: DCPContentType::all()) {
- _dcp_content_type->Append (std_to_wx(i->pretty_name()));
+ _dcp_content_type->add(i->pretty_name());
}
- _reel_type->Append (_("Single reel"));
- _reel_type->Append (_("Split by video content"));
+ _reel_type->add(_("Single reel"));
+ _reel_type->add(_("Split by video content"));
/// TRANSLATORS: translate the word "Custom" here; do not include the "Reel|" prefix
- _reel_type->Append (S_("Reel|Custom"));
+ _reel_type->add(S_("Reel|Custom"));
_reel_length->SetRange (1, 64);
- _standard->Append (_("SMPTE"));
- _standard->Append (_("Interop"));
+ _standard->add(_("SMPTE"));
+ _standard->add(_("Interop"));
Config::instance()->Changed.connect (boost::bind(&DCPPanel::config_changed, this, _1));
{
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;
{
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);
+ 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 (_edit_audio_language, 0, wxALIGN_CENTER_VERTICAL | wxBOTTOM, DCPOMATIC_CHECKBOX_BOTTOM_PAD);
_grid->Add (s, wxGBPosition(r, 0), wxGBSpan(1, 2), wxEXPAND | wxALIGN_CENTER_VERTICAL);
}
++r;
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) {
+ if (!_film || !_standard->get()) {
return;
}
- _film->set_interop (_standard->GetSelection() == 1);
+ _film->set_interop(*_standard->get() == 1);
}
setup_sensitivity ();
break;
}
+ case Film::Property::AUDIO_FRAME_RATE:
+ if (_audio_sample_rate) {
+ checked_set (_audio_sample_rate, _film->audio_frame_rate() == 48000 ? 0 : 1);
+ }
+ break;
case Film::Property::CONTENT_VERSIONS:
case Film::Property::VERSION_NUMBER:
case Film::Property::RELEASE_TERRITORY:
property == TextContentProperty::BURN ||
property == TextContentProperty::LANGUAGE ||
property == TextContentProperty::LANGUAGE_IS_ADDITIONAL ||
- property == VideoContentProperty::SCALE ||
+ property == VideoContentProperty::CUSTOM_RATIO ||
+ property == VideoContentProperty::CUSTOM_SIZE ||
property == VideoContentProperty::BURNT_SUBTITLE_LANGUAGE ||
property == VideoContentProperty::CROP ||
property == DCPContentProperty::REFERENCE_VIDEO ||
return;
}
- int const n = _container->GetSelection ();
- if (n >= 0) {
+ auto const n = _container->get();
+ if (n) {
auto ratios = Ratio::containers ();
- DCPOMATIC_ASSERT (n < int(ratios.size()));
- _film->set_container (ratios[n]);
+ DCPOMATIC_ASSERT(*n < int(ratios.size()));
+ _film->set_container(ratios[*n]);
}
}
return;
}
- int const n = _dcp_content_type->GetSelection ();
- if (n != wxNOT_FOUND) {
- _film->set_dcp_content_type (DCPContentType::from_index(n));
+ auto n = _dcp_content_type->get();
+ if (n) {
+ _film->set_dcp_content_type(DCPContentType::from_index(*n));
}
}
film_changed (Film::Property::REEL_LENGTH);
film_changed (Film::Property::REENCODE_J2K);
film_changed (Film::Property::AUDIO_LANGUAGE);
+ film_changed (Film::Property::AUDIO_FRAME_RATE);
set_general_sensitivity(static_cast<bool>(_film));
}
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"));
_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()));
+ _container->add(i->container_nickname());
}
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(boost::lexical_cast<string>(i));
}
_j2k_bandwidth->SetRange (1, Config::instance()->maximum_j2k_bandwidth() / 1000000);
_frame_rate_spin->SetRange (1, 480);
- _resolution->Append (_("2K"));
- _resolution->Append (_("4K"));
+ _resolution->add(_("2K"));
+ _resolution->add(_("4K"));
add_video_panel_to_grid ();
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 ();
_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));
_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;
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));
}
void
DCPPanel::reel_type_changed ()
{
- if (!_film) {
+ if (!_film || !_reel_type->get()) {
return;
}
- _film->set_reel_type (static_cast<ReelType>(_reel_type->GetSelection()));
+ _film->set_reel_type(static_cast<ReelType>(*_reel_type->get()));
}
{
_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_processor->add(std_to_wx(ap->name()), new wxStringClientData(std_to_wx(ap->id())));
}
_audio_panel_sizer->Layout();
}
{
DCPOMATIC_ASSERT (_film->audio_language());
auto d = new LanguageTagDialog (_panel, *_film->audio_language());
- d->ShowModal ();
- _film->set_audio_language(d->get());
+ if (d->ShowModal() == wxID_OK) {
+ _film->set_audio_language(d->get());
+ }
d->Destroy ();
}
+
+void
+DCPPanel::audio_sample_rate_changed ()
+{
+ if (_audio_sample_rate) {
+ _film->set_audio_frame_rate (_audio_sample_rate->GetSelection() == 0 ? 48000 : 96000);
+ }
+}
+