X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmidi_streamview.h;h=92d40958441f9ecedd9ab912ab369d1b5ab070dd;hb=4dc65e6613a375a836de4dd9901ac50a4ab43be6;hp=b3506d42248d2c34cea8b16911b1c56dcab6c48d;hpb=f00b3b7f111e36537d773daef0ae77b03d11f82f;p=ardour.git

diff --git a/gtk2_ardour/midi_streamview.h b/gtk2_ardour/midi_streamview.h
index b3506d4224..92d4095844 100644
--- a/gtk2_ardour/midi_streamview.h
+++ b/gtk2_ardour/midi_streamview.h
@@ -55,7 +55,7 @@ class Selection;
 
 class MidiStreamView : public StreamView
 {
-  public:
+public:
 	MidiStreamView (MidiTimeAxisView&);
 	~MidiStreamView ();
 
@@ -68,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,42 +77,49 @@ 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 ();
 
-	void leave_internal_edit_mode ();
-	
-	inline double contents_height() const
-	{ return (child_height() - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 2); }
+	inline double contents_height() const {
+		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 double note_to_y(uint8_t note) const {
+		return contents_height() - (note + 1 - lowest_note()) * note_height() + 1;
+	}
 
 	uint8_t y_to_note(double y) const;
 
-	inline double note_height() const
-		{ return contents_height() / (double)contents_note_range(); }
+	inline double note_height() const {
+		return contents_height() / (double)contents_note_range();
+	}
 
-	inline uint8_t contents_note_range() const
-		{ return highest_note() - lowest_note() + 1; }
+	inline uint8_t contents_note_range() const {
+		return highest_note() - lowest_note() + 1;
+	}
 
 	sigc::signal<void> NoteRangeChanged;
 
 	RegionView* create_region_view (boost::shared_ptr<ARDOUR::Region>, bool, bool);
 
+	bool paste (ARDOUR::samplepos_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 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,
-		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);