X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fdcp_panel.cc;h=ded073152e40e1a14fe9e4e66729f82a16d4e33c;hb=9c1bb2e5ca7c80c4e26b1b2e41159aa171360a94;hp=fcec93a31f09c91898ea8dd225c955fb0d266179;hpb=27b83475435dda4e84a90cf59a52f150905c4ab1;p=dcpomatic.git

diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc
index fcec93a31..ded073152 100644
--- a/src/wx/dcp_panel.cc
+++ b/src/wx/dcp_panel.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -24,6 +24,9 @@
 #include "isdcf_metadata_dialog.h"
 #include "audio_dialog.h"
 #include "focus_manager.h"
+#include "check_box.h"
+#include "static_text.h"
+#include "check_box.h"
 #include "lib/ratio.h"
 #include "lib/config.h"
 #include "lib/dcp_content_type.h"
@@ -32,7 +35,7 @@
 #include "lib/ffmpeg_content.h"
 #include "lib/audio_processor.h"
 #include "lib/video_content.h"
-#include "lib/caption_content.h"
+#include "lib/text_content.h"
 #include "lib/dcp_content.h"
 #include "lib/audio_content.h"
 #include <dcp/locale_convert.h>
@@ -65,117 +68,68 @@ DCPPanel::DCPPanel (wxNotebook* n, boost::shared_ptr<Film> film)
 	_sizer = new wxBoxSizer (wxVERTICAL);
 	_panel->SetSizer (_sizer);
 
-	wxGridBagSizer* grid = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
-	_sizer->Add (grid, 0, wxEXPAND | wxALL, 8);
+	_grid = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+	_sizer->Add (_grid, 0, wxEXPAND | wxALL, 8);
 
-	int r = 0;
-
-	add_label_to_sizer (grid, _panel, _("Name"), true, wxGBPosition (r, 0));
+	_name_label = create_label (_panel, _("Name"), true);
 	_name = new wxTextCtrl (_panel, wxID_ANY);
-	grid->Add (_name, wxGBPosition(r, 1), wxDefaultSpan, wxEXPAND | wxLEFT | wxRIGHT);
-	++r;
-
 	FocusManager::instance()->add(_name);
 
-	int flags = wxALIGN_CENTER_VERTICAL;
-#ifdef __WXOSX__
-	flags |= wxALIGN_RIGHT;
-#endif
-
-	_use_isdcf_name = new wxCheckBox (_panel, wxID_ANY, _("Use ISDCF name"));
-	grid->Add (_use_isdcf_name, wxGBPosition (r, 0), wxDefaultSpan, flags);
-
-	{
-		wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-		_edit_isdcf_button = new wxButton (_panel, wxID_ANY, _("Details..."));
-		s->Add (_edit_isdcf_button, 1, wxEXPAND | wxRIGHT, DCPOMATIC_SIZER_X_GAP);
-		_copy_isdcf_name_button = new wxButton (_panel, wxID_ANY, _("Copy as name"));
-		s->Add (_copy_isdcf_name_button, 1, wxEXPAND | wxLEFT, DCPOMATIC_SIZER_X_GAP);
-		grid->Add (s, wxGBPosition (r, 1), wxDefaultSpan, wxEXPAND);
-		++r;
-	}
+	_use_isdcf_name = new CheckBox (_panel, _("Use ISDCF name"));
+	_edit_isdcf_button = new wxButton (_panel, wxID_ANY, _("Details..."));
+	_copy_isdcf_name_button = new wxButton (_panel, wxID_ANY, _("Copy as name"));
 
 	/* wxST_ELLIPSIZE_MIDDLE works around a bug in GTK2 and/or wxWidgets, see
 	   http://trac.wxwidgets.org/ticket/12539
 	*/
-	_dcp_name = new wxStaticText (
-		_panel, wxID_ANY, wxT (""), wxDefaultPosition, wxDefaultSize,
+	_dcp_name = new StaticText (
+		_panel, wxT (""), wxDefaultPosition, wxDefaultSize,
 		wxALIGN_CENTRE_HORIZONTAL | wxST_NO_AUTORESIZE | wxST_ELLIPSIZE_MIDDLE
 		);
 
-	grid->Add (_dcp_name, wxGBPosition(r, 0), wxGBSpan (1, 2), wxALIGN_CENTER_VERTICAL | wxEXPAND);
-	++r;
-
-	add_label_to_sizer (grid, _panel, _("Content Type"), true, wxGBPosition (r, 0));
+	_dcp_content_type_label = create_label (_panel, _("Content Type"), true);
 	_dcp_content_type = new wxChoice (_panel, wxID_ANY);
-	grid->Add (_dcp_content_type, wxGBPosition (r, 1));
-	++r;
-
-	_notebook = new wxNotebook (_panel, wxID_ANY);
-	_sizer->Add (_notebook, 1, wxEXPAND | wxTOP, 6);
-
-	_notebook->AddPage (make_video_panel (), _("Video"), false);
-	_notebook->AddPage (make_audio_panel (), _("Audio"), false);
-
-	_signed = new wxCheckBox (_panel, wxID_ANY, _("Signed"));
-	grid->Add (_signed, wxGBPosition (r, 0), wxGBSpan (1, 2));
-	++r;
 
-	_encrypted = new wxCheckBox (_panel, wxID_ANY, _("Encrypted"));
-	grid->Add (_encrypted, wxGBPosition (r, 0), wxGBSpan (1, 2));
-	++r;
+	_signed = new CheckBox (_panel, _("Signed"));
+	_encrypted = new CheckBox (_panel, _("Encrypted"));
 
         wxClientDC dc (_panel);
         wxSize size = dc.GetTextExtent (wxT ("GGGGGGGG..."));
         size.SetHeight (-1);
 
-	{
-               add_label_to_sizer (grid, _panel, _("Key"), true, wxGBPosition (r, 0));
-               wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-               _key = new wxStaticText (_panel, wxID_ANY, "", wxDefaultPosition, size);
-               s->Add (_key, 1, wxALIGN_CENTER_VERTICAL);
-               _edit_key = new wxButton (_panel, wxID_ANY, _("Edit..."));
-               s->Add (_edit_key);
-               grid->Add (s, wxGBPosition (r, 1));
-               ++r;
-	}
+	_key_label = create_label (_panel, _("Key"), true);
+	_key = new StaticText (_panel, "", wxDefaultPosition, size);
+	_edit_key = new wxButton (_panel, wxID_ANY, _("Edit..."));
 
-	add_label_to_sizer (grid, _panel, _("Reels"), true, wxGBPosition (r, 0));
+	_reels_label = create_label (_panel, _("Reels"), true);
 	_reel_type = new wxChoice (_panel, wxID_ANY);
-	grid->Add (_reel_type, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
-	++r;
-
-	add_label_to_sizer (grid, _panel, _("Reel length"), true, wxGBPosition (r, 0));
 
-	{
-		wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-		_reel_length = new wxSpinCtrl (_panel, wxID_ANY);
-		s->Add (_reel_length);
-		add_label_to_sizer (s, _panel, _("GB"), false);
-		grid->Add (s, wxGBPosition (r, 1));
-		++r;
-	}
+	_reel_length_label = create_label (_panel, _("Reel length"), true);
+	_reel_length = new wxSpinCtrl (_panel, wxID_ANY);
+	_reel_length_gb_label = create_label (_panel, _("GB"), false);
 
-	add_label_to_sizer (grid, _panel, _("Standard"), true, wxGBPosition (r, 0));
+	_standard_label = create_label (_panel, _("Standard"), true);
 	_standard = new wxChoice (_panel, wxID_ANY);
-	grid->Add (_standard, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
-	++r;
 
-	_upload_after_make_dcp = new wxCheckBox (_panel, wxID_ANY, _("Upload DCP to TMS after it is made"));
-	grid->Add (_upload_after_make_dcp, wxGBPosition (r, 0), wxGBSpan (1, 2));
-	++r;
+	_upload_after_make_dcp = new CheckBox (_panel, _("Upload DCP to TMS after it is made"));
+
+	_notebook = new wxNotebook (_panel, wxID_ANY);
+	_sizer->Add (_notebook, 1, wxEXPAND | wxTOP, 6);
+
+	_notebook->AddPage (make_video_panel (), _("Video"), false);
+	_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));
 	_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));
+	_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_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));
+	_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));
 
 	BOOST_FOREACH (DCPContentType const * i, DCPContentType::all()) {
@@ -192,7 +146,105 @@ DCPPanel::DCPPanel (wxNotebook* n, boost::shared_ptr<Film> film)
 	_standard->Append (_("SMPTE"));
 	_standard->Append (_("Interop"));
 
-	Config::instance()->Changed.connect (boost::bind (&DCPPanel::config_changed, this));
+	Config::instance()->Changed.connect (boost::bind (&DCPPanel::config_changed, this, _1));
+
+	add_to_grid ();
+}
+
+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));
+	_grid->Add (_name, wxGBPosition(r, 1), wxDefaultSpan, wxEXPAND | wxLEFT | wxRIGHT);
+	++r;
+
+	int flags = wxALIGN_CENTER_VERTICAL;
+#ifdef __WXOSX__
+	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 (_dcp_name, wxGBPosition(r, 0), wxGBSpan (1, 2), wxALIGN_CENTER_VERTICAL | wxEXPAND);
+	++r;
+
+	add_label_to_sizer (_grid, _dcp_content_type_label, true, wxGBPosition (r, 0));
+	_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;
+
+
+	_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);
+	_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;
+	}
 }
 
 void
@@ -398,6 +450,9 @@ DCPPanel::film_changed (int p)
 		checked_set (_three_d, _film->three_d ());
 		setup_dcp_name ();
 		break;
+	case Film::REENCODE_J2K:
+		checked_set (_reencode_j2k, _film->reencode_j2k());
+		break;
 	case Film::INTEROP:
 		checked_set (_standard, _film->interop() ? 1 : 0);
 		setup_dcp_name ();
@@ -433,12 +488,12 @@ void
 DCPPanel::film_content_changed (int property)
 {
 	if (property == AudioContentProperty::STREAMS ||
-	    property == CaptionContentProperty::USE ||
-	    property == CaptionContentProperty::BURN ||
+	    property == TextContentProperty::USE ||
+	    property == TextContentProperty::BURN ||
 	    property == VideoContentProperty::SCALE ||
 	    property == DCPContentProperty::REFERENCE_VIDEO ||
 	    property == DCPContentProperty::REFERENCE_AUDIO ||
-	    property == DCPContentProperty::REFERENCE_SUBTITLE) {
+	    property == DCPContentProperty::REFERENCE_TEXT) {
 		setup_dcp_name ();
 		setup_sensitivity ();
 	}
@@ -529,6 +584,7 @@ DCPPanel::set_film (shared_ptr<Film> film)
 	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));
 }
@@ -624,10 +680,35 @@ DCPPanel::three_d_changed ()
 }
 
 void
-DCPPanel::config_changed ()
+DCPPanel::reencode_j2k_changed ()
+{
+	if (!_film) {
+		return;
+	}
+
+	_film->set_reencode_j2k (_reencode_j2k->GetValue());
+}
+
+void
+DCPPanel::config_changed (Config::Property p)
 {
 	_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 ();
+	}
 }
 
 void
@@ -649,81 +730,111 @@ DCPPanel::make_video_panel ()
 {
 	wxPanel* panel = new wxPanel (_notebook);
 	wxSizer* sizer = new wxBoxSizer (wxVERTICAL);
-	wxGridBagSizer* grid = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
-	sizer->Add (grid, 0, wxALL, 8);
+	_video_grid = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+	sizer->Add (_video_grid, 0, wxALL, 8);
 	panel->SetSizer (sizer);
 
+	_container_label = create_label (panel, _("Container"), true);
+	_container = new wxChoice (panel, wxID_ANY);
+	_container_size = new StaticText (panel, wxT (""));
+
+	_resolution_label = create_label (panel, _("Resolution"), true);
+	_resolution = new wxChoice (panel, wxID_ANY);
+
+	_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 wxButton (panel, wxID_ANY, _("Use best"));
+	_frame_rate_sizer->Add (_best_frame_rate, 1, wxALIGN_CENTER_VERTICAL);
+
+	_three_d = new CheckBox (panel, _("3D"));
+
+	_j2k_bandwidth_label = create_label (panel, _("JPEG2000 bandwidth\nfor newly-encoded data"), true);
+	_j2k_bandwidth = new wxSpinCtrl (panel, wxID_ANY);
+	_mbits_label = create_label (panel, _("Mbit/s"), false);
+
+	_reencode_j2k = new CheckBox (panel, _("Re-encode JPEG2000 data from input"));
+
+	_container->Bind	 (wxEVT_CHOICE,	  boost::bind(&DCPPanel::container_changed, this));
+	_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));
+	/* 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));
+
+	BOOST_FOREACH (Ratio const * i, Ratio::containers()) {
+		_container->Append (std_to_wx(i->container_nickname()));
+	}
+
+	BOOST_FOREACH (int i, Config::instance()->allowed_dcp_frame_rates()) {
+		_frame_rate_choice->Append (std_to_wx (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"));
+
+	add_video_panel_to_grid ();
+
+	return panel;
+}
+
+void
+DCPPanel::add_video_panel_to_grid ()
+{
+	bool const full = Config::instance()->interface_complexity() == Config::INTERFACE_FULL;
+
 	int r = 0;
 
-	add_label_to_sizer (grid, panel, _("Container"), true, wxGBPosition (r, 0));
+	add_label_to_sizer (_video_grid, _container_label, true, wxGBPosition (r, 0));
 	{
 		wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-		_container = new wxChoice (panel, wxID_ANY);
 		s->Add (_container, 1, wxEXPAND | wxRIGHT, DCPOMATIC_SIZER_X_GAP);
-		_container_size = new wxStaticText (panel, wxID_ANY, wxT (""));
 		s->Add (_container_size, 1, wxLEFT | wxALIGN_CENTER_VERTICAL);
-		grid->Add (s, wxGBPosition (r,1 ), wxDefaultSpan, wxEXPAND);
+		_video_grid->Add (s, wxGBPosition(r, 1));
 		++r;
 	}
 
-	add_label_to_sizer (grid, panel, _("Resolution"), true, wxGBPosition (r, 0));
-	_resolution = new wxChoice (panel, wxID_ANY);
-	grid->Add (_resolution, wxGBPosition (r, 1));
+	add_label_to_sizer (_video_grid, _resolution_label, true, wxGBPosition (r, 0));
+	_video_grid->Add (_resolution, wxGBPosition (r, 1));
 	++r;
 
-	add_label_to_sizer (grid, panel, _("Frame Rate"), true, wxGBPosition (r, 0));
+	add_label_to_sizer (_video_grid, _frame_rate_label, true, wxGBPosition (r, 0));
 	{
 		_frame_rate_sizer = new wxBoxSizer (wxHORIZONTAL);
-		_frame_rate_choice = new wxChoice (panel, wxID_ANY);
 		_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 wxButton (panel, wxID_ANY, _("Use best"));
 		_frame_rate_sizer->Add (_best_frame_rate, 1, wxALIGN_CENTER_VERTICAL);
-		grid->Add (_frame_rate_sizer, wxGBPosition (r, 1));
+		_video_grid->Add (_frame_rate_sizer, wxGBPosition (r, 1));
 		++r;
 	}
 
-	_three_d = new wxCheckBox (panel, wxID_ANY, _("3D"));
-	grid->Add (_three_d, wxGBPosition (r, 0), wxGBSpan (1, 2));
+	_video_grid->Add (_three_d, wxGBPosition (r, 0), wxGBSpan (1, 2));
 	++r;
 
-	{
-		add_label_to_sizer (grid, panel, _("JPEG2000 bandwidth\nfor newly-encoded data"), true, wxGBPosition (r, 0));
+	_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);
-		_j2k_bandwidth = new wxSpinCtrl (panel, wxID_ANY);
 		s->Add (_j2k_bandwidth, 1);
-		add_label_to_sizer (s, panel, _("Mbit/s"), false);
-		grid->Add (s, wxGBPosition (r, 1));
-	}
-	++r;
-
-	_container->Bind	(wxEVT_CHOICE,	      boost::bind (&DCPPanel::container_changed, this));
-	_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));
-	/* 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));
-
-	BOOST_FOREACH (Ratio const * i, Ratio::containers()) {
-		_container->Append (std_to_wx(i->container_nickname()));
-	}
-
-	BOOST_FOREACH (int i, Config::instance()->allowed_dcp_frame_rates()) {
-		_frame_rate_choice->Append (std_to_wx (boost::lexical_cast<string> (i)));
+		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));
 	}
-
-	_j2k_bandwidth->SetRange (1, Config::instance()->maximum_j2k_bandwidth() / 1000000);
-	_frame_rate_spin->SetRange (1, 480);
-
-	_resolution->Append (_("2K"));
-	_resolution->Append (_("4K"));
-
-	return panel;
 }
 
 int
@@ -746,38 +857,61 @@ DCPPanel::make_audio_panel ()
 {
 	wxPanel* panel = new wxPanel (_notebook);
 	wxSizer* sizer = new wxBoxSizer (wxVERTICAL);
-	wxGridBagSizer* grid = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
-	sizer->Add (grid, 0, wxALL, 8);
+	_audio_grid = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+	sizer->Add (_audio_grid, 0, wxALL, 8);
 	panel->SetSizer (sizer);
 
-	int r = 0;
-
-	add_label_to_sizer (grid, panel, _("Channels"), true, wxGBPosition (r, 0));
+	_channels_label = create_label (panel, _("Channels"), true);
 	_audio_channels = new wxChoice (panel, wxID_ANY);
 	setup_audio_channels_choice (_audio_channels, minimum_allowed_audio_channels ());
-	grid->Add (_audio_channels, wxGBPosition (r, 1));
-	++r;
 
-	add_label_to_sizer (grid, panel, _("Processor"), true, wxGBPosition (r, 0));
+	_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 ())));
 	}
-	grid->Add (_audio_processor, wxGBPosition (r, 1));
-	++r;
 
 	_show_audio = new wxButton (panel, wxID_ANY, _("Show audio..."));
-	grid->Add (_show_audio, wxGBPosition (r, 0), wxGBSpan (1, 2));
-	++r;
 
 	_audio_channels->Bind (wxEVT_CHOICE, boost::bind (&DCPPanel::audio_channels_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));
 
+	add_audio_panel_to_grid ();
+
 	return panel;
 }
 
+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);
+
+	if (full) {
+		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;
+}
+
 void
 DCPPanel::copy_isdcf_name_button_clicked ()
 {