X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmidi_streamview.h;h=59cf2da9d7d021bbddd37df0942f3b72044ba45b;hb=52275254a7adb9a446c104cc7dcfde82d1792786;hp=b29f030e61c4038c35e4a8f6e757e46b9ef6b099;hpb=ba0458cf1f6c69366e89631d8fff916ad183d768;p=ardour.git

diff --git a/gtk2_ardour/midi_streamview.h b/gtk2_ardour/midi_streamview.h
index b29f030e61..59cf2da9d7 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);
 
@@ -77,16 +80,13 @@ class MidiStreamView : public StreamView
 	void redisplay_track ();
 
 	inline double contents_height() const
-	{ return (_trackview.current_height() - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 2); }
+	{ return (child_height() - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 2); }
 
 	inline double note_to_y(uint8_t note) const
 		{ return contents_height()
 			- (note + 1 - lowest_note()) * note_height() + 1; }
 
-	inline uint8_t y_to_note(double y) const
-		{ return (uint8_t)((contents_height() - y - 1)
-				/ contents_height() * (double)contents_note_range())
-				+ lowest_note(); }
+	uint8_t y_to_note(double y) const;
 
 	inline double note_height() const
 		{ return contents_height() / (double)contents_note_range(); }
@@ -98,12 +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, const int32_t sub_num);
+
 	void apply_note_range(uint8_t lowest, uint8_t highest, bool to_region_views);
 
-  private:
+	void suspend_updates ();
+	void resume_updates ();
+
+  protected:
 	void setup_rec_box ();
 	void update_rec_box ();
 
+  private:
+
 	RegionView* add_region_view_internal (
 		boost::shared_ptr<ARDOUR::Region>,
 		bool wait_for_waves,
@@ -121,6 +128,7 @@ class MidiStreamView : public StreamView
 	void color_handler ();
 
 	void note_range_adjustment_changed();
+	void apply_note_range_to_regions ();
 
 	bool                      _range_dirty;
 	double                    _range_sum_cache;
@@ -129,6 +137,8 @@ class MidiStreamView : public StreamView
 	uint8_t                   _data_note_min; ///< in data
 	uint8_t                   _data_note_max; ///< in data
 	ArdourCanvas::LineSet*    _note_lines;
+	/** true if updates to the note lines and regions are currently suspended */
+	bool                      _updates_suspended;
 };
 
 #endif /* __ardour_midi_streamview_h__ */