X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmidi_streamview.h;h=9be3b34d9ce1b779e7d034630e4852217f047768;hb=ac23461ed9c066afce9baba711f5449671403933;hp=aceb59e69f284757da89338b97af820b49af5797;hpb=cb643ab9652d08a85802ce2a94c5bd57ca31256e;p=ardour.git

diff --git a/gtk2_ardour/midi_streamview.h b/gtk2_ardour/midi_streamview.h
index aceb59e69f..9be3b34d9c 100644
--- a/gtk2_ardour/midi_streamview.h
+++ b/gtk2_ardour/midi_streamview.h
@@ -27,19 +27,22 @@
 #include "streamview.h"
 #include "time_axis_view_item.h"
 #include "route_time_axis.h"
-#include "canvas.h"
 
 namespace Gdk {
 	class Color;
 }
 
 namespace ARDOUR {
-	class Route;
 	class Crossfade;
-	class PeakData;
+	class MidiModel;
 	class MidiRegion;
+	class Route;
 	class Source;
-	class MidiModel;
+	struct PeakData;
+}
+
+namespace ArdourCanvas {
+	class LineSet;
 }
 
 class PublicEditor;
@@ -65,7 +68,7 @@ class MidiStreamView : public StreamView
 	};
 
 	Gtk::Adjustment note_range_adjustment;
-	ArdourCanvas::Group* midi_underlay_group;
+	ArdourCanvas::Container* midi_underlay_group;
 
 	void set_note_range(VisibleNoteRange r);
 
@@ -95,15 +98,19 @@ class MidiStreamView : public StreamView
 
 	RegionView* create_region_view (boost::shared_ptr<ARDOUR::Region>, bool, bool);
 
+	bool paste (ARDOUR::framepos_t pos, const Selection& selection, PasteContext& ctx);
+
 	void apply_note_range(uint8_t lowest, uint8_t highest, bool to_region_views);
 
 	void suspend_updates ();
 	void resume_updates ();
 
-  private:
+  protected:
 	void setup_rec_box ();
 	void update_rec_box ();
 
+  private:
+
 	RegionView* add_region_view_internal (
 		boost::shared_ptr<ARDOUR::Region>,
 		bool wait_for_waves,