diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2017-09-24 12:57:27 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2017-09-24 12:57:27 -0400 |
commit | b9c6ffac214a69bb64e8ba5adbbe0951a9119f09 (patch) | |
tree | c24ba0d0e76ba848171dcbfe22673b3d020c8535 /gtk2_ardour | |
parent | 7db12f6b128eef0d63dd6a8eda3d04f4dab1fc79 (diff) |
fix header order and space alignment
Diffstat (limited to 'gtk2_ardour')
-rw-r--r-- | gtk2_ardour/hit.cc | 1 | ||||
-rw-r--r-- | gtk2_ardour/midi_region_view.cc | 4 | ||||
-rw-r--r-- | gtk2_ardour/midi_region_view.h | 4 | ||||
-rw-r--r-- | gtk2_ardour/public_editor.h | 5 | ||||
-rw-r--r-- | gtk2_ardour/step_editor.h | 7 |
5 files changed, 12 insertions, 9 deletions
diff --git a/gtk2_ardour/hit.cc b/gtk2_ardour/hit.cc index 3aae30fa0f..41944eb3af 100644 --- 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 34b879ce11..4a19a6697a 100644 --- 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 84f7ab9a84..c13bd2d0ab 100644 --- 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 ed66f27bd8..da024706cf 100644 --- 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 99a6112b5a..3854f3811d 100644 --- 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 (); |