Editor zoom: add 2hour and 24hour zoom limits.

[ardour.git] / gtk2_ardour / midi_region_view.h

diff --git a/gtk2_ardour/midi_region_view.h b/gtk2_ardour/midi_region_view.h
index 400d793d0b4e15cf6bcf54504374089d1d6edaa0..20a1ee5b25f85260a2cd4f3839d9e23e1860f8d8 100644 (file)
--- a/gtk2_ardour/midi_region_view.h
+++ b/gtk2_ardour/midi_region_view.h
@@ -303,7 +303,7 @@ public:
        void goto_previous_note (bool add_to_selection);
        void goto_next_note (bool add_to_selection);
        void change_note_lengths (bool, bool, Evoral::Beats beats, bool start, bool end);
-        void change_velocities (bool up, bool fine, bool allow_smush, bool all_together);
+       void change_velocities (bool up, bool fine, bool allow_smush, bool all_together);
        void transpose (bool up, bool fine, bool allow_smush);
        void nudge_notes (bool forward, bool fine);
        void channel_edit ();
@@ -463,7 +463,6 @@ private:
 
        /** connection used to connect to model's ContentChanged signal */
        PBD::ScopedConnection content_connection;
-       PBD::ScopedConnection content_shift_connection;
 
        NoteBase* find_canvas_note (boost::shared_ptr<NoteType>);
        NoteBase* find_canvas_note (Evoral::event_id_t id);
@@ -522,8 +521,8 @@ private:
 
        bool _mouse_changed_selection;
 
-       ArdourCanvas::Color _patch_change_outline;
-       ArdourCanvas::Color _patch_change_fill;
+       Gtkmm2ext::Color _patch_change_outline;
+       Gtkmm2ext::Color _patch_change_fill;
 
        Evoral::Beats snap_frame_to_grid_underneath (framepos_t p, int32_t divisions, bool shift_snap) const;