diff --git a/libs/ardour/ardour/disk_writer.h b/libs/ardour/ardour/disk_writer.h
index ea89d269c6..7a3307c5ba 100644
--- a/libs/ardour/ardour/disk_writer.h
+++ b/libs/ardour/ardour/disk_writer.h
@@ -30,7 +30,6 @@
 
 namespace ARDOUR
 {
-
 class AudioFileSource;
 class SMFSource;
 class MidiSource;
@@ -38,19 +37,21 @@ class MidiSource;
 class LIBARDOUR_API DiskWriter : public DiskIOProcessor
 {
 public:
-	DiskWriter (Session&, std::string const & name, DiskIOProcessor::Flag f = DiskIOProcessor::Flag (0));
+	DiskWriter (Session&, std::string const& name,
+	            DiskIOProcessor::Flag f = DiskIOProcessor::Flag (0));
 	~DiskWriter ();
 
-	bool set_name (std::string const & str);
-	std::string display_name() const { return std::string (_("recorder")); }
+	bool set_name (std::string const& str);
+	std::string display_name () const { return std::string (_ ("recorder")); }
 
-	bool recordable() const { return _flags & Recordable; }
+	bool recordable () const { return _flags & Recordable; }
 
-	static samplecnt_t chunk_samples() { return _chunk_samples; }
+	static samplecnt_t chunk_samples () { return _chunk_samples; }
 	static samplecnt_t default_chunk_samples ();
 	static void        set_chunk_samples (samplecnt_t n) { _chunk_samples = n; }
 
-	void run (BufferSet& /*bufs*/, samplepos_t /*start_sample*/, samplepos_t /*end_sample*/, double speed, pframes_t /*nframes*/, bool /*result_required*/);
+	void run (BufferSet& /*bufs*/, samplepos_t /*start_sample*/, samplepos_t /*end_sample*/,
+	          double speed, pframes_t /*nframes*/, bool /*result_required*/);
 
 	void non_realtime_locate (samplepos_t);
 	void realtime_handle_transport_stopped ();
@@ -59,30 +60,30 @@ public:
 
 	bool set_write_source_name (const std::string& str);
 
-	std::string  write_source_name () const {
-		if (_write_source_name.empty()) {
-			return name();
+	std::string write_source_name () const {
+		if (_write_source_name.empty ()) {
+			return name ();
 		} else {
 			return _write_source_name;
 		}
 	}
 
-	boost::shared_ptr<AudioFileSource> audio_write_source (uint32_t n=0) {
-		boost::shared_ptr<ChannelList> c = channels.reader();
-		if (n < c->size()) {
+	boost::shared_ptr<AudioFileSource> audio_write_source (uint32_t n = 0) {
+		boost::shared_ptr<ChannelList> c = channels.reader ();
+		if (n < c->size ()) {
 			return (*c)[n]->write_source;
 		}
-		return boost::shared_ptr<AudioFileSource>();
+		return boost::shared_ptr<AudioFileSource> ();
 	}
 
 	boost::shared_ptr<SMFSource> midi_write_source () const { return _midi_write_source; }
 
 	std::string steal_write_source_name ();
-	int  use_new_write_source (DataType, uint32_t n = 0);
+	int use_new_write_source (DataType, uint32_t n = 0);
 	void reset_write_sources (bool, bool force = false);
 
-	AlignStyle alignment_style() const { return _alignment_style; }
-	void       set_align_style (AlignStyle, bool force=false);
+	AlignStyle alignment_style () const { return _alignment_style; }
+	void       set_align_style (AlignStyle, bool force = false);
 
 	PBD::Signal0<void> AlignmentStyleChanged;
 
@@ -90,20 +91,21 @@ public:
 
 	std::list<boost::shared_ptr<Source> >& last_capture_sources () { return _last_capture_sources; }
 
-	bool         record_enabled() const { return g_atomic_int_get (const_cast<gint*>(&_record_enabled)); }
-	bool         record_safe () const { return g_atomic_int_get (const_cast<gint*>(&_record_safe)); }
+	bool record_enabled () const { return g_atomic_int_get (const_cast<gint*> (&_record_enabled)); }
+	bool record_safe () const { return g_atomic_int_get (const_cast<gint*> (&_record_safe)); }
+
 	void set_record_enabled (bool yn);
 	void set_record_safe (bool yn);
 
-	bool destructive() const { return _flags & Destructive; }
+	bool destructive () const { return _flags & Destructive; }
 
 	/** @return Start position of currently-running capture (in session samples) */
-	samplepos_t current_capture_start() const { return _capture_start_sample; }
-	samplepos_t current_capture_end()   const { return _capture_start_sample + _capture_captured; }
+	samplepos_t current_capture_start () const { return _capture_start_sample; }
+	samplepos_t current_capture_end () const { return _capture_start_sample + _capture_captured; }
 	samplepos_t get_capture_start_sample (uint32_t n = 0) const;
 	samplecnt_t get_captured_samples (uint32_t n = 0) const;
 
-	float buffer_load() const;
+	float buffer_load () const;
 
 	int seek (samplepos_t sample, bool complete_refill);
 
@@ -132,7 +134,7 @@ protected:
 
 	struct WriterChannelInfo : public DiskIOProcessor::ChannelInfo {
 		WriterChannelInfo (samplecnt_t buffer_size)
-			: DiskIOProcessor::ChannelInfo (buffer_size)
+		        : DiskIOProcessor::ChannelInfo (buffer_size)
 		{
 			resize (buffer_size);
 		}
@@ -160,16 +162,15 @@ private:
 	bool prep_record_enable ();
 	bool prep_record_disable ();
 
-	void calculate_record_range (
-		Evoral::OverlapType ot, samplepos_t transport_sample, samplecnt_t nframes,
-		samplecnt_t& rec_nframes, samplecnt_t& rec_offset
-		);
+	void calculate_record_range (Evoral::OverlapType ot, samplepos_t transport_sample,
+	                             samplecnt_t nframes, samplecnt_t& rec_nframes,
+	                             samplecnt_t& rec_offset);
 
 	void check_record_status (samplepos_t transport_sample, double speed, bool can_record);
 	void finish_capture (boost::shared_ptr<ChannelList> c);
 
+	CaptureInfos                 capture_info;
 	mutable Glib::Threads::Mutex capture_info_lock;
-	CaptureInfos capture_info;
 
 	gint          _record_enabled;
 	gint          _record_safe;
@@ -188,8 +189,8 @@ private:
 
 	boost::shared_ptr<SMFSource> _midi_write_source;
 
-	std::list<boost::shared_ptr<Source> > _last_capture_sources;
-	std::vector<boost::shared_ptr<AudioFileSource> > capturing_sources;
+	std::list<boost::shared_ptr<Source>>            _last_capture_sources;
+	std::vector<boost::shared_ptr<AudioFileSource>> capturing_sources;
 
 	/** A buffer that we use to put newly-arrived MIDI data in for
 	 * the GUI to read (so that it can update itself).