White space: video_panel.{cc,h}

2 files changed, 289 insertions, 289 deletions

diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc
index 06de93526..dd805bc24 100644
--- a/src/wx/video_panel.cc
+++ b/src/wx/video_panel.cc
@@ -66,29 +66,29 @@ using namespace boost::placeholders;
 #endif
 
 
-VideoPanel::VideoPanel (ContentPanel* p)
-	: ContentSubPanel (p, _("Video"))
+VideoPanel::VideoPanel(ContentPanel* p)
+	: ContentSubPanel(p, _("Video"))
 {
 
 }
 
 
 void
-VideoPanel::create ()
+VideoPanel::create()
 {
-	_type_label = create_label (this, _("Type"), true);
-	_frame_type = new ContentChoice<VideoContent, VideoFrameType> (
+	_type_label = create_label(this, _("Type"), true);
+	_frame_type = new ContentChoice<VideoContent, VideoFrameType>(
 		this,
-		new wxChoice (this, wxID_ANY),
+		new wxChoice(this, wxID_ANY),
 		VideoContentProperty::FRAME_TYPE,
 		&Content::video,
-		boost::mem_fn (&VideoContent::frame_type),
-		boost::mem_fn (&VideoContent::set_frame_type),
+		boost::mem_fn(&VideoContent::frame_type),
+		boost::mem_fn(&VideoContent::set_frame_type),
 		&caster<int, VideoFrameType>,
 		&caster<VideoFrameType, int>
 		);
 
-	_crop_label = create_label (this, _("Crop"), true);
+	_crop_label = create_label(this, _("Crop"), true);
 
 #if defined(__WXGTK3__)
 	int const crop_width = 128;
@@ -112,15 +112,15 @@ VideoPanel::create ()
 	int const link_height = 28;
 #endif
 
-	_left_crop_label = create_label (this, _("Left"), true);
-	_left_crop = new ContentSpinCtrl<VideoContent> (
+	_left_crop_label = create_label(this, _("Left"), true);
+	_left_crop = new ContentSpinCtrl<VideoContent>(
 		this,
-		new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(crop_width, -1)),
+		new wxSpinCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(crop_width, -1)),
 		VideoContentProperty::CROP,
 		&Content::video,
-		boost::mem_fn (&VideoContent::requested_left_crop),
-		boost::mem_fn (&VideoContent::set_left_crop),
-		boost::bind (&VideoPanel::left_crop_changed, this)
+		boost::mem_fn(&VideoContent::requested_left_crop),
+		boost::mem_fn(&VideoContent::set_left_crop),
+		boost::bind(&VideoPanel::left_crop_changed, this)
 		);
 
 	auto const link_path = bitmap_path(gui_is_dark() ? "link_white.png" : "link_black.png");
@@ -128,75 +128,75 @@ VideoPanel::create ()
 	_left_right_link = new wxToggleButton(this, wxID_ANY, {}, wxDefaultPosition, wxSize(link_width, link_height));
 	_left_right_link->SetBitmap(wxBitmap(link_path, wxBITMAP_TYPE_PNG));
 
-	_right_crop_label = create_label (this, _("Right"), true);
-	_right_crop = new ContentSpinCtrl<VideoContent> (
+	_right_crop_label = create_label(this, _("Right"), true);
+	_right_crop = new ContentSpinCtrl<VideoContent>(
 		this,
-		new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(crop_width, -1)),
+		new wxSpinCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(crop_width, -1)),
 		VideoContentProperty::CROP,
 		&Content::video,
-		boost::mem_fn (&VideoContent::requested_right_crop),
-		boost::mem_fn (&VideoContent::set_right_crop),
-		boost::bind (&VideoPanel::right_crop_changed, this)
+		boost::mem_fn(&VideoContent::requested_right_crop),
+		boost::mem_fn(&VideoContent::set_right_crop),
+		boost::bind(&VideoPanel::right_crop_changed, this)
 		);
 
-	_top_crop_label = create_label (this, _("Top"), true);
-	_top_crop = new ContentSpinCtrl<VideoContent> (
+	_top_crop_label = create_label(this, _("Top"), true);
+	_top_crop = new ContentSpinCtrl<VideoContent>(
 		this,
-		new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(crop_width, -1)),
+		new wxSpinCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(crop_width, -1)),
 		VideoContentProperty::CROP,
 		&Content::video,
-		boost::mem_fn (&VideoContent::requested_top_crop),
-		boost::mem_fn (&VideoContent::set_top_crop),
-		boost::bind (&VideoPanel::top_crop_changed, this)
+		boost::mem_fn(&VideoContent::requested_top_crop),
+		boost::mem_fn(&VideoContent::set_top_crop),
+		boost::bind(&VideoPanel::top_crop_changed, this)
 		);
 
 	_top_bottom_link = new wxToggleButton(this, wxID_ANY, {}, wxDefaultPosition, wxSize(link_width, link_height));
 	_top_bottom_link->SetBitmap(wxBitmap(link_path, wxBITMAP_TYPE_PNG));
 
-	_bottom_crop_label = create_label (this, _("Bottom"), true);
-	_bottom_crop = new ContentSpinCtrl<VideoContent> (
+	_bottom_crop_label = create_label(this, _("Bottom"), true);
+	_bottom_crop = new ContentSpinCtrl<VideoContent>(
 		this,
-		new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(crop_width, -1)),
+		new wxSpinCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(crop_width, -1)),
 		VideoContentProperty::CROP,
 		&Content::video,
-		boost::mem_fn (&VideoContent::requested_bottom_crop),
-		boost::mem_fn (&VideoContent::set_bottom_crop),
-		boost::bind (&VideoPanel::bottom_crop_changed, this)
+		boost::mem_fn(&VideoContent::requested_bottom_crop),
+		boost::mem_fn(&VideoContent::set_bottom_crop),
+		boost::bind(&VideoPanel::bottom_crop_changed, this)
 		);
 
-	_fade_in_label = create_label (this, _("Fade in"), true);
-	_fade_in = new Timecode<ContentTime> (this);
+	_fade_in_label = create_label(this, _("Fade in"), true);
+	_fade_in = new Timecode<ContentTime>(this);
 
-	_fade_out_label = create_label (this, _("Fade out"), true);
-	_fade_out = new Timecode<ContentTime> (this);
+	_fade_out_label = create_label(this, _("Fade out"), true);
+	_fade_out = new Timecode<ContentTime>(this);
 
-	wxClientDC dc (this);
+	wxClientDC dc(this);
 	auto size = dc.GetTextExtent(char_to_wx("A quite long name"));
 #ifdef __WXGTK3__
-	size.SetWidth (size.GetWidth() + 64);
+	size.SetWidth(size.GetWidth() + 64);
 #endif
-	size.SetHeight (-1);
+	size.SetHeight(-1);
 
-	_scale_label = create_label (this, _("Scale"), true);
-	_scale_fit = new wxRadioButton (this, wxID_ANY, _("to fit DCP"));
-	_scale_custom = new wxRadioButton (this, wxID_ANY, _("custom"));
-	_scale_custom_edit = new Button (this, _("Edit..."), wxDefaultPosition, small_button_size(this, _("Edit...")));
+	_scale_label = create_label(this, _("Scale"), true);
+	_scale_fit = new wxRadioButton(this, wxID_ANY, _("to fit DCP"));
+	_scale_custom = new wxRadioButton(this, wxID_ANY, _("custom"));
+	_scale_custom_edit = new Button(this, _("Edit..."), wxDefaultPosition, small_button_size(this, _("Edit...")));
 
-	_colour_conversion_label = create_label (this, _("Colour"), true);
-	_colour_conversion = new wxChoice (this, wxID_ANY, wxDefaultPosition, size);
-	_colour_conversion->Append (_("None"));
+	_colour_conversion_label = create_label(this, _("Colour"), true);
+	_colour_conversion = new wxChoice(this, wxID_ANY, wxDefaultPosition, size);
+	_colour_conversion->Append(_("None"));
 	for (auto const& i: PresetColourConversion::all()) {
-		_colour_conversion->Append (std_to_wx (i.name));
+		_colour_conversion->Append(std_to_wx(i.name));
 	}
 
 	/// TRANSLATORS: translate the word "Custom" here; do not include the "Colour|" prefix
-	_colour_conversion->Append (S_("Colour|Custom"));
-	_edit_colour_conversion_button = new Button (this, _("Edit..."), wxDefaultPosition, small_button_size(this, _("Edit...")));
+	_colour_conversion->Append(S_("Colour|Custom"));
+	_edit_colour_conversion_button = new Button(this, _("Edit..."), wxDefaultPosition, small_button_size(this, _("Edit...")));
 
-	_range_label = create_label (this, _("Range"), true);
-	_range = new wxChoice (this, wxID_ANY);
-	_range->Append (_("Full (JPEG, 0-255)"));
-	_range->Append (_("Video (MPEG, 16-235)"));
+	_range_label = create_label(this, _("Range"), true);
+	_range = new wxChoice(this, wxID_ANY);
+	_range->Append(_("Full (JPEG, 0-255)"));
+	_range->Append(_("Video (MPEG, 16-235)"));
 
 	_description = new StaticText(this, char_to_wx("\n \n \n \n \n"), wxDefaultPosition, wxDefaultSize);
 	auto font = _description->GetFont();
@@ -204,135 +204,135 @@ VideoPanel::create ()
 	font.SetPointSize(font.GetPointSize() - 1);
 	_description->SetFont(font);
 
-	_left_crop->wrapped()->SetRange (0, 4096);
-	_top_crop->wrapped()->SetRange (0, 4096);
-	_right_crop->wrapped()->SetRange (0, 4096);
-	_bottom_crop->wrapped()->SetRange (0, 4096);
+	_left_crop->wrapped()->SetRange(0, 4096);
+	_top_crop->wrapped()->SetRange(0, 4096);
+	_right_crop->wrapped()->SetRange(0, 4096);
+	_bottom_crop->wrapped()->SetRange(0, 4096);
 
-	_frame_type->wrapped()->Append (_("2D"));
-	_frame_type->wrapped()->Append (_("3D"));
-	_frame_type->wrapped()->Append (_("3D left/right"));
-	_frame_type->wrapped()->Append (_("3D top/bottom"));
-	_frame_type->wrapped()->Append (_("3D alternate"));
-	_frame_type->wrapped()->Append (_("3D left only"));
-	_frame_type->wrapped()->Append (_("3D right only"));
+	_frame_type->wrapped()->Append(_("2D"));
+	_frame_type->wrapped()->Append(_("3D"));
+	_frame_type->wrapped()->Append(_("3D left/right"));
+	_frame_type->wrapped()->Append(_("3D top/bottom"));
+	_frame_type->wrapped()->Append(_("3D alternate"));
+	_frame_type->wrapped()->Append(_("3D left only"));
+	_frame_type->wrapped()->Append(_("3D right only"));
 
-	content_selection_changed ();
+	content_selection_changed();
 
-	_fade_in->Changed.connect (boost::bind (&VideoPanel::fade_in_changed, this));
-	_fade_out->Changed.connect (boost::bind (&VideoPanel::fade_out_changed, this));
+	_fade_in->Changed.connect(boost::bind(&VideoPanel::fade_in_changed, this));
+	_fade_out->Changed.connect(boost::bind(&VideoPanel::fade_out_changed, this));
 
-	_scale_fit->Bind                     (wxEVT_RADIOBUTTON, boost::bind (&VideoPanel::scale_fit_clicked, this));
-	_scale_custom->Bind                  (wxEVT_RADIOBUTTON, boost::bind (&VideoPanel::scale_custom_clicked, this));
-	_scale_custom_edit->Bind             (wxEVT_BUTTON,   boost::bind (&VideoPanel::scale_custom_edit_clicked, this));
-	_colour_conversion->Bind             (wxEVT_CHOICE,   boost::bind (&VideoPanel::colour_conversion_changed, this));
-	_range->Bind                         (wxEVT_CHOICE,   boost::bind (&VideoPanel::range_changed, this));
-	_edit_colour_conversion_button->Bind (wxEVT_BUTTON,   boost::bind (&VideoPanel::edit_colour_conversion_clicked, this));
-	_left_right_link->Bind               (wxEVT_TOGGLEBUTTON, boost::bind(&VideoPanel::left_right_link_clicked, this));
-	_top_bottom_link->Bind               (wxEVT_TOGGLEBUTTON, boost::bind(&VideoPanel::top_bottom_link_clicked, this));
+	_scale_fit->Bind                    (wxEVT_RADIOBUTTON, boost::bind(&VideoPanel::scale_fit_clicked, this));
+	_scale_custom->Bind                 (wxEVT_RADIOBUTTON, boost::bind(&VideoPanel::scale_custom_clicked, this));
+	_scale_custom_edit->Bind            (wxEVT_BUTTON,   boost::bind(&VideoPanel::scale_custom_edit_clicked, this));
+	_colour_conversion->Bind            (wxEVT_CHOICE,   boost::bind(&VideoPanel::colour_conversion_changed, this));
+	_range->Bind                        (wxEVT_CHOICE,   boost::bind(&VideoPanel::range_changed, this));
+	_edit_colour_conversion_button->Bind(wxEVT_BUTTON,   boost::bind(&VideoPanel::edit_colour_conversion_clicked, this));
+	_left_right_link->Bind              (wxEVT_TOGGLEBUTTON, boost::bind(&VideoPanel::left_right_link_clicked, this));
+	_top_bottom_link->Bind              (wxEVT_TOGGLEBUTTON, boost::bind(&VideoPanel::top_bottom_link_clicked, this));
 
-	add_to_grid ();
+	add_to_grid();
 
-	_sizer->Layout ();
+	_sizer->Layout();
 }
 
 
 void
-VideoPanel::add_to_grid ()
+VideoPanel::add_to_grid()
 {
 	int r = 0;
 
-	add_label_to_sizer (_grid, _type_label, true, wxGBPosition(r, 0));
-	_frame_type->add (_grid, wxGBPosition(r, 1), wxGBSpan(1, 2));
+	add_label_to_sizer(_grid, _type_label, true, wxGBPosition(r, 0));
+	_frame_type->add(_grid, wxGBPosition(r, 1), wxGBSpan(1, 2));
 	++r;
 
 	int cr = 0;
-	auto crop = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+	auto crop = new wxGridBagSizer(DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
 
-	add_label_to_sizer (crop, _left_crop_label, true, wxGBPosition (cr, 0));
-	_left_crop->add (crop, wxGBPosition(cr, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
+	add_label_to_sizer(crop, _left_crop_label, true, wxGBPosition(cr, 0));
+	_left_crop->add(crop, wxGBPosition(cr, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
 #ifdef __WXGTK3__
-	crop->Add (_left_right_link, wxGBPosition(cr, 2), wxGBSpan(2, 1));
+	crop->Add(_left_right_link, wxGBPosition(cr, 2), wxGBSpan(2, 1));
 	++cr;
-	add_label_to_sizer (crop, _right_crop_label, true, wxGBPosition(cr, 0));
-	_right_crop->add (crop, wxGBPosition(cr, 1));
+	add_label_to_sizer(crop, _right_crop_label, true, wxGBPosition(cr, 0));
+	_right_crop->add(crop, wxGBPosition(cr, 1));
 #else
-	crop->Add (_left_right_link, wxGBPosition(cr, 2), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
-	add_label_to_sizer (crop, _right_crop_label, true, wxGBPosition (cr, 3));
-	_right_crop->add (crop, wxGBPosition (cr, 4), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
+	crop->Add(_left_right_link, wxGBPosition(cr, 2), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
+	add_label_to_sizer(crop, _right_crop_label, true, wxGBPosition(cr, 3));
+	_right_crop->add(crop, wxGBPosition(cr, 4), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
 #endif
 	++cr;
-	add_label_to_sizer (crop, _top_crop_label, true, wxGBPosition (cr, 0));
-	_top_crop->add (crop, wxGBPosition (cr, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
+	add_label_to_sizer(crop, _top_crop_label, true, wxGBPosition(cr, 0));
+	_top_crop->add(crop, wxGBPosition(cr, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
 #ifdef __WXGTK3__
-	crop->Add (_top_bottom_link, wxGBPosition(cr, 2), wxGBSpan(2, 1));
+	crop->Add(_top_bottom_link, wxGBPosition(cr, 2), wxGBSpan(2, 1));
 	++cr;
-	add_label_to_sizer (crop, _bottom_crop_label, true, wxGBPosition(cr, 0));
-	_bottom_crop->add (crop, wxGBPosition(cr, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
+	add_label_to_sizer(crop, _bottom_crop_label, true, wxGBPosition(cr, 0));
+	_bottom_crop->add(crop, wxGBPosition(cr, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
 #else
-	crop->Add (_top_bottom_link, wxGBPosition(cr, 2), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
-	add_label_to_sizer (crop, _bottom_crop_label, true, wxGBPosition (cr, 3));
-	_bottom_crop->add (crop, wxGBPosition (cr, 4), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
+	crop->Add(_top_bottom_link, wxGBPosition(cr, 2), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
+	add_label_to_sizer(crop, _bottom_crop_label, true, wxGBPosition(cr, 3));
+	_bottom_crop->add(crop, wxGBPosition(cr, 4), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
 #endif
-	add_label_to_sizer (_grid, _crop_label, true, wxGBPosition(r, 0));
-	_grid->Add (crop, wxGBPosition(r, 1));
+	add_label_to_sizer(_grid, _crop_label, true, wxGBPosition(r, 0));
+	_grid->Add(crop, wxGBPosition(r, 1));
 	++r;
 
-	add_label_to_sizer (_grid, _fade_in_label, true, wxGBPosition (r, 0));
-	_grid->Add (_fade_in, wxGBPosition (r, 1), wxGBSpan (1, 3));
+	add_label_to_sizer(_grid, _fade_in_label, true, wxGBPosition(r, 0));
+	_grid->Add(_fade_in, wxGBPosition(r, 1), wxGBSpan(1, 3));
 	++r;
 
-	add_label_to_sizer (_grid, _fade_out_label, true, wxGBPosition (r, 0));
-	_grid->Add (_fade_out, wxGBPosition (r, 1), wxGBSpan (1, 3));
+	add_label_to_sizer(_grid, _fade_out_label, true, wxGBPosition(r, 0));
+	_grid->Add(_fade_out, wxGBPosition(r, 1), wxGBSpan(1, 3));
 	++r;
 
-	add_label_to_sizer (_grid, _scale_label, true, wxGBPosition (r, 0));
+	add_label_to_sizer(_grid, _scale_label, true, wxGBPosition(r, 0));
 	{
-		auto v = new wxBoxSizer (wxVERTICAL);
-		v->Add (_scale_fit, 0, wxBOTTOM, 4);
-		auto h = new wxBoxSizer (wxHORIZONTAL);
-		h->Add (_scale_custom, 1, wxRIGHT | wxALIGN_CENTER_VERTICAL, 6);
-		h->Add (_scale_custom_edit, 0, wxALIGN_CENTER_VERTICAL);
-		v->Add (h, 0);
-		_grid->Add (v, wxGBPosition(r, 1));
+		auto v = new wxBoxSizer(wxVERTICAL);
+		v->Add(_scale_fit, 0, wxBOTTOM, 4);
+		auto h = new wxBoxSizer(wxHORIZONTAL);
+		h->Add(_scale_custom, 1, wxRIGHT | wxALIGN_CENTER_VERTICAL, 6);
+		h->Add(_scale_custom_edit, 0, wxALIGN_CENTER_VERTICAL);
+		v->Add(h, 0);
+		_grid->Add(v, wxGBPosition(r, 1));
 	}
 	++r;
 
-	add_label_to_sizer (_grid, _colour_conversion_label, true, wxGBPosition(r, 0));
+	add_label_to_sizer(_grid, _colour_conversion_label, true, wxGBPosition(r, 0));
 	{
-		auto s = new wxBoxSizer (wxHORIZONTAL);
-		s->Add (_colour_conversion, 1, wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM | wxRIGHT, 6);
-		s->Add (_edit_colour_conversion_button, 0, wxALIGN_CENTER_VERTICAL);
-		_grid->Add (s, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
+		auto s = new wxBoxSizer(wxHORIZONTAL);
+		s->Add(_colour_conversion, 1, wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM | wxRIGHT, 6);
+		s->Add(_edit_colour_conversion_button, 0, wxALIGN_CENTER_VERTICAL);
+		_grid->Add(s, wxGBPosition(r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
 	}
 	++r;
 
-	add_label_to_sizer (_grid, _range_label, true, wxGBPosition(r, 0));
-	_grid->Add (_range, wxGBPosition(r, 1), wxGBSpan(1, 2), wxALIGN_CENTER_VERTICAL);
+	add_label_to_sizer(_grid, _range_label, true, wxGBPosition(r, 0));
+	_grid->Add(_range, wxGBPosition(r, 1), wxGBSpan(1, 2), wxALIGN_CENTER_VERTICAL);
 	++r;
 
-	_grid->Add (_description, wxGBPosition (r, 0), wxGBSpan (1, 4), wxEXPAND | wxALIGN_CENTER_VERTICAL, 6);
+	_grid->Add(_description, wxGBPosition(r, 0), wxGBSpan(1, 4), wxEXPAND | wxALIGN_CENTER_VERTICAL, 6);
 	++r;
 }
 
 
 void
-VideoPanel::range_changed ()
+VideoPanel::range_changed()
 {
-	auto vc = _parent->selected_video ();
+	auto vc = _parent->selected_video();
 	if (vc.size() != 1) {
 		return;
 	}
 
 	switch (_range->GetSelection()) {
 	case 0:
-		vc.front()->video->set_range (VideoRange::FULL);
+		vc.front()->video->set_range(VideoRange::FULL);
 		break;
 	case 1:
-		vc.front()->video->set_range (VideoRange::VIDEO);
+		vc.front()->video->set_range(VideoRange::VIDEO);
 		break;
 	default:
-		DCPOMATIC_ASSERT (false);
+		DCPOMATIC_ASSERT(false);
 	}
 }
 
@@ -344,12 +344,12 @@ VideoPanel::film_changed(FilmProperty property)
 	case FilmProperty::VIDEO_FRAME_RATE:
 	case FilmProperty::CONTAINER:
 	case FilmProperty::RESOLUTION:
-		setup_description ();
-		setup_sensitivity ();
+		setup_description();
+		setup_sensitivity();
 		break;
 	case FilmProperty::REEL_TYPE:
 	case FilmProperty::INTEROP:
-		setup_sensitivity ();
+		setup_sensitivity();
 		break;
 	default:
 		break;
@@ -362,21 +362,21 @@ hash_value (boost::optional<ColourConversion> const & c)
 {
 	boost::hash<string> hasher;
 	if (!c) {
-		return hasher ("none");
+		return hasher("none");
 	}
-	return hasher (c->identifier());
+	return hasher(c->identifier());
 }
 
 
 void
-VideoPanel::film_content_changed (int property)
+VideoPanel::film_content_changed(int property)
 {
-	auto vc = _parent->selected_video ();
+	auto vc = _parent->selected_video();
 	shared_ptr<Content> vcs;
 	shared_ptr<FFmpegContent> fcs;
 	if (!vc.empty()) {
-		vcs = vc.front ();
-		fcs = dynamic_pointer_cast<FFmpegContent> (vcs);
+		vcs = vc.front();
+		fcs = dynamic_pointer_cast<FFmpegContent>(vcs);
 	}
 
 	if (property == ContentProperty::VIDEO_FRAME_RATE ||
@@ -384,138 +384,138 @@ VideoPanel::film_content_changed (int property)
 	    property == VideoContentProperty::CROP ||
 	    property == VideoContentProperty::CUSTOM_RATIO ||
 	    property == VideoContentProperty::CUSTOM_SIZE) {
-		setup_description ();
+		setup_description();
 	} else if (property == VideoContentProperty::COLOUR_CONVERSION) {
 		boost::unordered_set<optional<ColourConversion>> check;
 		for (auto i: vc) {
-			check.insert (i->video->colour_conversion());
+			check.insert(i->video->colour_conversion());
 		}
 
 		/* Remove any "Many" entry that we might have added previously.  There should
 		 * be entries for each preset plus one for "None" and one for "Custom".
 		 */
-		auto cc = PresetColourConversion::all ();
+		auto cc = PresetColourConversion::all();
 		if (_colour_conversion->GetCount() > cc.size() + 2) {
-			_colour_conversion->Delete (_colour_conversion->GetCount() - 1);
+			_colour_conversion->Delete(_colour_conversion->GetCount() - 1);
 		}
 
 		if (check.size() == 1) {
-			if (vcs && vcs->video->colour_conversion ()) {
+			if (vcs && vcs->video->colour_conversion()) {
 				auto preset = vcs->video->colour_conversion().get().preset();
 				if (preset) {
-					checked_set (_colour_conversion, preset.get() + 1);
+					checked_set(_colour_conversion, preset.get() + 1);
 				} else {
-					checked_set (_colour_conversion, cc.size() + 1);
+					checked_set(_colour_conversion, cc.size() + 1);
 				}
 			} else {
-				checked_set (_colour_conversion, 0);
+				checked_set(_colour_conversion, 0);
 			}
 		} else if (check.size() > 1) {
 			/* Add a "many" entry and select it as an indication that multiple different
 			 * colour conversions are present in the selection.
 			 */
-			_colour_conversion->Append (_("Many"));
-			checked_set (_colour_conversion, _colour_conversion->GetCount() - 1);
+			_colour_conversion->Append(_("Many"));
+			checked_set(_colour_conversion, _colour_conversion->GetCount() - 1);
 		}
 
-		setup_sensitivity ();
+		setup_sensitivity();
 
 	} else if (property == VideoContentProperty::USE) {
-		setup_sensitivity ();
+		setup_sensitivity();
 	} else if (property == VideoContentProperty::FADE_IN) {
 		set<Frame> check;
 		for (auto i: vc) {
-			check.insert (i->video->fade_in ());
+			check.insert(i->video->fade_in());
 		}
 
 		if (check.size() == 1) {
-			_fade_in->set (
-				ContentTime::from_frames (vc.front()->video->fade_in(), vc.front()->active_video_frame_rate(_parent->film())),
+			_fade_in->set(
+				ContentTime::from_frames(vc.front()->video->fade_in(), vc.front()->active_video_frame_rate(_parent->film())),
 				vc.front()->active_video_frame_rate(_parent->film())
 				);
 		} else {
-			_fade_in->clear ();
+			_fade_in->clear();
 		}
 	} else if (property == VideoContentProperty::FADE_OUT) {
 		set<Frame> check;
 		for (auto i: vc) {
-			check.insert (i->video->fade_out ());
+			check.insert(i->video->fade_out());
 		}
 
 		if (check.size() == 1) {
-			_fade_out->set (
-				ContentTime::from_frames (vc.front()->video->fade_out(), vc.front()->active_video_frame_rate(_parent->film())),
+			_fade_out->set(
+				ContentTime::from_frames(vc.front()->video->fade_out(), vc.front()->active_video_frame_rate(_parent->film())),
 				vc.front()->active_video_frame_rate(_parent->film())
 				);
 		} else {
-			_fade_out->clear ();
+			_fade_out->clear();
 		}
 	} else if (property == VideoContentProperty::RANGE) {
 		if (vcs) {
-			checked_set (_range, vcs->video->range() == VideoRange::FULL ? 0 : 1);
+			checked_set(_range, vcs->video->range() == VideoRange::FULL ? 0 : 1);
 		} else {
-			checked_set (_range, 0);
+			checked_set(_range, 0);
 		}
 
-		setup_sensitivity ();
+		setup_sensitivity();
 	} else if (property == VideoContentProperty::CUSTOM_RATIO || property == VideoContentProperty::CUSTOM_SIZE) {
 		set<Frame> check;
 		for (auto i: vc) {
-			check.insert (i->video->custom_ratio() || i->video->custom_size());
+			check.insert(i->video->custom_ratio() || i->video->custom_size());
 		}
 
 		if (check.size() == 1) {
-			checked_set (_scale_fit, !vc.front()->video->custom_ratio() && !vc.front()->video->custom_size());
-			checked_set (_scale_custom, vc.front()->video->custom_ratio() || vc.front()->video->custom_size());
+			checked_set(_scale_fit, !vc.front()->video->custom_ratio() && !vc.front()->video->custom_size());
+			checked_set(_scale_custom, vc.front()->video->custom_ratio() || vc.front()->video->custom_size());
 		} else {
-			checked_set (_scale_fit, true);
-			checked_set (_scale_custom, false);
+			checked_set(_scale_fit, true);
+			checked_set(_scale_custom, false);
 		}
-		setup_sensitivity ();
+		setup_sensitivity();
 	}
 }
 
 
 void
-VideoPanel::setup_description ()
+VideoPanel::setup_description()
 {
-	auto vc = _parent->selected_video ();
-	if (vc.empty ()) {
+	auto vc = _parent->selected_video();
+	if (vc.empty()) {
 		checked_set(_description, wxString{});
 		return;
 	} else if (vc.size() > 1) {
-		checked_set (_description, _("Multiple content selected"));
+		checked_set(_description, _("Multiple content selected"));
 		return;
 	}
 
 	auto d = vc.front()->video->processing_description(_parent->film());
-	size_t lines = count (d.begin(), d.end(), '\n');
+	size_t lines = count(d.begin(), d.end(), '\n');
 
 	for (int i = lines; i < 6; ++i) {
 		d += "\n ";
 	}
 
-	checked_set (_description, d);
-	layout ();
+	checked_set(_description, d);
+	layout();
 }
 
 
 void
-VideoPanel::colour_conversion_changed ()
+VideoPanel::colour_conversion_changed()
 {
-	auto vc = _parent->selected_video ();
+	auto vc = _parent->selected_video();
 
-	int const s = _colour_conversion->GetSelection ();
-	auto all = PresetColourConversion::all ();
+	int const s = _colour_conversion->GetSelection();
+	auto all = PresetColourConversion::all();
 
 	if (s == int(all.size() + 1)) {
-		edit_colour_conversion_clicked ();
+		edit_colour_conversion_clicked();
 	} else {
 		for (auto i: _parent->selected_video()) {
 			if (s == 0) {
-				i->video->unset_colour_conversion ();
+				i->video->unset_colour_conversion();
 			} else if (s != int(all.size() + 2)) {
-				i->video->set_colour_conversion (all[s - 1].conversion);
+				i->video->set_colour_conversion(all[s - 1].conversion);
 			}
 		}
 	}
@@ -523,9 +523,9 @@ VideoPanel::colour_conversion_changed ()
 
 
 void
-VideoPanel::edit_colour_conversion_clicked ()
+VideoPanel::edit_colour_conversion_clicked()
 {
-	auto vc = _parent->selected_video ();
+	auto vc = _parent->selected_video();
 
 	ContentColourConversionDialog dialog(this, vc.front()->video->yuv());
 	dialog.set(vc.front()->video->colour_conversion().get_value_or(PresetColourConversion::all().front().conversion));
@@ -535,46 +535,46 @@ VideoPanel::edit_colour_conversion_clicked ()
 		}
 	} else {
 		/* Reset the colour conversion choice */
-		film_content_changed (VideoContentProperty::COLOUR_CONVERSION);
+		film_content_changed(VideoContentProperty::COLOUR_CONVERSION);
 	}
 }
 
 
 void
-VideoPanel::content_selection_changed ()
+VideoPanel::content_selection_changed()
 {
-	auto video_sel = _parent->selected_video ();
-
-	_frame_type->set_content (video_sel);
-	_left_crop->set_content (video_sel);
-	_right_crop->set_content (video_sel);
-	_top_crop->set_content (video_sel);
-	_bottom_crop->set_content (video_sel);
-
-	film_content_changed (ContentProperty::VIDEO_FRAME_RATE);
-	film_content_changed (VideoContentProperty::CROP);
-	film_content_changed (VideoContentProperty::COLOUR_CONVERSION);
-	film_content_changed (VideoContentProperty::FADE_IN);
-	film_content_changed (VideoContentProperty::FADE_OUT);
-	film_content_changed (VideoContentProperty::RANGE);
-	film_content_changed (VideoContentProperty::USE);
-	film_content_changed (VideoContentProperty::CUSTOM_RATIO);
-	film_content_changed (VideoContentProperty::CUSTOM_SIZE);
-	film_content_changed (FFmpegContentProperty::FILTERS);
-	film_content_changed (DCPContentProperty::REFERENCE_VIDEO);
-
-	setup_sensitivity ();
+	auto video_sel = _parent->selected_video();
+
+	_frame_type->set_content(video_sel);
+	_left_crop->set_content(video_sel);
+	_right_crop->set_content(video_sel);
+	_top_crop->set_content(video_sel);
+	_bottom_crop->set_content(video_sel);
+
+	film_content_changed(ContentProperty::VIDEO_FRAME_RATE);
+	film_content_changed(VideoContentProperty::CROP);
+	film_content_changed(VideoContentProperty::COLOUR_CONVERSION);
+	film_content_changed(VideoContentProperty::FADE_IN);
+	film_content_changed(VideoContentProperty::FADE_OUT);
+	film_content_changed(VideoContentProperty::RANGE);
+	film_content_changed(VideoContentProperty::USE);
+	film_content_changed(VideoContentProperty::CUSTOM_RATIO);
+	film_content_changed(VideoContentProperty::CUSTOM_SIZE);
+	film_content_changed(FFmpegContentProperty::FILTERS);
+	film_content_changed(DCPContentProperty::REFERENCE_VIDEO);
+
+	setup_sensitivity();
 }
 
 
 void
-VideoPanel::setup_sensitivity ()
+VideoPanel::setup_sensitivity()
 {
-	auto sel = _parent->selected ();
+	auto sel = _parent->selected();
 
 	shared_ptr<DCPContent> dcp;
 	if (sel.size() == 1) {
-		dcp = dynamic_pointer_cast<DCPContent> (sel.front ());
+		dcp = dynamic_pointer_cast<DCPContent>(sel.front());
 	}
 
 	bool const reference = dcp && dcp->reference_video();
@@ -589,100 +589,100 @@ VideoPanel::setup_sensitivity ()
 	bool const enable = !reference && any_use;
 
 	if (!enable) {
-		_frame_type->wrapped()->Enable (false);
-		_left_crop->wrapped()->Enable (false);
-		_right_crop->wrapped()->Enable (false);
-		_top_crop->wrapped()->Enable (false);
-		_bottom_crop->wrapped()->Enable (false);
-		_fade_in->Enable (false);
-		_fade_out->Enable (false);
-		_scale_fit->Enable (false);
-		_scale_custom->Enable (false);
-		_scale_custom_edit->Enable (false);
-		_description->Enable (false);
-		_colour_conversion->Enable (false);
-		_range->Enable (false);
+		_frame_type->wrapped()->Enable(false);
+		_left_crop->wrapped()->Enable(false);
+		_right_crop->wrapped()->Enable(false);
+		_top_crop->wrapped()->Enable(false);
+		_bottom_crop->wrapped()->Enable(false);
+		_fade_in->Enable(false);
+		_fade_out->Enable(false);
+		_scale_fit->Enable(false);
+		_scale_custom->Enable(false);
+		_scale_custom_edit->Enable(false);
+		_description->Enable(false);
+		_colour_conversion->Enable(false);
+		_range->Enable(false);
 	} else {
-		auto video_sel = _parent->selected_video ();
-		auto ffmpeg_sel = _parent->selected_ffmpeg ();
+		auto video_sel = _parent->selected_video();
+		auto ffmpeg_sel = _parent->selected_ffmpeg();
 		bool const single = video_sel.size() == 1;
 
-		_frame_type->wrapped()->Enable (true);
-		_left_crop->wrapped()->Enable (true);
-		_right_crop->wrapped()->Enable (true);
-		_top_crop->wrapped()->Enable (true);
-		_bottom_crop->wrapped()->Enable (true);
-		_fade_in->Enable (!video_sel.empty ());
-		_fade_out->Enable (!video_sel.empty ());
-		_scale_fit->Enable (true);
-		_scale_custom->Enable (true);
-		_scale_custom_edit->Enable (_scale_custom->GetValue());
-		_description->Enable (true);
-		_colour_conversion->Enable (!video_sel.empty());
-		_range->Enable (single && !video_sel.empty() && !dcp);
+		_frame_type->wrapped()->Enable(true);
+		_left_crop->wrapped()->Enable(true);
+		_right_crop->wrapped()->Enable(true);
+		_top_crop->wrapped()->Enable(true);
+		_bottom_crop->wrapped()->Enable(true);
+		_fade_in->Enable(!video_sel.empty());
+		_fade_out->Enable(!video_sel.empty());
+		_scale_fit->Enable(true);
+		_scale_custom->Enable(true);
+		_scale_custom_edit->Enable(_scale_custom->GetValue());
+		_description->Enable(true);
+		_colour_conversion->Enable(!video_sel.empty());
+		_range->Enable(single && !video_sel.empty() && !dcp);
 	}
 
-	auto vc = _parent->selected_video ();
+	auto vc = _parent->selected_video();
 	shared_ptr<Content> vcs;
-	if (!vc.empty ()) {
-		vcs = vc.front ();
+	if (!vc.empty()) {
+		vcs = vc.front();
 	}
 
-	if (vcs && vcs->video->colour_conversion ()) {
-		_edit_colour_conversion_button->Enable (!vcs->video->colour_conversion().get().preset());
+	if (vcs && vcs->video->colour_conversion()) {
+		_edit_colour_conversion_button->Enable(!vcs->video->colour_conversion().get().preset());
 	} else {
-		_edit_colour_conversion_button->Enable (false);
+		_edit_colour_conversion_button->Enable(false);
 	}
 }
 
 
 void
-VideoPanel::fade_in_changed ()
+VideoPanel::fade_in_changed()
 {
 	auto const hmsf = _fade_in->get();
 	for (auto i: _parent->selected_video()) {
 		auto const vfr = i->active_video_frame_rate(_parent->film());
-		i->video->set_fade_in (dcpomatic::ContentTime(hmsf, vfr).frames_round(vfr));
+		i->video->set_fade_in(dcpomatic::ContentTime(hmsf, vfr).frames_round(vfr));
 	}
 }
 
 
 void
-VideoPanel::fade_out_changed ()
+VideoPanel::fade_out_changed()
 {
 	auto const hmsf = _fade_out->get();
 	for (auto i: _parent->selected_video()) {
-		auto const vfr = i->active_video_frame_rate (_parent->film());
-		i->video->set_fade_out (dcpomatic::ContentTime(hmsf, vfr).frames_round(vfr));
+		auto const vfr = i->active_video_frame_rate(_parent->film());
+		i->video->set_fade_out(dcpomatic::ContentTime(hmsf, vfr).frames_round(vfr));
 	}
 }
 
 
 void
-VideoPanel::scale_fit_clicked ()
+VideoPanel::scale_fit_clicked()
 {
 	for (auto i: _parent->selected_video()) {
-		i->video->set_custom_ratio (optional<float>());
-		i->video->set_custom_size (optional<dcp::Size>());
+		i->video->set_custom_ratio(optional<float>());
+		i->video->set_custom_size(optional<dcp::Size>());
 	}
 
-	setup_sensitivity ();
+	setup_sensitivity();
 }
 
 
 void
-VideoPanel::scale_custom_clicked ()
+VideoPanel::scale_custom_clicked()
 {
 	if (!scale_custom_edit_clicked()) {
-		_scale_fit->SetValue (true);
+		_scale_fit->SetValue(true);
 	}
 
-	setup_sensitivity ();
+	setup_sensitivity();
 }
 
 
 bool
-VideoPanel::scale_custom_edit_clicked ()
+VideoPanel::scale_custom_edit_clicked()
 {
 	auto vc = _parent->selected_video().front()->video;
 	auto size = vc->size();
@@ -703,70 +703,70 @@ VideoPanel::scale_custom_edit_clicked ()
 
 
 void
-VideoPanel::left_right_link_clicked ()
+VideoPanel::left_right_link_clicked()
 {
 	if (_left_changed_last) {
-		left_crop_changed ();
+		left_crop_changed();
 	} else {
-		right_crop_changed ();
+		right_crop_changed();
 	}
 }
 
 
 void
-VideoPanel::top_bottom_link_clicked ()
+VideoPanel::top_bottom_link_clicked()
 {
 	if (_top_changed_last) {
-		top_crop_changed ();
+		top_crop_changed();
 	} else {
-		bottom_crop_changed ();
+		bottom_crop_changed();
 	}
 }
 
 
 void
-VideoPanel::left_crop_changed ()
+VideoPanel::left_crop_changed()
 {
 	_left_changed_last = true;
 	if (_left_right_link->GetValue()) {
 		for (auto const& i: _parent->selected_video()) {
-			i->video->set_right_crop (i->video->requested_left_crop());
+			i->video->set_right_crop(i->video->requested_left_crop());
 		}
 	}
 }
 
 
 void
-VideoPanel::right_crop_changed ()
+VideoPanel::right_crop_changed()
 {
 	_left_changed_last = false;
 	if (_left_right_link->GetValue()) {
 		for (auto const& i: _parent->selected_video()) {
-			i->video->set_left_crop (i->video->requested_right_crop());
+			i->video->set_left_crop(i->video->requested_right_crop());
 		}
 	}
 }
 
 
 void
-VideoPanel::top_crop_changed ()
+VideoPanel::top_crop_changed()
 {
 	_top_changed_last = true;
 	if (_top_bottom_link->GetValue()) {
 		for (auto i: _parent->selected_video()) {
-			i->video->set_bottom_crop (i->video->requested_top_crop());
+			i->video->set_bottom_crop(i->video->requested_top_crop());
 		}
 	}
 }
 
 
 void
-VideoPanel::bottom_crop_changed ()
+VideoPanel::bottom_crop_changed()
 {
 	_top_changed_last = false;
 	if (_top_bottom_link->GetValue()) {
-		for (auto i: _parent->selected_video()) {
-			i->video->set_top_crop (i->video->requested_bottom_crop());
+		for(auto i: _parent->selected_video()) {
+			i->video->set_top_crop(i->video->requested_bottom_crop());
 		}
 	}
 }
diff --git a/src/wx/video_panel.h b/src/wx/video_panel.h
index e6b689b03..3d3f15892 100644
--- a/src/wx/video_panel.h
+++ b/src/wx/video_panel.h
@@ -45,32 +45,32 @@ class wxToggleButton;
 class VideoPanel : public ContentSubPanel
 {
 public:
-	explicit VideoPanel (ContentPanel *);
+	explicit VideoPanel(ContentPanel *);
 
-	void create () override;
+	void create() override;
 	void film_changed(FilmProperty) override;
-	void film_content_changed (int) override;
-	void content_selection_changed () override;
+	void film_content_changed(int) override;
+	void content_selection_changed() override;
 
 private:
-	void colour_conversion_changed ();
-	void edit_colour_conversion_clicked ();
-	void range_changed ();
-	void fade_in_changed ();
-	void fade_out_changed ();
-	void add_to_grid () override;
-	void scale_fit_clicked ();
-	void scale_custom_clicked ();
-	bool scale_custom_edit_clicked ();
-	void left_right_link_clicked ();
-	void top_bottom_link_clicked ();
-	void left_crop_changed ();
-	void right_crop_changed ();
-	void top_crop_changed ();
-	void bottom_crop_changed ();
-
-	void setup_description ();
-	void setup_sensitivity ();
+	void colour_conversion_changed();
+	void edit_colour_conversion_clicked();
+	void range_changed();
+	void fade_in_changed();
+	void fade_out_changed();
+	void add_to_grid() override;
+	void scale_fit_clicked();
+	void scale_custom_clicked();
+	bool scale_custom_edit_clicked();
+	void left_right_link_clicked();
+	void top_bottom_link_clicked();
+	void left_crop_changed();
+	void right_crop_changed();
+	void top_crop_changed();
+	void bottom_crop_changed();
+
+	void setup_description();
+	void setup_sensitivity();
 
 	wxStaticText* _type_label;
 	ContentChoice<VideoContent, VideoFrameType>* _frame_type;