X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmidi_streamview.h;h=78f000815787842a51d03877881a6125f59c6e25;hb=26decc032c1415fcf631dd7662f22024b4c9a8cf;hp=2ef4697b372c0f8e8270e870c7705ba32d1d07d6;hpb=c06c6c153db6b33b93515100d839f376dc805d5d;p=ardour.git

diff --git a/gtk2_ardour/midi_streamview.h b/gtk2_ardour/midi_streamview.h
index 2ef4697b37..78f0008157 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);
 
@@ -74,19 +77,18 @@ class MidiStreamView : public StreamView
 
 	void update_note_range(uint8_t note_num);
 
+	void set_layer_display (LayerDisplay);
+//	bool can_change_layer_display() const { return false; }  //revert this change for now.  Although stacked view is weirdly implemented wrt the "scroomer", it is still necessary to be able to manage layered regions.
 	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,23 +100,23 @@ class MidiStreamView : public StreamView
 
 	RegionView* create_region_view (boost::shared_ptr<ARDOUR::Region>, bool, bool);
 
-  private:
-	void setup_rec_box ();
+	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);
 
-	void rec_data_range_ready (
-			nframes_t start,
-			nframes_t dur,
-			boost::weak_ptr<ARDOUR::Source> src);
+	void suspend_updates ();
+	void resume_updates ();
 
-	void update_rec_regions (
-			boost::shared_ptr<ARDOUR::MidiModel> data,
-			nframes_t start,
-			nframes_t dur);
+  protected:
+	void setup_rec_box ();
+	void update_rec_box ();
+
+  private:
 
 	RegionView* add_region_view_internal (
-			boost::shared_ptr<ARDOUR::Region>,
-			bool wait_for_waves,
-			bool recording = false);
+		boost::shared_ptr<ARDOUR::Region>,
+		bool wait_for_waves,
+		bool recording = false);
 
 	void display_region(MidiRegionView* region_view, bool load_model);
 	void display_track (boost::shared_ptr<ARDOUR::Track> tr);
@@ -122,13 +124,13 @@ class MidiStreamView : public StreamView
 	void update_contents_height ();
 
 	void draw_note_lines();
-	void apply_note_range(uint8_t lowest, uint8_t highest, bool to_region_views);
 	bool update_data_note_range(uint8_t min, uint8_t max);
 	void update_contents_metrics(boost::shared_ptr<ARDOUR::Region> r);
 
 	void color_handler ();
 
 	void note_range_adjustment_changed();
+	void apply_note_range_to_regions ();
 
 	bool                      _range_dirty;
 	double                    _range_sum_cache;
@@ -137,6 +139,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__ */