merge with master, primarily for adrian's maximise-mixer change

[ardour.git] / gtk2_ardour / hit.h

diff --git a/gtk2_ardour/hit.h b/gtk2_ardour/hit.h
index 3afdd9136775b6ba5892227494feacd2c880af70..0a02501606b0830f92749e9c1d790aea0cea14ab 100644 (file)
--- a/gtk2_ardour/hit.h
+++ b/gtk2_ardour/hit.h
@@ -32,14 +32,14 @@ class Hit : public NoteBase
 public:
        typedef Evoral::Note<double> NoteType;
 
-       Hit (
-               MidiRegionView&                   region,
-               ArdourCanvas::Group*              group,
-               double                            size,
-               const boost::shared_ptr<NoteType> note = boost::shared_ptr<NoteType>(),
-               bool with_events = true);
-
-       void show ();
+       Hit (MidiRegionView&                   region,
+            ArdourCanvas::Group*              group,
+            double                            size,
+            const boost::shared_ptr<NoteType> note = boost::shared_ptr<NoteType>(),
+            bool with_events = true);
+       ~Hit();
+
+        void show ();
        void hide ();
 
        ArdourCanvas::Coord x0 () const;
@@ -56,6 +56,9 @@ public:
 
        void move_event (double, double);
 
+        /* no trimming of percussive hits */
+        bool big_enough_to_trim() const { return false; }
+
 private:
        ArdourCanvas::Polygon* _polygon;
 };