fix header order and space alignment

diff --git a/gtk2_ardour/hit.cc b/gtk2_ardour/hit.cc
index 3aae30fa0f1e605c1b8118c7a669615cc0e59607..41944eb3aff02f679cc66ee6272482dff822f4e0 100644 (file)
--- a/gtk2_ardour/hit.cc
+++ b/gtk2_ardour/hit.cc
@@ -18,6 +18,7 @@
 */
 
 #include "temporal/beats.h"
+
 #include "evoral/Note.hpp"
 
 #include "canvas/polygon.h"

diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc
index 34b879ce11cc3737b03a067f3497590ef498e4c5..4a19a6697ac18189f5b1ad1a1d502173511efc6b 100644 (file)
--- a/gtk2_ardour/midi_region_view.cc
+++ b/gtk2_ardour/midi_region_view.cc
@@ -3476,7 +3476,7 @@ MidiRegionView::nudge_notes (bool forward, bool fine)
        */
 
        const samplepos_t ref_point = source_beats_to_absolute_samples ((*(_selection.begin()))->note()->time());
-       Temporal::Beats    delta;
+       Temporal::Beats  delta;
 
        if (!fine) {
 
@@ -3786,7 +3786,7 @@ MidiRegionView::paste_internal (samplepos_t pos, unsigned paste_count, float tim
        const Temporal::Beats snap_duration = duration.snap_to(snap_beats);
        const Temporal::Beats paste_offset  = snap_duration * paste_count;
        const Temporal::Beats quarter_note     = absolute_samples_to_source_beats(pos) + paste_offset;
-       Temporal::Beats       end_point     = Temporal::Beats();
+       Temporal::Beats     end_point     = Temporal::Beats();
 
        DEBUG_TRACE (DEBUG::CutNPaste, string_compose ("Paste data spans from %1 to %2 (%3) ; paste pos beats = %4 (based on %5 - %6)\n",
                                                       first_time,

diff --git a/gtk2_ardour/midi_region_view.h b/gtk2_ardour/midi_region_view.h
index 84f7ab9a84e56ac56849e4139afe046d7f3fc8a9..c13bd2d0abd859efc4b9786301d3e962e6c9c0ab 100644 (file)
--- a/gtk2_ardour/midi_region_view.h
+++ b/gtk2_ardour/midi_region_view.h
@@ -436,8 +436,8 @@ private:
        double                               _last_ghost_x;
        double                               _last_ghost_y;
        ArdourCanvas::Rectangle*             _step_edit_cursor;
-       Temporal::Beats                        _step_edit_cursor_width;
-       Temporal::Beats                        _step_edit_cursor_position;
+       Temporal::Beats                      _step_edit_cursor_width;
+       Temporal::Beats                      _step_edit_cursor_position;
        NoteBase*                            _channel_selection_scoped_note;
 
        MouseState _mouse_state;

diff --git a/gtk2_ardour/public_editor.h b/gtk2_ardour/public_editor.h
index ed66f27bd84eba1fdf79d7c977b0989ef6b2056e..da024706cf5ed198339fcae3706b3c1ba80c0976 100644 (file)
--- a/gtk2_ardour/public_editor.h
+++ b/gtk2_ardour/public_editor.h
@@ -35,10 +35,11 @@
 #include <gtkmm/notebook.h>
 #include <sigc++/signal.h>
 
+#include "pbd/statefuldestructible.h"
+
 #include "temporal/beats.h"
-#include "evoral/Note.hpp"
 
-#include "pbd/statefuldestructible.h"
+#include "evoral/Note.hpp"
 
 #include "ardour/session_handle.h"
 

diff --git a/gtk2_ardour/step_editor.h b/gtk2_ardour/step_editor.h
index 99a6112b5a489aaf2517b24220c8b2dd8fa20cbb..3854f3811d0f3d70244372e64a5152ceecaf5f81 100644 (file)
--- a/gtk2_ardour/step_editor.h
+++ b/gtk2_ardour/step_editor.h
@@ -25,6 +25,7 @@
 #include <sigc++/trackable.h>
 
 #include "pbd/signals.h"
+
 #include "temporal/beats.h"
 
 namespace ARDOUR {
@@ -68,19 +69,19 @@ public:
 
 private:
        ARDOUR::samplepos_t                    step_edit_insert_position;
-       Temporal::Beats                         step_edit_beat_pos;
+       Temporal::Beats                       step_edit_beat_pos;
        boost::shared_ptr<ARDOUR::MidiRegion> step_edit_region;
        MidiRegionView*                       step_edit_region_view;
        uint8_t                               _step_edit_triplet_countdown;
        bool                                  _step_edit_within_chord;
-       Temporal::Beats                         _step_edit_chord_duration;
+       Temporal::Beats                       _step_edit_chord_duration;
        PBD::ScopedConnection                 step_edit_region_connection;
        PublicEditor&                         _editor;
        boost::shared_ptr<ARDOUR::MidiTrack>  _track;
        StepEntry*                            step_editor;
        MidiTimeAxisView&                     _mtv;
        int8_t                                last_added_pitch;
-       Temporal::Beats                         last_added_end;
+       Temporal::Beats                       last_added_end;
 
        void region_removed (boost::weak_ptr<ARDOUR::Region>);
        void playlist_changed ();

diff --git a/libs/ardour/ardour/legatize.h b/libs/ardour/ardour/legatize.h
index 74c4d112df6443d3c1efe9ed96aabbcea282e69c..bf0eee869f0ea790625af1873b92dc22b11dd407 100644 (file)
--- 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 6504874990ad55fbab94272d2d066b861f3ff05d..649134144731ff8f41cf10635ecc4c1f61d3d820 100644 (file)
--- 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 81e60ecf93324a24437bd848d2a5293d4d06c401..e74bc26c36204bd51caf09c3615a39444ef22a08 100644 (file)
--- 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 0bede7fe52504f3a05436c0e912d8b1db2f9a368..82e90cec678f6945ddbea70a652c3cab5b8f0e25 100644 (file)
--- 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 320c92bc71e60142b707438b86d211d943440012..69abc39df47663ebdb229a4cc44f48f50683f9ec 100644 (file)
--- 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 68dd74e1c4ce2c3678a94ea3524fa56e16fde020..88c02beed5ede234d8739115a5d1dc8edb4c4218 100644 (file)
--- 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 89c135ab0aedeea6ab2c5927d5e72949003e7592..7d1f9acd7047c04c4a817d7dbc4f495e8acda636 100644 (file)
--- 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 ad44e28de776252d4fd53e47f623fe1ba4c758dc..d87265c62dafa0a80e22047276e411a2af107da1 100644 (file)
--- 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 b3c5775b41428989a399dd55b46221255a585640..cd45d430f3cd255a2c1ef583b577e3baeb16ea1d 100644 (file)
--- 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 c402da9a685d0b3854bcf5a9452b055c1bd89222..0ffc16405121eb633a51658801a8175f667f129a 100644 (file)
--- 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 b8932d9301b2d97cb0d5d644d3b43d8dfd620cda..34dcabc73696fe1f70a1a2bc347126881829e424 100644 (file)
--- 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 6cfd0b6f21fed133e6057b1ffa1bbb25d935a2d2..d7bc4d333e7fe1b7feeb973d9500a10fde015780 100644 (file)
--- 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 23a0553735532c3d706d001db11901b393d4056e..93e8a90ee5c1b7629bf21e844aedd69a16fcc5a4 100644 (file)
--- 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 9f7169e61ee20a1d1795c42279cc573e31d068cd..6f7c77f06cb005d591caf77ecb098fcd6433d94f 100644 (file)
--- 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 ad5013d05d0d140aa47b343087a32dbb2f7f3fb5..cad3207e3c4b317cb413a005b104412da5d51e1a 100644 (file)
--- 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 22d4f330d7a243985840383357cbc3007e8cc505..69ed1ba7a19f5543431dfe1a359c9dc60202ac24 100644 (file)
--- 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 464240d3799baca1fabb5d643e998fdb3a3584a1..b024b6404fdd9e708ed9a18b8bc893ecd177b201 100644 (file)
--- 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 57124860486978a8eccaedf242e36f6b08d38487..5c0b111ef9e5c42de02daf32138ac99f45af51c4 100644 (file)
--- 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"
 

diff --git a/nutemp/t.h b/nutemp/t.h
index 3f675399fe27d2784ffe04aaf10419c796234126..d18775fccbdbdf0e7c61b164f7edeb5e42c23e39 100644 (file)
--- a/nutemp/t.h
+++ b/nutemp/t.h
@@ -290,7 +290,7 @@ class LIBARDOUR_API TempoMapPoint
                ExplicitInfo          _explicit;
        };
        superclock_t          _sclock;
-       Temporal::Beats         _quarters;
+       Temporal::Beats       _quarters;
        Timecode::BBT_Time    _bbt;
        bool                  _dirty;
        TempoMap*             _map;