fix header order and space alignment

18 files changed, 33 insertions, 20 deletions

diff --git a/libs/ardour/ardour/legatize.h b/libs/ardour/ardour/legatize.h
index 74c4d112df..bf0eee869f 100644
--- a/libs/ardour/ardour/legatize.h
+++ b/libs/ardour/ardour/legatize.h
@@ -42,7 +42,7 @@ public:
 	typedef Evoral::Sequence<Temporal::Beats>::Notes Notes;
 
 	Command* operator()(boost::shared_ptr<ARDOUR::MidiModel> model,
-	                    Temporal::Beats                        position,
+	                    Temporal::Beats                      position,
 	                    std::vector<Notes>&                  seqs);
 
 	std::string name () const { return (_shrink_only ? std::string ("remove overlap") : std::string ("legatize")); }
diff --git a/libs/ardour/ardour/midi_cursor.h b/libs/ardour/ardour/midi_cursor.h
index 6504874990..6491341447 100644
--- a/libs/ardour/ardour/midi_cursor.h
+++ b/libs/ardour/ardour/midi_cursor.h
@@ -24,10 +24,14 @@
 
 #include <boost/utility.hpp>
 
-#include "ardour/types.h"
+
+
+#include "pbd/signals.h"
+
 #include "temporal/beats.h"
 #include "evoral/Sequence.hpp"
-#include "pbd/signals.h"
+
+#include "ardour/types.h"
 
 namespace ARDOUR {
 
diff --git a/libs/ardour/ardour/midi_model.h b/libs/ardour/ardour/midi_model.h
index 81e60ecf93..e74bc26c36 100644
--- a/libs/ardour/ardour/midi_model.h
+++ b/libs/ardour/ardour/midi_model.h
@@ -265,8 +265,8 @@ public:
 
 	bool write_section_to(boost::shared_ptr<MidiSource>     source,
 	                      const Glib::Threads::Mutex::Lock& source_lock,
-	                      Temporal::Beats                     begin = Temporal::Beats(),
-	                      Temporal::Beats                     end   = std::numeric_limits<Temporal::Beats>::max(),
+	                      Temporal::Beats                   begin = Temporal::Beats(),
+	                      Temporal::Beats                   end   = std::numeric_limits<Temporal::Beats>::max(),
 	                      bool                              offset_events = false);
 
 	// MidiModel doesn't use the normal AutomationList serialisation code
diff --git a/libs/ardour/ardour/midi_source.h b/libs/ardour/ardour/midi_source.h
index 0bede7fe52..82e90cec67 100644
--- a/libs/ardour/ardour/midi_source.h
+++ b/libs/ardour/ardour/midi_source.h
@@ -62,8 +62,8 @@ class LIBARDOUR_API MidiSource : virtual public Source, public boost::enable_sha
 	 */
 	int write_to (const Lock&                   lock,
 	              boost::shared_ptr<MidiSource> newsrc,
-	              Temporal::Beats                 begin = Temporal::Beats(),
-	              Temporal::Beats                 end   = std::numeric_limits<Temporal::Beats>::max());
+	              Temporal::Beats               begin = Temporal::Beats(),
+	              Temporal::Beats               end   = std::numeric_limits<Temporal::Beats>::max());
 
 	/** Export the midi data in the given time range to another MidiSource
 	 * \param newsrc MidiSource to which data will be written. Should be a
@@ -75,8 +75,8 @@ class LIBARDOUR_API MidiSource : virtual public Source, public boost::enable_sha
 	 */
 	int export_write_to (const Lock&                   lock,
 	                     boost::shared_ptr<MidiSource> newsrc,
-	                     Temporal::Beats                 begin,
-	                     Temporal::Beats                 end);
+	                     Temporal::Beats               begin,
+	                     Temporal::Beats               end);
 
 	/** Read the data in a given time range from the MIDI source.
 	 * All time stamps in parameters are in audio samples (even if the source has tempo time).
@@ -156,7 +156,7 @@ class LIBARDOUR_API MidiSource : virtual public Source, public boost::enable_sha
 	virtual void mark_midi_streaming_write_completed (
 		const Lock&                                      lock,
 		Evoral::Sequence<Temporal::Beats>::StuckNoteOption stuck_option,
-		Temporal::Beats                                    when = Temporal::Beats());
+		Temporal::Beats                                  when = Temporal::Beats());
 
 	virtual void session_saved();
 
diff --git a/libs/ardour/ardour/note_fixer.h b/libs/ardour/ardour/note_fixer.h
index 320c92bc71..69abc39df4 100644
--- a/libs/ardour/ardour/note_fixer.h
+++ b/libs/ardour/ardour/note_fixer.h
@@ -24,11 +24,13 @@
 
 #include <boost/utility.hpp>
 
-#include "ardour/midi_model.h"
-#include "ardour/types.h"
 #include "temporal/beats.h"
+
 #include "evoral/Note.hpp"
 
+#include "ardour/midi_model.h"
+#include "ardour/types.h"
+
 namespace Evoral { template<typename Time> class EventSink; }
 
 namespace ARDOUR {
diff --git a/libs/ardour/ardour/smf_source.h b/libs/ardour/ardour/smf_source.h
index 68dd74e1c4..88c02beed5 100644
--- a/libs/ardour/ardour/smf_source.h
+++ b/libs/ardour/ardour/smf_source.h
@@ -78,7 +78,7 @@ public:
 
   private:
 	bool _open;
-	Temporal::Beats       _last_ev_time_beats;
+	Temporal::Beats     _last_ev_time_beats;
 	samplepos_t          _last_ev_time_samples;
 	/** end time (start + duration) of last call to read_unlocked */
 	mutable samplepos_t _smf_last_read_end;
diff --git a/libs/ardour/ardour/transform.h b/libs/ardour/ardour/transform.h
index 89c135ab0a..7d1f9acd70 100644
--- a/libs/ardour/ardour/transform.h
+++ b/libs/ardour/ardour/transform.h
@@ -132,7 +132,7 @@ public:
 	Transform(const Program& prog);
 
 	Command* operator()(boost::shared_ptr<ARDOUR::MidiModel> model,
-	                    Temporal::Beats                        position,
+	                    Temporal::Beats                      position,
 	                    std::vector<Notes>&                  seqs);
 
 	std::string name() const { return std::string ("transform"); }
diff --git a/libs/ardour/ardour/transpose.h b/libs/ardour/ardour/transpose.h
index ad44e28de7..d87265c62d 100644
--- a/libs/ardour/ardour/transpose.h
+++ b/libs/ardour/ardour/transpose.h
@@ -34,7 +34,7 @@ public:
 	Transpose (int semitones);
 
 	Command* operator() (boost::shared_ptr<ARDOUR::MidiModel> model,
-	                     Temporal::Beats                        position,
+	                     Temporal::Beats                      position,
 	                     std::vector<Notes>&                  seqs);
 
 	std::string name () const { return std::string ("transpose"); }
diff --git a/libs/ardour/legatize.cc b/libs/ardour/legatize.cc
index b3c5775b41..cd45d430f3 100644
--- a/libs/ardour/legatize.cc
+++ b/libs/ardour/legatize.cc
@@ -31,7 +31,7 @@ Legatize::~Legatize ()
 
 Command*
 Legatize::operator()(boost::shared_ptr<ARDOUR::MidiModel> model,
-                     Temporal::Beats                        position,
+                     Temporal::Beats                      position,
                      std::vector<Legatize::Notes>&        seqs)
 {
 	MidiModel::NoteDiffCommand* cmd = new MidiModel::NoteDiffCommand(model, name ());
diff --git a/libs/ardour/ltc_file_reader.cc b/libs/ardour/ltc_file_reader.cc
index c402da9a68..0ffc164051 100644
--- a/libs/ardour/ltc_file_reader.cc
+++ b/libs/ardour/ltc_file_reader.cc
@@ -30,6 +30,7 @@
 #include "pbd/failed_constructor.h"
 
 #include "temporal/time.h"
+
 #include "ardour/ltc_file_reader.h"
 
 #include "pbd/i18n.h"
diff --git a/libs/ardour/luabindings.cc b/libs/ardour/luabindings.cc
index b8932d9301..34dcabc736 100644
--- a/libs/ardour/luabindings.cc
+++ b/libs/ardour/luabindings.cc
@@ -18,9 +18,11 @@
 
 #include <glibmm.h>
 
-#include "temporal/bbt_time.h"
 #include "pbd/stateful_diff_command.h"
 #include "pbd/openuri.h"
+
+#include "temporal/bbt_time.h"
+
 #include "evoral/Control.hpp"
 #include "evoral/ControlList.hpp"
 #include "evoral/Range.hpp"
diff --git a/libs/ardour/midi_source.cc b/libs/ardour/midi_source.cc
index 6cfd0b6f21..d7bc4d333e 100644
--- a/libs/ardour/midi_source.cc
+++ b/libs/ardour/midi_source.cc
@@ -357,7 +357,7 @@ MidiSource::mark_streaming_write_started (const Lock& lock)
 void
 MidiSource::mark_midi_streaming_write_completed (const Lock&                                      lock,
                                                  Evoral::Sequence<Temporal::Beats>::StuckNoteOption option,
-                                                 Temporal::Beats                                    end)
+                                                 Temporal::Beats                                  end)
 {
 	if (_model) {
 		_model->end_write (option, end);
diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc
index 23a0553735..93e8a90ee5 100644
--- a/libs/ardour/tempo.cc
+++ b/libs/ardour/tempo.cc
@@ -27,6 +27,7 @@
 
 #include "pbd/enumwriter.h"
 #include "pbd/xml++.h"
+
 #include "temporal/beats.h"
 
 #include "ardour/debug.h"
diff --git a/libs/ardour/transform.cc b/libs/ardour/transform.cc
index 9f7169e61e..6f7c77f06c 100644
--- a/libs/ardour/transform.cc
+++ b/libs/ardour/transform.cc
@@ -121,7 +121,7 @@ Transform::Operation::eval(Context& ctx) const
 
 Command*
 Transform::operator()(boost::shared_ptr<MidiModel> model,
-                      Temporal::Beats                position,
+                      Temporal::Beats              position,
                       std::vector<Notes>&          seqs)
 {
 	typedef MidiModel::NoteDiffCommand Command;
diff --git a/libs/ardour/transpose.cc b/libs/ardour/transpose.cc
index ad5013d05d..cad3207e3c 100644
--- a/libs/ardour/transpose.cc
+++ b/libs/ardour/transpose.cc
@@ -27,7 +27,7 @@ Transpose::Transpose(int semitones)
 
 Command*
 Transpose::operator()(boost::shared_ptr<MidiModel> model,
-                      Temporal::Beats                position,
+                      Temporal::Beats              position,
                       std::vector<Notes>&          seqs)
 {
 	typedef MidiModel::NoteDiffCommand Command;
diff --git a/libs/surfaces/push2/mix.cc b/libs/surfaces/push2/mix.cc
index 22d4f330d7..69ed1ba7a1 100644
--- a/libs/surfaces/push2/mix.cc
+++ b/libs/surfaces/push2/mix.cc
@@ -28,6 +28,7 @@
 #include "pbd/enumwriter.h"
 
 #include "midi++/parser.h"
+
 #include "temporal/time.h"
 #include "temporal/bbt_time.h"
 
diff --git a/libs/surfaces/push2/push2.cc b/libs/surfaces/push2/push2.cc
index 464240d379..b024b6404f 100644
--- a/libs/surfaces/push2/push2.cc
+++ b/libs/surfaces/push2/push2.cc
@@ -28,6 +28,7 @@
 #include "pbd/enumwriter.h"
 
 #include "midi++/parser.h"
+
 #include "temporal/time.h"
 #include "temporal/bbt_time.h"
 
diff --git a/libs/surfaces/push2/track_mix.cc b/libs/surfaces/push2/track_mix.cc
index 5712486048..5c0b111ef9 100644
--- a/libs/surfaces/push2/track_mix.cc
+++ b/libs/surfaces/push2/track_mix.cc
@@ -29,6 +29,7 @@
 #include "pbd/enumwriter.h"
 
 #include "midi++/parser.h"
+
 #include "temporal/time.h"
 #include "temporal/bbt_time.h"