Simplify Controls API slightly.

3 files changed, 4 insertions, 15 deletions

diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index a01d5ecae..497182dde 100644
--- a/src/tools/dcpomatic_player.cc
+++ b/src/tools/dcpomatic_player.cc
@@ -161,7 +161,7 @@ public:
 		_overall_panel = new wxPanel (this, wxID_ANY);
 
 		_viewer.reset (new FilmViewer (_overall_panel));
-		_controls = new Controls (_overall_panel, _viewer, false, false, false);
+		_controls = new Controls (_overall_panel, _viewer, false);
 		_viewer->set_dcp_decode_reduction (Config::instance()->decode_reduction ());
 		_viewer->PlaybackPermitted.connect (bind(&DOMFrame::playback_permitted, this));
 		_viewer->Started.connect (bind(&DOMFrame::playback_started, this, _1));
diff --git a/src/wx/controls.cc b/src/wx/controls.cc
index 2802008fa..4ad1f6c23 100644
--- a/src/wx/controls.cc
+++ b/src/wx/controls.cc
@@ -33,10 +33,7 @@ using boost::optional;
 using boost::shared_ptr;
 using boost::weak_ptr;
 
-/** @param outline_content true if viewer should present an "outline content" checkbox.
- *  @param jump_to_selected true if viewer should present a "jump to selected" checkbox.
- */
-Controls::Controls (wxWindow* parent, shared_ptr<FilmViewer> viewer, bool outline_content, bool jump_to_selected, bool eye, bool dcp_directory)
+Controls::Controls (wxWindow* parent, shared_ptr<FilmViewer> viewer, bool editor_controls, bool dcp_directory)
 	: wxPanel (parent)
 	, _viewer (viewer)
 	, _slider_being_moved (false)
@@ -62,20 +59,14 @@ Controls::Controls (wxWindow* parent, shared_ptr<FilmViewer> viewer, bool outlin
 	SetSizer (_v_sizer);
 
 	wxBoxSizer* view_options = new wxBoxSizer (wxHORIZONTAL);
-	if (outline_content) {
+	if (editor_controls) {
 		_outline_content = new wxCheckBox (this, wxID_ANY, _("Outline content"));
 		view_options->Add (_outline_content, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_GAP);
-	}
-
-	if (eye) {
 		_eye = new wxChoice (this, wxID_ANY);
 		_eye->Append (_("Left"));
 		_eye->Append (_("Right"));
 		_eye->SetSelection (0);
 		view_options->Add (_eye, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_GAP);
-	}
-
-	if (jump_to_selected) {
 		_jump_to_selected = new wxCheckBox (this, wxID_ANY, _("Jump to selected content"));
 		view_options->Add (_jump_to_selected, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_GAP);
 	}
diff --git a/src/wx/controls.h b/src/wx/controls.h
index 652e71f16..5cfe96e3d 100644
--- a/src/wx/controls.h
+++ b/src/wx/controls.h
@@ -39,9 +39,7 @@ public:
 	Controls (
 		wxWindow* parent,
 		boost::shared_ptr<FilmViewer>,
-		bool outline_content = true,
-		bool jump_to_selected = true,
-		bool eyes = true,
+		bool editor_controls = true,
 		bool dcp_directory = false
 		);