White space: controls.{cc,h}

2 files changed, 152 insertions, 152 deletions

diff --git a/src/wx/controls.cc b/src/wx/controls.cc
index a452e1d13..57adeb34b 100644
--- a/src/wx/controls.cc
+++ b/src/wx/controls.cc
@@ -66,148 +66,148 @@ using namespace dcpomatic;
 
 
 Controls::Controls(wxWindow* parent, FilmViewer& viewer, bool editor_controls)
-	: wxPanel (parent)
-	, _markers (new MarkersPanel(this, viewer))
-	, _slider (new wxSlider(this, wxID_ANY, 0, 0, 4096))
-	, _viewer (viewer)
+	: wxPanel(parent)
+	, _markers(new MarkersPanel(this, viewer))
+	, _slider(new wxSlider(this, wxID_ANY, 0, 0, 4096))
+	, _viewer(viewer)
 	, _rewind_button(new Button(this, char_to_wx("|<")))
 	, _back_button(new Button(this, char_to_wx("<")))
 	, _forward_button(new Button(this, char_to_wx(">")))
 	, _frame_number(new StaticText(this, {}))
 	, _timecode(new StaticText(this, {}))
-	, _timer (this)
+	, _timer(this)
 {
-	_v_sizer = new wxBoxSizer (wxVERTICAL);
-	SetSizer (_v_sizer);
+	_v_sizer = new wxBoxSizer(wxVERTICAL);
+	SetSizer(_v_sizer);
 
-	auto view_options = new wxBoxSizer (wxHORIZONTAL);
+	auto view_options = new wxBoxSizer(wxHORIZONTAL);
 	if (editor_controls) {
-		_outline_content = new CheckBox (this, _("Outline content"));
-		view_options->Add (_outline_content, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_GAP);
-		_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);
-		_jump_to_selected = new CheckBox (this, _("Jump to selected content"));
-		view_options->Add (_jump_to_selected, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_GAP);
+		_outline_content = new CheckBox(this, _("Outline content"));
+		view_options->Add(_outline_content, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_GAP);
+		_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);
+		_jump_to_selected = new CheckBox(this, _("Jump to selected content"));
+		view_options->Add(_jump_to_selected, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_GAP);
 	}
 
-	_v_sizer->Add (view_options, 0, wxALL, DCPOMATIC_SIZER_GAP);
+	_v_sizer->Add(view_options, 0, wxALL, DCPOMATIC_SIZER_GAP);
 
-	auto h_sizer = new wxBoxSizer (wxHORIZONTAL);
+	auto h_sizer = new wxBoxSizer(wxHORIZONTAL);
 
-	auto time_sizer = new wxBoxSizer (wxVERTICAL);
-	time_sizer->Add (_frame_number, 0, wxEXPAND);
-	time_sizer->Add (_timecode, 0, wxEXPAND);
+	auto time_sizer = new wxBoxSizer(wxVERTICAL);
+	time_sizer->Add(_frame_number, 0, wxEXPAND);
+	time_sizer->Add(_timecode, 0, wxEXPAND);
 
-	h_sizer->Add (_rewind_button, 0, wxALL | wxALIGN_CENTER_VERTICAL, 2);
-	h_sizer->Add (time_sizer, 0, wxALL | wxALIGN_CENTER_VERTICAL, 2);
-	h_sizer->Add (_back_button, 0, wxALL | wxALIGN_CENTER_VERTICAL, 2);
-	h_sizer->Add (_forward_button, 0, wxALL | wxALIGN_CENTER_VERTICAL, 2);
+	h_sizer->Add(_rewind_button, 0, wxALL | wxALIGN_CENTER_VERTICAL, 2);
+	h_sizer->Add(time_sizer, 0, wxALL | wxALIGN_CENTER_VERTICAL, 2);
+	h_sizer->Add(_back_button, 0, wxALL | wxALIGN_CENTER_VERTICAL, 2);
+	h_sizer->Add(_forward_button, 0, wxALL | wxALIGN_CENTER_VERTICAL, 2);
 
-	_button_sizer = new wxBoxSizer (wxHORIZONTAL);
+	_button_sizer = new wxBoxSizer(wxHORIZONTAL);
 	h_sizer->Add(_button_sizer, 0, wxEXPAND | wxRIGHT, DCPOMATIC_SIZER_GAP);
 
 	{
-		auto box = new wxBoxSizer (wxVERTICAL);
-		box->Add (_markers, 0, wxEXPAND);
-		box->Add (_slider, 0, wxEXPAND);
-		h_sizer->Add (box, 1, wxEXPAND);
+		auto box = new wxBoxSizer(wxVERTICAL);
+		box->Add(_markers, 0, wxEXPAND);
+		box->Add(_slider, 0, wxEXPAND);
+		h_sizer->Add(box, 1, wxEXPAND);
 	}
 
-	_v_sizer->Add (h_sizer, 0, wxEXPAND | wxALL, 6);
+	_v_sizer->Add(h_sizer, 0, wxEXPAND | wxALL, 6);
 
 #ifdef __WXGTK3__
-	_frame_number->SetMinSize (wxSize(100, -1));
-	_rewind_button->SetMinSize (wxSize(48, -1));
-	_back_button->SetMinSize (wxSize(48, -1));
-	_forward_button->SetMinSize (wxSize(48, -1));
+	_frame_number->SetMinSize(wxSize(100, -1));
+	_rewind_button->SetMinSize(wxSize(48, -1));
+	_back_button->SetMinSize(wxSize(48, -1));
+	_forward_button->SetMinSize(wxSize(48, -1));
 #else
-	_frame_number->SetMinSize (wxSize (84, -1));
-	_rewind_button->SetMinSize (wxSize (32, -1));
-	_back_button->SetMinSize (wxSize (32, -1));
-	_forward_button->SetMinSize (wxSize (32, -1));
+	_frame_number->SetMinSize(wxSize(84, -1));
+	_rewind_button->SetMinSize(wxSize(32, -1));
+	_back_button->SetMinSize(wxSize(32, -1));
+	_forward_button->SetMinSize(wxSize(32, -1));
 #endif
 
 	if (_eye) {
-		_eye->Bind (wxEVT_CHOICE, boost::bind (&Controls::eye_changed, this));
+		_eye->Bind(wxEVT_CHOICE, boost::bind(&Controls::eye_changed, this));
 	}
 	if (_outline_content) {
 		_outline_content->bind(&Controls::outline_content_changed, this);
 	}
 
-	_slider->Bind           (wxEVT_SCROLL_THUMBTRACK,    boost::bind(&Controls::slider_moved,    this, false));
-	_slider->Bind           (wxEVT_SCROLL_PAGEUP,        boost::bind(&Controls::slider_moved,    this, true));
-	_slider->Bind           (wxEVT_SCROLL_PAGEDOWN,      boost::bind(&Controls::slider_moved,    this, true));
-	_slider->Bind           (wxEVT_SCROLL_THUMBRELEASE,  boost::bind(&Controls::slider_released, this));
-	_rewind_button->Bind    (wxEVT_LEFT_DOWN,            boost::bind(&Controls::rewind_clicked,  this, _1));
-	_back_button->Bind      (wxEVT_LEFT_DOWN,            boost::bind(&Controls::back_clicked,    this, _1));
-	_back_button->Bind      (wxEVT_LEFT_DCLICK,          boost::bind(&Controls::back_clicked,    this, _1));
-	_forward_button->Bind   (wxEVT_LEFT_DOWN,            boost::bind(&Controls::forward_clicked, this, _1));
-	_forward_button->Bind   (wxEVT_LEFT_DCLICK,          boost::bind(&Controls::forward_clicked, this, _1));
-	_frame_number->Bind     (wxEVT_LEFT_DOWN,            boost::bind(&Controls::frame_number_clicked, this));
-	_timecode->Bind         (wxEVT_LEFT_DOWN,            boost::bind(&Controls::timecode_clicked, this));
+	_slider->Bind          (wxEVT_SCROLL_THUMBTRACK,    boost::bind(&Controls::slider_moved,    this, false));
+	_slider->Bind          (wxEVT_SCROLL_PAGEUP,        boost::bind(&Controls::slider_moved,    this, true));
+	_slider->Bind          (wxEVT_SCROLL_PAGEDOWN,      boost::bind(&Controls::slider_moved,    this, true));
+	_slider->Bind          (wxEVT_SCROLL_THUMBRELEASE,  boost::bind(&Controls::slider_released, this));
+	_rewind_button->Bind   (wxEVT_LEFT_DOWN,            boost::bind(&Controls::rewind_clicked,  this, _1));
+	_back_button->Bind     (wxEVT_LEFT_DOWN,            boost::bind(&Controls::back_clicked,    this, _1));
+	_back_button->Bind     (wxEVT_LEFT_DCLICK,          boost::bind(&Controls::back_clicked,    this, _1));
+	_forward_button->Bind  (wxEVT_LEFT_DOWN,            boost::bind(&Controls::forward_clicked, this, _1));
+	_forward_button->Bind  (wxEVT_LEFT_DCLICK,          boost::bind(&Controls::forward_clicked, this, _1));
+	_frame_number->Bind    (wxEVT_LEFT_DOWN,            boost::bind(&Controls::frame_number_clicked, this));
+	_timecode->Bind        (wxEVT_LEFT_DOWN,            boost::bind(&Controls::timecode_clicked, this));
 	if (_jump_to_selected) {
 		_jump_to_selected->bind(&Controls::jump_to_selected_clicked, this);
-		_jump_to_selected->SetValue (Config::instance()->jump_to_selected ());
+		_jump_to_selected->SetValue(Config::instance()->jump_to_selected());
 	}
 
-	viewer.Started.connect (boost::bind(&Controls::started, this));
-	viewer.Stopped.connect (boost::bind(&Controls::stopped, this));
+	viewer.Started.connect(boost::bind(&Controls::started, this));
+	viewer.Stopped.connect(boost::bind(&Controls::stopped, this));
 
-	Bind (wxEVT_TIMER, boost::bind(&Controls::update_position, this));
-	_timer.Start (80, wxTIMER_CONTINUOUS);
+	Bind(wxEVT_TIMER, boost::bind(&Controls::update_position, this));
+	_timer.Start(80, wxTIMER_CONTINUOUS);
 
 	set_film(viewer.film());
 
-	JobManager::instance()->ActiveJobsChanged.connect (
-		bind (&Controls::active_jobs_changed, this, _2)
+	JobManager::instance()->ActiveJobsChanged.connect(
+		bind(&Controls::active_jobs_changed, this, _2)
 		);
 
-	_config_changed_connection = Config::instance()->Changed.connect (bind(&Controls::config_changed, this, _1));
+	_config_changed_connection = Config::instance()->Changed.connect(bind(&Controls::config_changed, this, _1));
 }
 
 void
-Controls::config_changed (int)
+Controls::config_changed(int)
 {
-	setup_sensitivity ();
+	setup_sensitivity();
 }
 
 
 void
-Controls::started ()
+Controls::started()
 {
-	setup_sensitivity ();
+	setup_sensitivity();
 }
 
 
 void
-Controls::stopped ()
+Controls::stopped()
 {
-	setup_sensitivity ();
+	setup_sensitivity();
 }
 
 
 void
-Controls::update_position ()
+Controls::update_position()
 {
 	if (!_slider_being_moved && !_viewer.pending_idle_get()) {
-		update_position_label ();
-		update_position_slider ();
+		update_position_label();
+		update_position_slider();
 	}
 }
 
 
 void
-Controls::eye_changed ()
+Controls::eye_changed()
 {
 	_viewer.set_eyes(_eye->GetSelection() == 0 ? Eyes::LEFT : Eyes::RIGHT);
 }
 
 
 void
-Controls::outline_content_changed ()
+Controls::outline_content_changed()
 {
 	_viewer.set_outline_content(_outline_content->GetValue());
 }
@@ -215,7 +215,7 @@ Controls::outline_content_changed ()
 
 /** @param page true if this was a PAGEUP/PAGEDOWN event for which we won't receive a THUMBRELEASE */
 void
-Controls::slider_moved (bool page)
+Controls::slider_moved(bool page)
 {
 	if (!_film) {
 		return;
@@ -227,23 +227,23 @@ Controls::slider_moved (bool page)
 		_slider_being_moved = true;
 	}
 
-	DCPTime t (_slider->GetValue() * _film->length().get() / 4096);
-	t = t.round (_film->video_frame_rate());
+	DCPTime t(_slider->GetValue() * _film->length().get() / 4096);
+	t = t.round(_film->video_frame_rate());
 	/* Ensure that we hit the end of the film at the end of the slider.  In particular, we
 	   need to do an accurate seek in case there isn't a keyframe near the end.
 	*/
 	bool accurate = false;
-	if (t >= _film->length ()) {
+	if (t >= _film->length()) {
 		t = _film->length() - _viewer.one_video_frame();
 		accurate = true;
 	}
 	_viewer.seek(t, accurate);
-	update_position_label ();
+	update_position_label();
 }
 
 
 void
-Controls::slider_released ()
+Controls::slider_released()
 {
 	if (!_film) {
 		return;
@@ -256,26 +256,26 @@ Controls::slider_released ()
 
 
 void
-Controls::update_position_slider ()
+Controls::update_position_slider()
 {
 	if (!_film) {
-		_slider->SetValue (0);
+		_slider->SetValue(0);
 		return;
 	}
 
-	auto const len = _film->length ();
+	auto const len = _film->length();
 
-	if (len.get ()) {
+	if (len.get()) {
 		int const new_slider_position = 4096 * _viewer.position().get() / len.get();
 		if (new_slider_position != _slider->GetValue()) {
-			_slider->SetValue (new_slider_position);
+			_slider->SetValue(new_slider_position);
 		}
 	}
 }
 
 
 void
-Controls::update_position_label ()
+Controls::update_position_label()
 {
 	if (!_film) {
 		checked_set(_frame_number, char_to_wx("0"));
@@ -283,7 +283,7 @@ Controls::update_position_label ()
 		return;
 	}
 
-	double const fps = _film->video_frame_rate ();
+	double const fps = _film->video_frame_rate();
 	/* Count frame number from 1 ... not sure if this is the best idea */
 	checked_set(_frame_number, wxString::Format(char_to_wx("%ld"), lrint(_viewer.position().seconds() * fps) + 1));
 	checked_set(_timecode, time_to_timecode(_viewer.position(), fps));
@@ -291,24 +291,24 @@ Controls::update_position_label ()
 
 
 void
-Controls::active_jobs_changed (optional<string> j)
+Controls::active_jobs_changed(optional<string> j)
 {
 	_active_job = j;
-	setup_sensitivity ();
+	setup_sensitivity();
 }
 
 
 DCPTime
-Controls::nudge_amount (wxKeyboardState& ev)
+Controls::nudge_amount(wxKeyboardState& ev)
 {
 	auto amount = _viewer.one_video_frame();
 
 	if (ev.ShiftDown() && !ev.ControlDown()) {
-		amount = DCPTime::from_seconds (1);
+		amount = DCPTime::from_seconds(1);
 	} else if (!ev.ShiftDown() && ev.ControlDown()) {
-		amount = DCPTime::from_seconds (10);
+		amount = DCPTime::from_seconds(10);
 	} else if (ev.ShiftDown() && ev.ControlDown()) {
-		amount = DCPTime::from_seconds (60);
+		amount = DCPTime::from_seconds(60);
 	}
 
 	return amount;
@@ -316,7 +316,7 @@ Controls::nudge_amount (wxKeyboardState& ev)
 
 
 void
-Controls::rewind_clicked (wxMouseEvent& ev)
+Controls::rewind_clicked(wxMouseEvent& ev)
 {
 	_viewer.seek(DCPTime(), true);
 	ev.Skip();
@@ -324,61 +324,61 @@ Controls::rewind_clicked (wxMouseEvent& ev)
 
 
 void
-Controls::back_frame ()
+Controls::back_frame()
 {
 	_viewer.seek_by(-_viewer.one_video_frame(), true);
 }
 
 
 void
-Controls::forward_frame ()
+Controls::forward_frame()
 {
 	_viewer.seek_by(_viewer.one_video_frame(), true);
 }
 
 
 void
-Controls::back_clicked (wxKeyboardState& ev)
+Controls::back_clicked(wxKeyboardState& ev)
 {
 	_viewer.seek_by(-nudge_amount(ev), true);
 }
 
 
 void
-Controls::forward_clicked (wxKeyboardState& ev)
+Controls::forward_clicked(wxKeyboardState& ev)
 {
 	_viewer.seek_by(nudge_amount(ev), true);
 }
 
 
 void
-Controls::setup_sensitivity ()
+Controls::setup_sensitivity()
 {
 	/* examine content is the only job which stops the viewer working */
 	bool const active_job = _active_job && *_active_job != "examine_content";
 	bool const c = _film && !_film->content().empty() && !active_job;
 
-	_slider->Enable (c);
-	_rewind_button->Enable (c);
-	_back_button->Enable (c);
-	_forward_button->Enable (c);
+	_slider->Enable(c);
+	_rewind_button->Enable(c);
+	_back_button->Enable(c);
+	_forward_button->Enable(c);
 	if (_outline_content) {
-		_outline_content->Enable (c);
+		_outline_content->Enable(c);
 	}
-	_frame_number->Enable (c);
-	_timecode->Enable (c);
+	_frame_number->Enable(c);
+	_timecode->Enable(c);
 	if (_jump_to_selected) {
-		_jump_to_selected->Enable (c);
+		_jump_to_selected->Enable(c);
 	}
 
 	if (_eye) {
-		_eye->Enable (c && _film->three_d ());
+		_eye->Enable(c && _film->three_d());
 	}
 }
 
 
 void
-Controls::timecode_clicked ()
+Controls::timecode_clicked()
 {
 	PlayheadToTimecodeDialog dialog(this, _viewer.position(), _film->video_frame_rate());
 
@@ -389,7 +389,7 @@ Controls::timecode_clicked ()
 
 
 void
-Controls::frame_number_clicked ()
+Controls::frame_number_clicked()
 {
 	PlayheadToFrameDialog dialog(this, _viewer.position(), _film->video_frame_rate());
 
@@ -400,14 +400,14 @@ Controls::frame_number_clicked ()
 
 
 void
-Controls::jump_to_selected_clicked ()
+Controls::jump_to_selected_clicked()
 {
-	Config::instance()->set_jump_to_selected (_jump_to_selected->GetValue ());
+	Config::instance()->set_jump_to_selected(_jump_to_selected->GetValue());
 }
 
 
 void
-Controls::set_film (shared_ptr<Film> film)
+Controls::set_film(shared_ptr<Film> film)
 {
 	if (_film == film) {
 		return;
@@ -415,21 +415,21 @@ Controls::set_film (shared_ptr<Film> film)
 
 	_film = film;
 
-	_markers->set_film (_film);
+	_markers->set_film(_film);
 
 	if (_film) {
-		_film_change_connection = _film->Change.connect (boost::bind(&Controls::film_change, this, _1, _2));
+		_film_change_connection = _film->Change.connect(boost::bind(&Controls::film_change, this, _1, _2));
 	}
 
-	setup_sensitivity ();
+	setup_sensitivity();
 
-	update_position_slider ();
-	update_position_label ();
+	update_position_slider();
+	update_position_label();
 }
 
 
 shared_ptr<Film>
-Controls::film () const
+Controls::film() const
 {
 	return _film;
 }
@@ -440,20 +440,20 @@ Controls::film_change(ChangeType type, FilmProperty p)
 {
 	if (type == ChangeType::DONE) {
 		if (p == FilmProperty::CONTENT) {
-			setup_sensitivity ();
-			update_position_label ();
-			update_position_slider ();
+			setup_sensitivity();
+			update_position_label();
+			update_position_slider();
 		} else if (p == FilmProperty::THREE_D) {
-			setup_sensitivity ();
+			setup_sensitivity();
 		}
 	}
 }
 
 
 void
-Controls::seek (int slider)
+Controls::seek(int slider)
 {
-	_slider->SetValue (slider);
-	slider_moved (false);
-	slider_released ();
+	_slider->SetValue(slider);
+	slider_moved(false);
+	slider_released();
 }
diff --git a/src/wx/controls.h b/src/wx/controls.h
index 75bae9bb3..109109f2c 100644
--- a/src/wx/controls.h
+++ b/src/wx/controls.h
@@ -54,28 +54,28 @@ namespace dcp {
 class Controls : public wxPanel
 {
 public:
-	Controls (
+	Controls(
 		wxWindow* parent,
 		FilmViewer &,
 		bool editor_controls = true
 		);
 
-	void set_film (std::shared_ptr<Film> film);
+	void set_film(std::shared_ptr<Film> film);
 
-	virtual void play () {};
-	virtual void stop () {};
-	void seek (int slider);
+	virtual void play() {};
+	virtual void stop() {};
+	void seek(int slider);
 
-	std::shared_ptr<Film> film () const;
-	void back_frame ();
-	void forward_frame ();
+	std::shared_ptr<Film> film() const;
+	void back_frame();
+	void forward_frame();
 
 protected:
 
-	virtual void started ();
-	virtual void stopped ();
-	virtual void setup_sensitivity ();
-	virtual void config_changed (int property);
+	virtual void started();
+	virtual void stopped();
+	virtual void setup_sensitivity();
+	virtual void config_changed(int property);
 
 	wxSizer* _v_sizer;
 	wxBoxSizer* _button_sizer;
@@ -87,22 +87,22 @@ protected:
 
 private:
 
-	void update_position_label ();
-	void update_position_slider ();
-	void rewind_clicked (wxMouseEvent &);
-	void back_clicked (wxKeyboardState& s);
-	void forward_clicked (wxKeyboardState &);
-	void slider_moved (bool page);
-	void slider_released ();
-	void frame_number_clicked ();
-	void jump_to_selected_clicked ();
-	void timecode_clicked ();
-	void active_jobs_changed (boost::optional<std::string>);
-	dcpomatic::DCPTime nudge_amount (wxKeyboardState& ev);
-	void image_changed (std::weak_ptr<PlayerVideo>);
-	void outline_content_changed ();
-	void eye_changed ();
-	void update_position ();
+	void update_position_label();
+	void update_position_slider();
+	void rewind_clicked(wxMouseEvent &);
+	void back_clicked(wxKeyboardState& s);
+	void forward_clicked(wxKeyboardState &);
+	void slider_moved(bool page);
+	void slider_released();
+	void frame_number_clicked();
+	void jump_to_selected_clicked();
+	void timecode_clicked();
+	void active_jobs_changed(boost::optional<std::string>);
+	dcpomatic::DCPTime nudge_amount(wxKeyboardState& ev);
+	void image_changed(std::weak_ptr<PlayerVideo>);
+	void outline_content_changed();
+	void eye_changed();
+	void update_position();
 	void film_change(ChangeType, FilmProperty);
 
 	typedef std::pair<std::shared_ptr<dcp::CPL>, boost::filesystem::path> CPL;