X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmidi_streamview.h;h=b3506d42248d2c34cea8b16911b1c56dcab6c48d;hb=7022456b4fc49bbef6a0f308f6f6557d659eff52;hp=87fc003283839b82136338a4cf7b9f416d16ed6c;hpb=bb9cc45cd22af67ac275a5e73accbe14fee664d8;p=ardour.git

diff --git a/gtk2_ardour/midi_streamview.h b/gtk2_ardour/midi_streamview.h
index 87fc003283..b3506d4224 100644
--- a/gtk2_ardour/midi_streamview.h
+++ b/gtk2_ardour/midi_streamview.h
@@ -27,20 +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 Diskstream;
 	class Crossfade;
-	class PeakData;
+	class MidiModel;
 	class MidiRegion;
+	class Route;
 	class Source;
-	class MidiModel;
+	struct PeakData;
+}
+
+namespace ArdourCanvas {
+	class LineSet;
 }
 
 class PublicEditor;
@@ -58,7 +60,6 @@ class MidiStreamView : public StreamView
 	~MidiStreamView ();
 
 	void set_selected_regionviews (RegionSelection&);
-	void get_selectables (jack_nframes_t start, jack_nframes_t end, std::list<Selectable* >&);
 	void get_inverted_selectables (Selection&, std::list<Selectable* >& results);
 
 	enum VisibleNoteRange {
@@ -76,19 +77,18 @@ class MidiStreamView : public StreamView
 
 	void update_note_range(uint8_t note_num);
 
-	void redisplay_diskstream ();
+	void redisplay_track ();
 
+	void leave_internal_edit_mode ();
+	
 	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(); }
@@ -100,36 +100,33 @@ class MidiStreamView : public StreamView
 
 	RegionView* create_region_view (boost::shared_ptr<ARDOUR::Region>, bool, bool);
 
-  private:
-	void setup_rec_box ();
+	void apply_note_range(uint8_t lowest, uint8_t highest, bool to_region_views);
 
-	void rec_data_range_ready (
-			jack_nframes_t start,
-			jack_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,
-			jack_nframes_t start,
-			jack_nframes_t dur);
+  private:
+	void setup_rec_box ();
+	void update_rec_box ();
 
 	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_diskstream (boost::shared_ptr<ARDOUR::Diskstream> ds);
+	void display_track (boost::shared_ptr<ARDOUR::Track> tr);
 
 	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;
@@ -138,6 +135,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__ */