Fix small DCP standard choice (#2475).
[dcpomatic.git] / src / wx / dcp_panel.cc
index 4421b81b253f47afc53ad2cb044337521785d1bd..6574bcdb314397c14f388397fc218857b9200671 100644 (file)
 #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 "language_tag_dialog.h"
 #include "markers_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)
@@ -94,8 +97,12 @@ DCPPanel::DCPPanel (wxNotebook* n, shared_ptr<Film> film, weak_ptr<FilmViewer> v
                wxALIGN_CENTRE_HORIZONTAL | wxST_NO_AUTORESIZE | wxST_ELLIPSIZE_MIDDLE
                );
 
+       _enable_audio_language = new CheckBox(_panel, _("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"));
 
@@ -104,14 +111,14 @@ DCPPanel::DCPPanel (wxNotebook* n, shared_ptr<Film> film, weak_ptr<FilmViewer> v
         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 wxSpinCtrl (_panel, wxID_ANY);
+       _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..."));
@@ -123,35 +130,90 @@ DCPPanel::DCPPanel (wxNotebook* n, shared_ptr<Film> film, weak_ptr<FilmViewer> v
        _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));
+       _encrypted->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));
        _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(&DCPPanel::enable_audio_language_toggled, this);
+       _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_type->SetToolTip(_("How the DCP should be split into parts internally.  If in doubt, choose 'Single reel'"));
 
        _reel_length->SetRange (1, 64);
 
-       _standard->Append (_("SMPTE"));
-       _standard->Append (_("Interop"));
+       add_standards();
+       _standard->SetToolTip(_("Which standard the DCP should use.  Interop is older and SMPTE is the modern 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(_("SMPTE"), N_("smpte"));
+       if (Config::instance()->allow_smpte_bv20() || (_film && _film->limit_to_smpte_bv20())) {
+               _standard->add(_("SMPTE (Bv2.0 only)"), N_("smpte-bv20"));
+       }
+       _standard->add(_("Interop"), N_("interop"));
+       _sizer->Layout();
+}
+
+
+void
+DCPPanel::set_standard()
+{
+       DCPOMATIC_ASSERT(_film);
+       DCPOMATIC_ASSERT(!_film->limit_to_smpte_bv20() || _standard->GetCount() == 3);
+
+       if (_film->interop()) {
+               checked_set(_standard, "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);
+       } else if (*data == N_("smpte")) {
+               _film->set_interop(false);
+               _film->set_limit_to_smpte_bv20(false);
+       } else if (*data == N_("smpte-bv20")) {
+               _film->set_interop(false);
+               _film->set_limit_to_smpte_bv20(true);
+       }
+}
+
+
 void
 DCPPanel::add_to_grid ()
 {
@@ -172,13 +234,22 @@ 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 | 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;
+
        add_label_to_sizer (_grid, _dcp_content_type_label, true, wxGBPosition(r, 0));
        _grid->Add (_dcp_content_type, wxGBPosition(r, 1));
        ++r;
@@ -248,13 +319,13 @@ DCPPanel::encrypted_toggled ()
 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
                );
@@ -280,41 +351,25 @@ DCPPanel::audio_channels_changed ()
                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();
 }
 
@@ -323,21 +378,11 @@ void
 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 ();
        }
@@ -429,10 +474,13 @@ DCPPanel::film_changed (Film::Property p)
                checked_set (_reencode_j2k, _film->reencode_j2k());
                break;
        case Film::Property::INTEROP:
-               checked_set (_standard, _film->interop() ? 1 : 0);
+               set_standard();
                setup_dcp_name ();
                _markers->Enable (!_film->interop());
                break;
+       case Film::Property::LIMIT_TO_SMPTE_BV20:
+               set_standard();
+               break;
        case Film::Property::AUDIO_PROCESSOR:
                if (_film->audio_processor()) {
                        checked_set (_audio_processor, _film->audio_processor()->id());
@@ -453,6 +501,20 @@ DCPPanel::film_changed (Film::Property p)
                setup_dcp_name ();
                setup_sensitivity ();
                break;
+       case Film::Property::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 ();
+               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:
@@ -477,13 +539,14 @@ void
 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::CUSTOM_RATIO ||
+           property == VideoContentProperty::CUSTOM_SIZE ||
            property == VideoContentProperty::BURNT_SUBTITLE_LANGUAGE ||
+           property == VideoContentProperty::CROP ||
            property == DCPContentProperty::REFERENCE_VIDEO ||
            property == DCPContentProperty::REFERENCE_AUDIO ||
            property == DCPContentProperty::REFERENCE_TEXT) {
@@ -525,11 +588,11 @@ DCPPanel::container_changed ()
                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]);
        }
 }
 
@@ -542,9 +605,9 @@ DCPPanel::dcp_content_type_changed ()
                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));
        }
 }
 
@@ -553,22 +616,10 @@ void
 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;
 
@@ -579,6 +630,9 @@ DCPPanel::set_film (shared_ptr<Film> film)
                return;
        }
 
+       _standard->Clear();
+       add_standards();
+
        film_changed (Film::Property::NAME);
        film_changed (Film::Property::USE_ISDCF_NAME);
        film_changed (Film::Property::CONTENT);
@@ -596,6 +650,9 @@ DCPPanel::set_film (shared_ptr<Film> film)
        film_changed (Film::Property::REEL_TYPE);
        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);
+       film_changed (Film::Property::LIMIT_TO_SMPTE_BV20);
 
        set_general_sensitivity(static_cast<bool>(_film));
 }
@@ -616,6 +673,9 @@ DCPPanel::setup_sensitivity ()
        _use_isdcf_name->Enable         (_generally_sensitive);
        _dcp_content_type->Enable       (_generally_sensitive);
        _copy_isdcf_name_button->Enable (_generally_sensitive);
+       _enable_audio_language->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);
@@ -713,6 +773,13 @@ DCPPanel::config_changed (Config::Property p)
                if (_film) {
                        film_changed (Film::Property::AUDIO_PROCESSOR);
                }
+       } else if (p == Config::ALLOW_SMPTE_BV20) {
+               _standard->Clear();
+               add_standards();
+               if (_film) {
+                       film_changed(Film::Property::INTEROP);
+                       film_changed(Film::Property::LIMIT_TO_SMPTE_BV20);
+               }
        }
 }
 
@@ -727,6 +794,7 @@ DCPPanel::setup_frame_rate_widget ()
                _frame_rate_choice->Show ();
                _frame_rate_spin->Hide ();
        }
+       _frame_rate_sizer->Layout();
 }
 
 
@@ -740,28 +808,21 @@ DCPPanel::make_video_panel ()
        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);
-
-#ifdef __WXGTK3__
-       int const spin_width = 118;
-#else
-       int const spin_width = 56;
-#endif
+       _resolution = new Choice(panel);
 
        _frame_rate_label = create_label (panel, _("Frame Rate"), true);
-       _frame_rate_choice = new wxChoice (panel, wxID_ANY);
-       _frame_rate_spin = new SpinCtrl (panel, spin_width);
-       setup_frame_rate_widget ();
+       _frame_rate_choice = new Choice(panel);
+       _frame_rate_spin = new SpinCtrl (panel, DCPOMATIC_SPIN_CTRL_WIDTH);
        _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, spin_width);
+       _j2k_bandwidth = 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"));
@@ -774,24 +835,25 @@ DCPPanel::make_video_panel ()
        /* 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));
-       _reencode_j2k->Bind      (wxEVT_CHECKBOX, boost::bind(&DCPPanel::reencode_j2k_changed, this));
+       _three_d->bind(&DCPPanel::three_d_changed, this);
+       _reencode_j2k->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 ();
+       setup_frame_rate_widget();
 
        return panel;
 }
@@ -864,19 +926,32 @@ DCPPanel::make_audio_panel ()
        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;
@@ -892,6 +967,12 @@ DCPPanel::add_audio_panel_to_grid ()
        _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;
@@ -912,11 +993,11 @@ DCPPanel::copy_isdcf_name_button_clicked ()
 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));
 }
 
@@ -928,24 +1009,19 @@ DCPPanel::show_audio_clicked ()
                return;
        }
 
-       if (_audio_dialog) {
-               _audio_dialog->Destroy ();
-               _audio_dialog = nullptr;
-       }
-
-       auto d = new AudioDialog (_panel, _film, _viewer);
-       d->Show ();
+       _audio_dialog.reset(_panel, _film, _viewer);
+       _audio_dialog->Show();
 }
 
 
 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()));
 }
 
 
@@ -963,9 +1039,43 @@ DCPPanel::reel_length_changed ()
 void
 DCPPanel::add_audio_processors ()
 {
-       _audio_processor->Append (_("None"), new wxStringClientData(N_("none")));
+       _audio_processor->add(_("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();
 }
+
+
+void
+DCPPanel::enable_audio_language_toggled ()
+{
+       setup_sensitivity ();
+       if (_enable_audio_language->GetValue()) {
+               auto al = wx_to_std (_audio_language->GetLabel());
+               _film->set_audio_language (al.empty() ? dcp::LanguageTag("en-US") : dcp::LanguageTag(al));
+       } else {
+               _film->set_audio_language (boost::none);
+       }
+}
+
+
+void
+DCPPanel::edit_audio_language_clicked ()
+{
+       DCPOMATIC_ASSERT (_film->audio_language());
+       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);
+       }
+}
+