X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmidi_streamview.h;h=6ba2b7146f20c389395f93d9026f0d80582abdd4;hb=f420fed45db5417b5360c525ae1fcc8e919f3ac9;hp=107a804db8e1cccd0cf810f06c47bd68d53404a4;hpb=d752986314eb37151983393c1d62efefe503e47c;p=ardour.git

diff --git a/gtk2_ardour/midi_streamview.h b/gtk2_ardour/midi_streamview.h
index 107a804db8..6ba2b7146f 100644
--- a/gtk2_ardour/midi_streamview.h
+++ b/gtk2_ardour/midi_streamview.h
@@ -20,14 +20,14 @@
 #define __ardour_midi_streamview_h__
 
 #include <list>
-#include <map>
 #include <cmath>
 
 #include <ardour/location.h>
 #include "enums.h"
 #include "simplerect.h"
-#include "color.h"
 #include "streamview.h"
+#include "time_axis_view_item.h"
+#include "route_time_axis.h"
 
 namespace Gdk {
 	class Color;
@@ -60,18 +60,58 @@ class MidiStreamView : public StreamView
 	void get_selectables (jack_nframes_t start, jack_nframes_t end, list<Selectable* >&);
 	void get_inverted_selectables (Selection&, list<Selectable* >& results);
 
+	enum VisibleNoteRange {
+		FullRange,
+		ContentsRange
+	};
+
+	VisibleNoteRange note_range() { return _range; }
+	void set_note_range(VisibleNoteRange r) { _range = r; }
+
+	uint8_t lowest_note()  const { return (_range == FullRange) ? 0 : _lowest_note; }
+	uint8_t highest_note() const { return (_range == FullRange) ? 127 : _highest_note; }
+	
+	void update_bounds(uint8_t note_num);
+	
+	void redisplay_diskstream ();
+	
+	inline double contents_height() const
+		{ return (_trackview.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; }
+	
+	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; }
+
   private:
 	void setup_rec_box ();
-	void rec_data_range_ready (jack_nframes_t start, jack_nframes_t cnt, ARDOUR::Source* src); 
-	void update_rec_regions ();
+	void rec_data_range_ready (boost::shared_ptr<ARDOUR::MidiBuffer> data, jack_nframes_t start, jack_nframes_t dur, boost::weak_ptr<ARDOUR::Source> src); 
+	void update_rec_regions (boost::shared_ptr<ARDOUR::MidiBuffer> data, jack_nframes_t start, jack_nframes_t dur);
+	
+	RegionView* add_region_view_internal (boost::shared_ptr<ARDOUR::Region>, bool wait_for_waves);
+	void        display_region(MidiRegionView* region_view, bool load_model);
+	void        display_diskstream (boost::shared_ptr<ARDOUR::Diskstream> ds);
 	
-	void add_region_view_internal (ARDOUR::Region*, bool wait_for_waves);
-	void remove_midi_region_view (ARDOUR::MidiRegion* );
-	void remove_midi_rec_region (ARDOUR::MidiRegion*);
+	void update_contents_y_position_and_height ();
+	void draw_note_separators();
 
-	void redisplay_diskstream ();
+	void color_handler ();
 
-	void color_handler (ColorID id, uint32_t val);
+	VisibleNoteRange          _range;
+	uint8_t                   _lowest_note;
+	uint8_t                   _highest_note;
+	ArdourCanvas::Group*      _note_line_group;
+	ArdourCanvas::SimpleLine* _note_lines[127];
 };
 
 #endif /* __ardour_midi_streamview_h__ */