White space: auto_crop_dialog.{cc,h}, export_video_file_dialog.{cc,h}, time_calculation_test.cc

4 files changed, 89 insertions, 89 deletions

diff --git a/src/wx/auto_crop_dialog.cc b/src/wx/auto_crop_dialog.cc
index 7e1f73653..15beecad8 100644
--- a/src/wx/auto_crop_dialog.cc
+++ b/src/wx/auto_crop_dialog.cc
@@ -25,18 +25,18 @@
 #include "lib/config.h"
 
 
-AutoCropDialog::AutoCropDialog (wxWindow* parent, Crop crop)
-	: TableDialog (parent, _("Auto crop"), 2, 1, true)
+AutoCropDialog::AutoCropDialog(wxWindow* parent, Crop crop)
+	: TableDialog(parent, _("Auto crop"), 2, 1, true)
 {
-	add (_("Left"), true);
+	add(_("Left"), true);
 	_left = add(new SpinCtrl(this, DCPOMATIC_SPIN_CTRL_WIDTH));
-	add (_("Right"), true);
+	add(_("Right"), true);
 	_right = add(new SpinCtrl(this, DCPOMATIC_SPIN_CTRL_WIDTH));
-	add (_("Top"), true);
+	add(_("Top"), true);
 	_top = add(new SpinCtrl(this, DCPOMATIC_SPIN_CTRL_WIDTH));
-	add (_("Bottom"), true);
+	add(_("Bottom"), true);
 	_bottom = add(new SpinCtrl(this, DCPOMATIC_SPIN_CTRL_WIDTH));
-	add (_("Threshold"), true);
+	add(_("Threshold"), true);
 	_threshold = add(new SpinCtrl(this, DCPOMATIC_SPIN_CTRL_WIDTH));
 
 	_left->SetRange(0, 4096);
@@ -44,32 +44,32 @@ AutoCropDialog::AutoCropDialog (wxWindow* parent, Crop crop)
 	_top->SetRange(0, 4096);
 	_bottom->SetRange(0, 4096);
 
-	set (crop);
-	_threshold->SetValue (std::round(Config::instance()->auto_crop_threshold() * 100));
+	set(crop);
+	_threshold->SetValue(std::round(Config::instance()->auto_crop_threshold() * 100));
 
-	layout ();
+	layout();
 
-	_left->Bind (wxEVT_SPINCTRL, [this](wxSpinEvent&) { Changed(get()); });
-	_right->Bind (wxEVT_SPINCTRL, [this](wxSpinEvent&) { Changed(get()); });
-	_top->Bind (wxEVT_SPINCTRL, [this](wxSpinEvent&) { Changed(get()); });
-	_bottom->Bind (wxEVT_SPINCTRL, [this](wxSpinEvent&) { Changed(get()); });
-	_threshold->Bind (wxEVT_SPINCTRL, [](wxSpinEvent& ev) { Config::instance()->set_auto_crop_threshold(ev.GetPosition() / 100.0); });
+	_left->Bind(wxEVT_SPINCTRL, [this](wxSpinEvent&) { Changed(get()); });
+	_right->Bind(wxEVT_SPINCTRL, [this](wxSpinEvent&) { Changed(get()); });
+	_top->Bind(wxEVT_SPINCTRL, [this](wxSpinEvent&) { Changed(get()); });
+	_bottom->Bind(wxEVT_SPINCTRL, [this](wxSpinEvent&) { Changed(get()); });
+	_threshold->Bind(wxEVT_SPINCTRL, [](wxSpinEvent& ev) { Config::instance()->set_auto_crop_threshold(ev.GetPosition() / 100.0); });
 }
 
 
 Crop
-AutoCropDialog::get () const
+AutoCropDialog::get() const
 {
 	return Crop(_left->GetValue(), _right->GetValue(), _top->GetValue(), _bottom->GetValue());
 }
 
 
 void
-AutoCropDialog::set (Crop crop)
+AutoCropDialog::set(Crop crop)
 {
-	_left->SetValue (crop.left);
-	_right->SetValue (crop.right);
-	_top->SetValue (crop.top);
-	_bottom->SetValue (crop.bottom);
+	_left->SetValue(crop.left);
+	_right->SetValue(crop.right);
+	_top->SetValue(crop.top);
+	_bottom->SetValue(crop.bottom);
 }
 
diff --git a/src/wx/auto_crop_dialog.h b/src/wx/auto_crop_dialog.h
index 4ccd681ed..383f95a5a 100644
--- a/src/wx/auto_crop_dialog.h
+++ b/src/wx/auto_crop_dialog.h
@@ -34,10 +34,10 @@ class SpinCtrl;
 class AutoCropDialog : public TableDialog
 {
 public:
-	AutoCropDialog (wxWindow* parent, Crop crop);
+	AutoCropDialog(wxWindow* parent, Crop crop);
 
-	Crop get () const;
-	void set (Crop crop);
+	Crop get() const;
+	void set(Crop crop);
 
 	boost::signals2::signal<void (Crop)> Changed;
 
diff --git a/src/wx/export_video_file_dialog.cc b/src/wx/export_video_file_dialog.cc
index 226381bef..414be30bd 100644
--- a/src/wx/export_video_file_dialog.cc
+++ b/src/wx/export_video_file_dialog.cc
@@ -67,45 +67,45 @@ ExportFormat formats[] = {
 	ExportFormat::H264_AAC,
 };
 
-ExportVideoFileDialog::ExportVideoFileDialog (wxWindow* parent, string name)
-	: TableDialog (parent, _("Export video file"), 2, 1, true)
-	, _initial_name (name)
+ExportVideoFileDialog::ExportVideoFileDialog(wxWindow* parent, string name)
+	: TableDialog(parent, _("Export video file"), 2, 1, true)
+	, _initial_name(name)
 {
 	auto& config = Config::instance()->export_config();
 
-	add (_("Format"), true);
-	_format = new wxChoice (this, wxID_ANY);
-	add (_format);
-	add_spacer ();
-	_mixdown = new CheckBox (this, _("Mix audio down to stereo"));
-	add (_mixdown, false);
-	add_spacer ();
-	_split_reels = new CheckBox (this, _("Write reels into separate files"));
-	add (_split_reels, false);
-	add_spacer ();
-	_split_streams = new CheckBox (this, _("Write each audio channel to its own stream"));
-	add (_split_streams, false);
-	_x264_crf_label[0] = add (_("Quality"), true);
-	_x264_crf = new wxSlider (this, wxID_ANY, config.x264_crf(), 0, 51, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL | wxSL_LABELS);
-	add (_x264_crf, false);
-	add_spacer ();
-	_x264_crf_label[1] = add (_("0 is best, 51 is worst"), false);
+	add(_("Format"), true);
+	_format = new wxChoice(this, wxID_ANY);
+	add(_format);
+	add_spacer();
+	_mixdown = new CheckBox(this, _("Mix audio down to stereo"));
+	add(_mixdown, false);
+	add_spacer();
+	_split_reels = new CheckBox(this, _("Write reels into separate files"));
+	add(_split_reels, false);
+	add_spacer();
+	_split_streams = new CheckBox(this, _("Write each audio channel to its own stream"));
+	add(_split_streams, false);
+	_x264_crf_label[0] = add(_("Quality"), true);
+	_x264_crf = new wxSlider(this, wxID_ANY, config.x264_crf(), 0, 51, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL | wxSL_LABELS);
+	add(_x264_crf, false);
+	add_spacer();
+	_x264_crf_label[1] = add(_("0 is best, 51 is worst"), false);
 	wxFont font = _x264_crf_label[1]->GetFont();
 	font.SetStyle(wxFONTSTYLE_ITALIC);
 	font.SetPointSize(font.GetPointSize() - 1);
 	_x264_crf_label[1]->SetFont(font);
 
-	add (_("Output file"), true);
+	add(_("Output file"), true);
 	/* Don't warn overwrite here, because on Linux (at least) if we specify a filename like foo
 	   the wxFileDialog will check that foo exists, but we will add an extension so we actually
 	   need to check if foo.mov (or similar) exists.  I can't find a way to make wxWidgets do this,
 	   so disable its check and the caller will have to do it themselves.
 	*/
 	_file = new FilePickerCtrl(this, _("Select output file"), format_filters[0], false, false, "ExportVideoPath", _initial_name);
-	add (_file);
+	add(_file);
 
 	for (int i = 0; i < FORMATS; ++i) {
-		_format->Append (format_names[i]);
+		_format->Append(format_names[i]);
 	}
 	for (int i = 0; i < FORMATS; ++i) {
 		if (config.format() == formats[i]) {
@@ -117,24 +117,24 @@ ExportVideoFileDialog::ExportVideoFileDialog (wxWindow* parent, string name)
 	_split_reels->SetValue(config.split_reels());
 	_split_streams->SetValue(config.split_streams());
 
-	_x264_crf->Enable (false);
+	_x264_crf->Enable(false);
 	for (int i = 0; i < 2; ++i) {
-		_x264_crf_label[i]->Enable (false);
+		_x264_crf_label[i]->Enable(false);
 	}
 
 	_mixdown->bind(&ExportVideoFileDialog::mixdown_changed, this);
 	_split_reels->bind(&ExportVideoFileDialog::split_reels_changed, this);
 	_split_streams->bind(&ExportVideoFileDialog::split_streams_changed, this);
-	_x264_crf->Bind (wxEVT_SLIDER, bind(&ExportVideoFileDialog::x264_crf_changed, this));
-	_format->Bind (wxEVT_CHOICE, bind (&ExportVideoFileDialog::format_changed, this));
-	_file->Bind (wxEVT_FILEPICKER_CHANGED, bind (&ExportVideoFileDialog::file_changed, this));
+	_x264_crf->Bind(wxEVT_SLIDER, bind(&ExportVideoFileDialog::x264_crf_changed, this));
+	_format->Bind(wxEVT_CHOICE, bind(&ExportVideoFileDialog::format_changed, this));
+	_file->Bind(wxEVT_FILEPICKER_CHANGED, bind(&ExportVideoFileDialog::file_changed, this));
 
-	format_changed ();
+	format_changed();
 
-	layout ();
+	layout();
 
-	auto ok = dynamic_cast<wxButton *> (FindWindowById (wxID_OK, this));
-	ok->Enable (false);
+	auto ok = dynamic_cast<wxButton *>(FindWindowById(wxID_OK, this));
+	ok->Enable(false);
 }
 
 
@@ -167,12 +167,12 @@ ExportVideoFileDialog::x264_crf_changed()
 
 
 void
-ExportVideoFileDialog::format_changed ()
+ExportVideoFileDialog::format_changed()
 {
 	auto const selection = _format->GetSelection();
-	DCPOMATIC_ASSERT (selection >= 0 && selection < FORMATS);
+	DCPOMATIC_ASSERT(selection >= 0 && selection < FORMATS);
 	_file->set_wildcard(format_filters[selection]);
-	_x264_crf->Enable (formats[selection] == ExportFormat::H264_AAC);
+	_x264_crf->Enable(formats[selection] == ExportFormat::H264_AAC);
 	for (int i = 0; i < 2; ++i) {
 		_x264_crf_label[i]->Enable(formats[selection] == ExportFormat::H264_AAC);
 	}
@@ -181,50 +181,50 @@ ExportVideoFileDialog::format_changed ()
 }
 
 boost::filesystem::path
-ExportVideoFileDialog::path () const
+ExportVideoFileDialog::path() const
 {
 	auto path = _file->path();
 	DCPOMATIC_ASSERT(path);
 	wxFileName fn(std_to_wx(path->string()));
-	fn.SetExt (format_extensions[_format->GetSelection()]);
-	return wx_to_std (fn.GetFullPath());
+	fn.SetExt(format_extensions[_format->GetSelection()]);
+	return wx_to_std(fn.GetFullPath());
 }
 
 ExportFormat
-ExportVideoFileDialog::format () const
+ExportVideoFileDialog::format() const
 {
-	DCPOMATIC_ASSERT (_format->GetSelection() >= 0 && _format->GetSelection() < FORMATS);
+	DCPOMATIC_ASSERT(_format->GetSelection() >= 0 && _format->GetSelection() < FORMATS);
 	return formats[_format->GetSelection()];
 }
 
 bool
-ExportVideoFileDialog::mixdown_to_stereo () const
+ExportVideoFileDialog::mixdown_to_stereo() const
 {
-	return _mixdown->GetValue ();
+	return _mixdown->GetValue();
 }
 
 bool
-ExportVideoFileDialog::split_reels () const
+ExportVideoFileDialog::split_reels() const
 {
-	return _split_reels->GetValue ();
+	return _split_reels->GetValue();
 }
 
 bool
-ExportVideoFileDialog::split_streams () const
+ExportVideoFileDialog::split_streams() const
 {
-	return _split_streams->GetValue ();
+	return _split_streams->GetValue();
 }
 
 int
-ExportVideoFileDialog::x264_crf () const
+ExportVideoFileDialog::x264_crf() const
 {
-	return _x264_crf->GetValue ();
+	return _x264_crf->GetValue();
 }
 
 void
-ExportVideoFileDialog::file_changed ()
+ExportVideoFileDialog::file_changed()
 {
-	auto ok = dynamic_cast<wxButton *> (FindWindowById (wxID_OK, this));
-	DCPOMATIC_ASSERT (ok);
-	ok->Enable (path().is_absolute());
+	auto ok = dynamic_cast<wxButton *>(FindWindowById(wxID_OK, this));
+	DCPOMATIC_ASSERT(ok);
+	ok->Enable(path().is_absolute());
 }
diff --git a/src/wx/export_video_file_dialog.h b/src/wx/export_video_file_dialog.h
index 4e626be6b..822fa4b99 100644
--- a/src/wx/export_video_file_dialog.h
+++ b/src/wx/export_video_file_dialog.h
@@ -34,22 +34,22 @@ class FilePickerCtrl;
 class ExportVideoFileDialog : public TableDialog
 {
 public:
-	ExportVideoFileDialog (wxWindow* parent, std::string name);
+	ExportVideoFileDialog(wxWindow* parent, std::string name);
 
-	boost::filesystem::path path () const;
-	ExportFormat format () const;
-	bool mixdown_to_stereo () const;
-	bool split_reels () const;
-	bool split_streams () const;
-	int x264_crf () const;
+	boost::filesystem::path path() const;
+	ExportFormat format() const;
+	bool mixdown_to_stereo() const;
+	bool split_reels() const;
+	bool split_streams() const;
+	int x264_crf() const;
 
 private:
-	void format_changed ();
-	void mixdown_changed ();
-	void split_reels_changed ();
-	void split_streams_changed ();
-	void x264_crf_changed ();
-	void file_changed ();
+	void format_changed();
+	void mixdown_changed();
+	void split_reels_changed();
+	void split_streams_changed();
+	void x264_crf_changed();
+	void file_changed();
 
 	std::string _initial_name;
 	wxChoice* _format;