NO-OP: whitespace

Fix space-alignment, mostly due to "frame" -> "sample" changes.

21 files changed, 107 insertions, 107 deletions

diff --git a/libs/ardour/ardour/automation_watch.h b/libs/ardour/ardour/automation_watch.h
index 5c13184bc7..779caf5ad1 100644
--- a/libs/ardour/ardour/automation_watch.h
+++ b/libs/ardour/ardour/automation_watch.h
@@ -54,7 +54,7 @@ private:
 
 	static AutomationWatch* _instance;
 	Glib::Threads::Thread*  _thread;
-	samplepos_t              _last_time;
+	samplepos_t             _last_time;
 	bool                    _run_thread;
 	AutomationWatches        automation_watches;
 	AutomationConnection     automation_connections;
diff --git a/libs/ardour/ardour/export_graph_builder.h b/libs/ardour/ardour/export_graph_builder.h
index 00cf8226be..e863bf05a0 100644
--- a/libs/ardour/ardour/export_graph_builder.h
+++ b/libs/ardour/ardour/export_graph_builder.h
@@ -180,7 +180,7 @@ class LIBARDOUR_API ExportGraphBuilder
 		ExportGraphBuilder & parent;
 
 		FileSpec        config;
-		samplecnt_t      max_samples_out;
+		samplecnt_t     max_samples_out;
 		bool            use_loudness;
 		bool            use_peak;
 		BufferPtr       buffer;
@@ -188,6 +188,7 @@ class LIBARDOUR_API ExportGraphBuilder
 		TmpFilePtr      tmp_file;
 		NormalizerPtr   normalizer;
 		ThreaderPtr     threader;
+
 		LoudnessReaderPtr    loudness_reader;
 		boost::ptr_list<SFC> children;
 
@@ -215,7 +216,7 @@ class LIBARDOUR_API ExportGraphBuilder
 		boost::ptr_list<SFC>  children;
 		boost::ptr_list<Intermediate> intermediate_children;
 		SRConverterPtr        converter;
-		samplecnt_t            max_samples_out;
+		samplecnt_t           max_samples_out;
 	};
 
 	// Silence trimmer + adder
@@ -234,7 +235,7 @@ class LIBARDOUR_API ExportGraphBuilder
 		FileSpec             config;
 		boost::ptr_list<SRC> children;
 		SilenceTrimmerPtr    silence_trimmer;
-		samplecnt_t           max_samples_in;
+		samplecnt_t          max_samples_in;
 	};
 
 	// channel configuration
@@ -254,7 +255,7 @@ class LIBARDOUR_API ExportGraphBuilder
 		boost::ptr_list<SilenceHandler> children;
 		InterleaverPtr            interleaver;
 		ChunkerPtr                chunker;
-		samplecnt_t                max_samples_out;
+		samplecnt_t               max_samples_out;
 	};
 
 	Session const & session;
diff --git a/libs/ardour/ardour/export_handler.h b/libs/ardour/ardour/export_handler.h
index d9d268af01..21ae6f5cb0 100644
--- a/libs/ardour/ardour/export_handler.h
+++ b/libs/ardour/ardour/export_handler.h
@@ -155,7 +155,7 @@ class LIBARDOUR_API ExportHandler : public ExportElementFactory, public sigc::tr
 	TimespanBounds        timespan_bounds;
 
 	PBD::ScopedConnection process_connection;
-	samplepos_t             process_position;
+	samplepos_t           process_position;
 
 	/* CD Marker stuff */
 
@@ -194,13 +194,13 @@ class LIBARDOUR_API ExportHandler : public ExportElementFactory, public sigc::tr
 
 		/* Track info */
 		uint32_t        track_number;
-		samplepos_t      track_position;
-		samplepos_t      track_duration;
-		samplepos_t      track_start_sample;
+		samplepos_t     track_position;
+		samplepos_t     track_duration;
+		samplepos_t     track_start_sample;
 
 		/* Index info */
-		uint32_t       index_number;
-		samplepos_t      index_position;
+		uint32_t        index_number;
+		samplepos_t     index_position;
 	};
 
 
diff --git a/libs/ardour/ardour/export_timespan.h b/libs/ardour/ardour/export_timespan.h
index 4999d893b0..71a1edb41d 100644
--- a/libs/ardour/ardour/export_timespan.h
+++ b/libs/ardour/ardour/export_timespan.h
@@ -37,14 +37,14 @@ class ExportTempFile;
 
 class LIBARDOUR_API ExportTimespan
 {
-  private:
+private:
 	typedef boost::shared_ptr<ExportStatus> ExportStatusPtr;
 
-  private:
+private:
 	friend class ExportElementFactory;
 	ExportTimespan (ExportStatusPtr status, samplecnt_t sample_rate);
 
-  public:
+public:
 	~ExportTimespan ();
 
 	std::string name () const { return _name; }
@@ -68,14 +68,14 @@ class LIBARDOUR_API ExportTimespan
 		return end_sample < other.end_sample;
 	}
 
-  private:
+private:
 
 	ExportStatusPtr status;
 
-	samplepos_t      start_sample;
-	samplepos_t      end_sample;
-	samplepos_t      position;
-	samplecnt_t      sample_rate;
+	samplepos_t start_sample;
+	samplepos_t end_sample;
+	samplepos_t position;
+	samplecnt_t sample_rate;
 
 	std::string _name;
 	std::string _range_id;
diff --git a/libs/ardour/ardour/lv2_plugin.h b/libs/ardour/ardour/lv2_plugin.h
index d0a981fdd4..c6bf082e9a 100644
--- a/libs/ardour/ardour/lv2_plugin.h
+++ b/libs/ardour/ardour/lv2_plugin.h
@@ -74,7 +74,7 @@ class LIBARDOUR_API LV2Plugin : public ARDOUR::Plugin, public ARDOUR::Workee
 	uint32_t    num_ports () const;
 	uint32_t    parameter_count () const;
 	float       default_value (uint32_t port);
-	samplecnt_t  max_latency () const;
+	samplecnt_t max_latency () const;
 	void        set_parameter (uint32_t port, float val);
 	float       get_parameter (uint32_t port) const;
 	std::string get_docs() const;
@@ -183,11 +183,11 @@ class LIBARDOUR_API LV2Plugin : public ARDOUR::Plugin, public ARDOUR::Workee
 	float*        _defaults;
 	LV2_Evbuf**   _ev_buffers;
 	LV2_Evbuf**   _atom_ev_buffers;
-	float*        _bpm_control_port;  ///< Special input set by ardour
-	float*        _freewheel_control_port;  ///< Special input set by ardour
-	float*        _latency_control_port;  ///< Special output set by ardour
-	samplepos_t   _next_cycle_start;  ///< Expected start sample of next run cycle
-	double        _next_cycle_speed;  ///< Expected start sample of next run cycle
+	float*        _bpm_control_port; ///< Special input set by ardour
+	float*        _freewheel_control_port; ///< Special input set by ardour
+	float*        _latency_control_port; ///< Special output set by ardour
+	samplepos_t   _next_cycle_start; ///< Expected start sample of next run cycle
+	double        _next_cycle_speed; ///< Expected start sample of next run cycle
 	double        _next_cycle_beat;  ///< Expected bar_beat of next run cycle
 	double        _current_bpm;
 	PBD::ID       _insert_id;
diff --git a/libs/ardour/ardour/midi_cursor.h b/libs/ardour/ardour/midi_cursor.h
index 6491341447..1ac92bfe5b 100644
--- a/libs/ardour/ardour/midi_cursor.h
+++ b/libs/ardour/ardour/midi_cursor.h
@@ -51,8 +51,8 @@ struct MidiCursor : public boost::noncopyable {
 
 	Evoral::Sequence<Temporal::Beats>::const_iterator        iter;
 	std::set<Evoral::Sequence<Temporal::Beats>::WeakNotePtr> active_notes;
-	samplepos_t                                             last_read_end;
-	PBD::ScopedConnectionList                              connections;
+	samplepos_t                                              last_read_end;
+	PBD::ScopedConnectionList                                connections;
 };
 
 }
diff --git a/libs/ardour/ardour/midi_playlist.h b/libs/ardour/ardour/midi_playlist.h
index f784b73177..76ddddc529 100644
--- a/libs/ardour/ardour/midi_playlist.h
+++ b/libs/ardour/ardour/midi_playlist.h
@@ -59,8 +59,8 @@ public:
 
 	/** This constructor does NOT notify others (session) */
 	MidiPlaylist (boost::shared_ptr<const MidiPlaylist> other,
-	              samplepos_t                            start,
-	              samplecnt_t                            cnt,
+	              samplepos_t                           start,
+	              samplecnt_t                           cnt,
 	              std::string                           name,
 	              bool                                  hidden = false);
 
@@ -78,9 +78,9 @@ public:
 	 * @return The number of samples read (time, not an event count).
 	 */
 	samplecnt_t read (Evoral::EventSink<samplepos_t>& buf,
-	                 samplepos_t                     start,
-	                 samplecnt_t                     cnt,
-	                 Evoral::Range<samplepos_t>*     loop_range,
+	                 samplepos_t                    start,
+	                 samplecnt_t                    cnt,
+	                 Evoral::Range<samplepos_t>*    loop_range,
 	                 uint32_t                       chan_n = 0,
 	                 MidiChannelFilter*             filter = NULL);
 
@@ -132,7 +132,7 @@ private:
 
 	NoteTrackers _note_trackers;
 	NoteMode     _note_mode;
-	samplepos_t   _read_end;
+	samplepos_t  _read_end;
 };
 
 } /* namespace ARDOUR */
diff --git a/libs/ardour/ardour/midi_port.h b/libs/ardour/ardour/midi_port.h
index 4b453b80bc..bf37a4834d 100644
--- a/libs/ardour/ardour/midi_port.h
+++ b/libs/ardour/ardour/midi_port.h
@@ -14,8 +14,6 @@
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    $Id: port.h 712 2006-07-28 01:08:57Z drobilla $
 */
 
 #ifndef __ardour_midi_port_h__
@@ -32,7 +30,7 @@ class MidiBuffer;
 class MidiEngine;
 
 class LIBARDOUR_API MidiPort : public Port {
-   public:
+public:
 	~MidiPort();
 
 	DataType type () const {
@@ -67,20 +65,20 @@ class LIBARDOUR_API MidiPort : public Port {
 
 	void read_and_parse_entire_midi_buffer_with_no_speed_adjustment (pframes_t nframes, MIDI::Parser& parser, samplepos_t now);
 
-  protected:
+protected:
 	friend class PortManager;
 
 	MidiPort (const std::string& name, PortFlags);
 
-  private:
-	MidiBuffer* _buffer;
-	bool        _resolve_required;
-	bool        _input_active;
-	MidiFilter   inbound_midi_filter;
+private:
+	MidiBuffer*                 _buffer;
+	bool                        _resolve_required;
+	bool                        _input_active;
+	MidiFilter                  _inbound_midi_filter;
 	boost::shared_ptr<MidiPort> _shadow_port;
-	MidiFilter   shadow_midi_filter;
-	MIDI::Parser* _trace_parser;
-	bool  _data_fetched_for_cycle;
+	MidiFilter                  _shadow_midi_filter;
+	MIDI::Parser*               _trace_parser;
+	bool                        _data_fetched_for_cycle;
 	
 	void resolve_notes (void* buffer, samplepos_t when);
 	void pull_input (pframes_t nframes, bool adjust_speed);
diff --git a/libs/ardour/ardour/midi_track.h b/libs/ardour/ardour/midi_track.h
index d9a11540e4..cc365c4acc 100644
--- a/libs/ardour/ardour/midi_track.h
+++ b/libs/ardour/ardour/midi_track.h
@@ -52,15 +52,15 @@ public:
 
 	bool bounceable (boost::shared_ptr<Processor>, bool) const { return false; }
 	boost::shared_ptr<Region> bounce (InterThreadInfo&);
-	boost::shared_ptr<Region> bounce_range (samplepos_t                   start,
-	                                        samplepos_t                   end,
+	boost::shared_ptr<Region> bounce_range (samplepos_t                  start,
+	                                        samplepos_t                  end,
 	                                        InterThreadInfo&             iti,
 	                                        boost::shared_ptr<Processor> endpoint,
 	                                        bool                         include_endpoint);
 
 	int export_stuff (BufferSet&                   bufs,
-	                  samplepos_t                   start_sample,
-	                  samplecnt_t                   end_sample,
+	                  samplepos_t                  start_sample,
+	                  samplecnt_t                  end_sample,
 	                  boost::shared_ptr<Processor> endpoint,
 	                  bool                         include_endpoint,
 	                  bool                         for_export,
diff --git a/libs/ardour/ardour/note_fixer.h b/libs/ardour/ardour/note_fixer.h
index 69abc39df4..4851636a65 100644
--- a/libs/ardour/ardour/note_fixer.h
+++ b/libs/ardour/ardour/note_fixer.h
@@ -67,8 +67,8 @@ public:
 	 */
 	void prepare(TempoMap&                          tempo_map,
 	             const MidiModel::NoteDiffCommand*  cmd,
-	             samplepos_t                         origin,
-	             samplepos_t                         pos,
+	             samplepos_t                        origin,
+	             samplepos_t                        pos,
 	             std::set< boost::weak_ptr<Note> >& active_notes);
 
 	/** Emit any pending edit compensation events.
@@ -80,7 +80,7 @@ public:
 	 */
 	void emit(Evoral::EventSink<samplepos_t>& dst,
 	          samplepos_t                     pos,
-	          MidiStateTracker&              tracker);
+	          MidiStateTracker&               tracker);
 
 private:
 	typedef Evoral::Event<samplepos_t> Event;
@@ -91,7 +91,7 @@ private:
 
 	/** Return true iff `note` is active at `pos`. */
 	bool note_is_active(const BeatsSamplesConverter& converter,
-	                    boost::shared_ptr<Note>     note,
+	                    boost::shared_ptr<Note>      note,
 	                    samplepos_t                  pos);
 
 	Events _events;
diff --git a/libs/ardour/ardour/playlist.h b/libs/ardour/ardour/playlist.h
index 0c5439f54c..ccc807c642 100644
--- a/libs/ardour/ardour/playlist.h
+++ b/libs/ardour/ardour/playlist.h
@@ -179,7 +179,7 @@ public:
 	boost::shared_ptr<RegionList> region_list();
 
 	boost::shared_ptr<RegionList> regions_at (samplepos_t sample);
-	uint32_t                   count_regions_at (samplepos_t) const;
+	uint32_t                      count_regions_at (samplepos_t) const;
 	boost::shared_ptr<RegionList> regions_touched (samplepos_t start, samplepos_t end);
 	boost::shared_ptr<RegionList> regions_with_start_within (Evoral::Range<samplepos_t>);
 	boost::shared_ptr<RegionList> regions_with_end_within (Evoral::Range<samplepos_t>);
@@ -188,7 +188,7 @@ public:
 	boost::shared_ptr<Region>  top_region_at (samplepos_t sample);
 	boost::shared_ptr<Region>  top_unmuted_region_at (samplepos_t sample);
 	boost::shared_ptr<Region>  find_next_region (samplepos_t sample, RegionPoint point, int dir);
-	samplepos_t                 find_next_region_boundary (samplepos_t sample, int dir);
+	samplepos_t                find_next_region_boundary (samplepos_t sample, int dir);
 	bool                       region_is_shuffle_constrained (boost::shared_ptr<Region>);
 	bool                       has_region_at (samplepos_t const) const;
 
diff --git a/libs/ardour/ardour/playlist_source.h b/libs/ardour/ardour/playlist_source.h
index 6316b4dcdd..7d49270568 100644
--- a/libs/ardour/ardour/playlist_source.h
+++ b/libs/ardour/ardour/playlist_source.h
@@ -42,8 +42,8 @@ public:
 protected:
 	boost::shared_ptr<Playlist> _playlist;
 	PBD::ID                     _original;
-	sampleoffset_t               _playlist_offset;
-	samplecnt_t                  _playlist_length;
+	sampleoffset_t              _playlist_offset;
+	samplecnt_t                 _playlist_length;
 
 	PlaylistSource (Session&, const PBD::ID&, const std::string& name, boost::shared_ptr<Playlist>, DataType,
 	                sampleoffset_t begin, samplecnt_t len, Source::Flag flags);
diff --git a/libs/ardour/ardour/port_insert.h b/libs/ardour/ardour/port_insert.h
index e96779c63e..26f3c1d434 100644
--- a/libs/ardour/ardour/port_insert.h
+++ b/libs/ardour/ardour/port_insert.h
@@ -88,9 +88,9 @@ private:
 
 	boost::shared_ptr<Delivery> _out;
 
-	uint32_t   _bitslot;
-	MTDM*      _mtdm;
-	bool       _latency_detect;
+	uint32_t    _bitslot;
+	MTDM*       _mtdm;
+	bool        _latency_detect;
 	samplecnt_t _latency_flush_samples;
 	samplecnt_t _measured_latency;
 };
diff --git a/libs/ardour/ardour/region.h b/libs/ardour/ardour/region.h
index ab3e2886d6..61a676f5a0 100644
--- a/libs/ardour/ardour/region.h
+++ b/libs/ardour/ardour/region.h
@@ -55,14 +55,14 @@ namespace Properties {
 	LIBARDOUR_API extern PBD::PropertyDescriptor<bool>              hidden;
 	LIBARDOUR_API extern PBD::PropertyDescriptor<bool>              position_locked;
 	LIBARDOUR_API extern PBD::PropertyDescriptor<bool>              valid_transients;
-	LIBARDOUR_API extern PBD::PropertyDescriptor<samplepos_t>        start;
-	LIBARDOUR_API extern PBD::PropertyDescriptor<samplecnt_t>        length;
-	LIBARDOUR_API extern PBD::PropertyDescriptor<samplepos_t>        position;
+	LIBARDOUR_API extern PBD::PropertyDescriptor<samplepos_t>       start;
+	LIBARDOUR_API extern PBD::PropertyDescriptor<samplecnt_t>       length;
+	LIBARDOUR_API extern PBD::PropertyDescriptor<samplepos_t>       position;
 	LIBARDOUR_API extern PBD::PropertyDescriptor<double>            beat;
-	LIBARDOUR_API extern PBD::PropertyDescriptor<samplecnt_t>        sync_position;
+	LIBARDOUR_API extern PBD::PropertyDescriptor<samplecnt_t>       sync_position;
 	LIBARDOUR_API extern PBD::PropertyDescriptor<layer_t>           layer;
-	LIBARDOUR_API extern PBD::PropertyDescriptor<samplepos_t>        ancestral_start;
-	LIBARDOUR_API extern PBD::PropertyDescriptor<samplecnt_t>        ancestral_length;
+	LIBARDOUR_API extern PBD::PropertyDescriptor<samplepos_t>       ancestral_start;
+	LIBARDOUR_API extern PBD::PropertyDescriptor<samplecnt_t>       ancestral_length;
 	LIBARDOUR_API extern PBD::PropertyDescriptor<float>             stretch;
 	LIBARDOUR_API extern PBD::PropertyDescriptor<float>             shift;
 	LIBARDOUR_API extern PBD::PropertyDescriptor<PositionLockStyle> position_lock_style;
@@ -108,14 +108,14 @@ public:
 	 * START:    first sample of the region within its source(s)
 	 * LENGTH:   number of samples the region represents
 	 */
-	samplepos_t position ()  const { return _position; }
-	samplepos_t start ()     const { return _start; }
-	samplecnt_t length ()    const { return _length; }
+	samplepos_t position () const { return _position; }
+	samplepos_t start ()    const { return _start; }
+	samplecnt_t length ()   const { return _length; }
 	layer_t    layer ()     const { return _layer; }
 
 	void set_selected_for_solo(bool yn);
 
-	samplecnt_t source_length(uint32_t n) const;
+	samplecnt_t source_length (uint32_t n) const;
 	uint32_t   max_source_level () const;
 
 	/* these two are valid ONLY during a StateChanged signal handler */
@@ -389,12 +389,12 @@ protected:
 	PBD::Property<bool>        _left_of_split;
 	PBD::Property<bool>        _right_of_split;
 	PBD::Property<bool>        _valid_transients;
-	PBD::Property<samplepos_t>  _start;
-	PBD::Property<samplecnt_t>  _length;
-	PBD::Property<samplepos_t>  _position;
+	PBD::Property<samplepos_t> _start;
+	PBD::Property<samplecnt_t> _length;
+	PBD::Property<samplepos_t> _position;
 	PBD::Property<double>      _beat;
 	/** Sync position relative to the start of our file */
-	PBD::Property<samplepos_t>  _sync_position;
+	PBD::Property<samplepos_t> _sync_position;
 
 	double                  _quarter_note;
 
@@ -410,12 +410,12 @@ protected:
 
 	// _transient_user_start is covered by  _valid_transients
 	AnalysisFeatureList     _user_transients; // user added
-	samplepos_t              _transient_user_start; // region's _start relative to user_transients
+	samplepos_t             _transient_user_start; // region's _start relative to user_transients
 
 	// these are used by Playlist::find_next_transient() in absence of onsets
 	AnalysisFeatureList     _transients; // Source Analysis (QM Transient), user read-only
-	samplepos_t              _transient_analysis_start;
-	samplepos_t              _transient_analysis_end;
+	samplepos_t             _transient_analysis_start;
+	samplepos_t             _transient_analysis_end;
 
 	bool                    _soloSelected;
 
@@ -445,15 +445,15 @@ private:
 	PBD::Property<bool>        _external;
 	PBD::Property<bool>        _hidden;
 	PBD::Property<bool>        _position_locked;
-	PBD::Property<samplepos_t>  _ancestral_start;
-	PBD::Property<samplecnt_t>  _ancestral_length;
+	PBD::Property<samplepos_t> _ancestral_start;
+	PBD::Property<samplecnt_t> _ancestral_length;
 	PBD::Property<float>       _stretch;
 	PBD::Property<float>       _shift;
 	PBD::EnumProperty<PositionLockStyle> _position_lock_style;
 	PBD::Property<uint64_t>    _layering_index;
 
-	samplecnt_t              _last_length;
-	samplepos_t              _last_position;
+	samplecnt_t             _last_length;
+	samplepos_t             _last_position;
 	mutable RegionEditState _first_edit;
 	layer_t                 _layer;
 
diff --git a/libs/ardour/ardour/resampled_source.h b/libs/ardour/ardour/resampled_source.h
index 2bf002befe..4e8c0a05c8 100644
--- a/libs/ardour/ardour/resampled_source.h
+++ b/libs/ardour/ardour/resampled_source.h
@@ -36,11 +36,11 @@ class LIBARDOUR_API ResampledImportableSource : public ImportableSource
 	~ResampledImportableSource ();
 
 	samplecnt_t read (Sample* buffer, samplecnt_t nframes);
-	float      ratio() const { return _src_data.src_ratio; }
-	uint32_t   channels() const { return source->channels(); }
+	float       ratio() const { return _src_data.src_ratio; }
+	uint32_t    channels() const { return source->channels(); }
 	samplecnt_t length() const { return source->length(); }
 	samplecnt_t samplerate() const { return source->samplerate(); }
-	void       seek (samplepos_t);
+	void        seek (samplepos_t);
 	samplepos_t natural_position() const;
 
 	bool clamped_at_unity () const {
diff --git a/libs/ardour/ardour/send.h b/libs/ardour/ardour/send.h
index d357551cb5..bfe8dda18b 100644
--- a/libs/ardour/ardour/send.h
+++ b/libs/ardour/ardour/send.h
@@ -103,11 +103,10 @@ private:
 
 	int set_state_2X (XMLNode const &, int);
 
-	uint32_t  _bitslot;
-
+	uint32_t    _bitslot;
 	samplecnt_t _delay_in;
 	samplecnt_t _delay_out;
-	bool       _remove_on_disconnect;
+	bool        _remove_on_disconnect;
 };
 
 } // namespace ARDOUR
diff --git a/libs/ardour/ardour/sndfileimportable.h b/libs/ardour/ardour/sndfileimportable.h
index 28e1ccf3cf..cbb34508d4 100644
--- a/libs/ardour/ardour/sndfileimportable.h
+++ b/libs/ardour/ardour/sndfileimportable.h
@@ -29,26 +29,25 @@
 namespace ARDOUR {
 
 class LIBARDOUR_API SndFileImportableSource : public ImportableSource {
-    public:
+public:
 	SndFileImportableSource (const std::string& path);
 	virtual ~SndFileImportableSource();
 
 	samplecnt_t read (Sample* buffer, samplecnt_t nframes);
-	uint32_t   channels() const;
+	uint32_t    channels() const;
 	samplecnt_t length() const;
 	samplecnt_t samplerate() const;
-	void       seek (samplepos_t pos);
+	void        seek (samplepos_t pos);
 	samplepos_t natural_position() const;
-	bool       clamped_at_unity () const;
+	bool        clamped_at_unity () const;
 
-   protected:
+protected:
 	SF_INFO sf_info;
 	boost::shared_ptr<SNDFILE> in;
 
 	/* these are int64_t so as to be independent of whatever
-	   types Ardour may use for samplepos_t, samplecnt_t etc.
-	*/
-
+	 * types Ardour may use for samplepos_t, samplecnt_t etc.
+	 */
 	int64_t timecode;
 	int64_t get_timecode_info (SNDFILE*, SF_BROADCAST_INFO*, bool&);
 };
diff --git a/libs/ardour/ardour/sndfilesource.h b/libs/ardour/ardour/sndfilesource.h
index 218bbd242a..788ac4773b 100644
--- a/libs/ardour/ardour/sndfilesource.h
+++ b/libs/ardour/ardour/sndfilesource.h
@@ -100,13 +100,14 @@ class LIBARDOUR_API SndFileSource : public AudioFileSource {
 	/* destructive */
 
 	static samplecnt_t xfade_samples;
+
 	static gain_t* out_coefficient;
 	static gain_t* in_coefficient;
 
-	bool          _capture_start;
-	bool          _capture_end;
-	samplepos_t     capture_start_sample;
-	samplepos_t     file_pos; // unit is samples
+	bool           _capture_start;
+	bool           _capture_end;
+	samplepos_t    capture_start_sample;
+	samplepos_t    file_pos; // unit is samples
 	Sample*        xfade_buf;
 
 	samplecnt_t crossfade (Sample* data, samplecnt_t cnt, int dir);
diff --git a/libs/ardour/ardour/source.h b/libs/ardour/ardour/source.h
index b269f6976d..256c0017b2 100644
--- a/libs/ardour/ardour/source.h
+++ b/libs/ardour/ardour/source.h
@@ -64,9 +64,9 @@ class LIBARDOUR_API Source : public SessionObject
 	time_t timestamp() const { return _timestamp; }
 	void stamp (time_t when) { _timestamp = when; }
 
-	virtual bool       empty () const = 0;
+	virtual bool        empty () const = 0;
 	virtual samplecnt_t length (samplepos_t pos) const = 0;
-	virtual void       update_length (samplecnt_t cnt) = 0;
+	virtual void        update_length (samplecnt_t cnt) = 0;
 
 	virtual samplepos_t natural_position() const { return 0; }
 
@@ -119,10 +119,12 @@ class LIBARDOUR_API Source : public SessionObject
 	DataType            _type;
 	Flag                _flags;
 	time_t              _timestamp;
-	samplepos_t          _timeline_position;
+	samplepos_t         _timeline_position;
 	bool                _analysed;
-        mutable Glib::Threads::Mutex _lock;
-        mutable Glib::Threads::Mutex _analysis_lock;
+
+	mutable Glib::Threads::Mutex _lock;
+	mutable Glib::Threads::Mutex _analysis_lock;
+
 	gint                _use_count; /* atomic */
 	uint32_t            _level; /* how deeply nested is this source w.r.t a disk file */
 	std::string         _ancestor_name;
diff --git a/libs/ardour/ardour/tempo.h b/libs/ardour/ardour/tempo.h
index c200eafadc..1c2204e416 100644
--- a/libs/ardour/ardour/tempo.h
+++ b/libs/ardour/ardour/tempo.h
@@ -590,7 +590,7 @@ private:
 	static Meter    _default_meter;
 
 	Metrics                       _metrics;
-	samplecnt_t                    _sample_rate;
+	samplecnt_t                   _sample_rate;
 	mutable Glib::Threads::RWLock lock;
 
 	void recompute_tempi (Metrics& metrics);
diff --git a/libs/ardour/ardour/transform.h b/libs/ardour/ardour/transform.h
index 7d1f9acd70..40ceb12e1f 100644
--- a/libs/ardour/ardour/transform.h
+++ b/libs/ardour/ardour/transform.h
@@ -50,8 +50,8 @@ namespace ARDOUR {
  */
 class LIBARDOUR_API Transform : public MidiOperator {
 public:
-	typedef Evoral::Sequence<Temporal::Beats>::NotePtr     NotePtr;
-	typedef Evoral::Sequence<Temporal::Beats>::Notes       Notes;
+	typedef Evoral::Sequence<Temporal::Beats>::NotePtr   NotePtr;
+	typedef Evoral::Sequence<Temporal::Beats>::Notes     Notes;
 	typedef ARDOUR::MidiModel::NoteDiffCommand::Property Property;
 
 	/** Context while iterating over notes during transformation. */