add a new name for the region-layering-editor-action that tells us we were started...

[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 c4c483892b60479117d4ea278d0cb657fc1e5d73..b42b7e5a364df47f9e8af9dbdd94abc16c77b264 100644 (file)
--- a/gtk2_ardour/midi_region_view.h
+++ b/gtk2_ardour/midi_region_view.h
@@ -28,7 +28,6 @@
 #include "pbd/signals.h"
 
 #include "ardour/midi_track.h"
-#include "ardour/midi_region.h"
 #include "ardour/midi_model.h"
 #include "ardour/diskstream.h"
 #include "ardour/types.h"
@@ -85,8 +84,7 @@ public:
 
        virtual void init (Gdk::Color const & basic_color, bool wfd);
 
-       inline const boost::shared_ptr<ARDOUR::MidiRegion> midi_region() const
-       { return boost::dynamic_pointer_cast<ARDOUR::MidiRegion>(_region); }
+       const boost::shared_ptr<ARDOUR::MidiRegion> midi_region() const;
 
        inline MidiTimeAxisView* midi_view() const
        { return dynamic_cast<MidiTimeAxisView*>(&trackview); }
@@ -220,6 +218,7 @@ public:
 
        void update_resizing (ArdourCanvas::CanvasNoteEvent*, bool, double, bool);
        void commit_resizing (ArdourCanvas::CanvasNoteEvent*, bool, double, bool);
+       void abort_resizing ();
 
        /** Change the channel of the selection.
         * @param channel - the channel number of the new channel, zero-based
@@ -291,6 +290,8 @@ public:
        void trim_front_starting ();
        void trim_front_ending ();
 
+       void create_note_at (framepos_t, double, double, bool, bool);
+       
 protected:
        /** Allows derived types to specify their visibility requirements
         * to the TimeAxisViewItem parent class.
@@ -313,6 +314,8 @@ protected:
 
 private:
 
+       friend class MidiRubberbandSelectDrag;
+
        /** Emitted when the selection has been cleared in one MidiRegionView */
        static PBD::Signal1<void, MidiRegionView*> SelectionCleared;
        PBD::ScopedConnection _selection_cleared_connection;
@@ -320,8 +323,6 @@ private:
 
        friend class EditNoteDialog;
 
-       void create_note_at(double x, double y, double length, bool, bool);
-
        /** Play the NoteOn event of the given note immediately
         * and schedule the playback of the corresponding NoteOff event.
         */
@@ -384,11 +385,6 @@ private:
        ArdourCanvas::CanvasNote*            _ghost_note;
        double                               _last_ghost_x;
        double                               _last_ghost_y;
-       double                               _drag_start_x;
-       double                               _drag_start_y;
-       double                               _last_x;
-       double                               _last_y;
-       ArdourCanvas::SimpleRect*            _drag_rect;
        ArdourCanvas::SimpleRect*            _step_edit_cursor;
        Evoral::MusicalTime                  _step_edit_cursor_width;
        Evoral::MusicalTime                  _step_edit_cursor_position;
@@ -458,7 +454,7 @@ private:
        void display_patch_changes_on_channel (uint8_t);
 
        void connect_to_diskstream ();
-       void data_recorded (boost::shared_ptr<ARDOUR::MidiBuffer>, boost::weak_ptr<ARDOUR::MidiSource>);
+       void data_recorded (boost::weak_ptr<ARDOUR::MidiSource>);
 
        void remove_ghost_note ();
        void mouse_mode_changed ();