Fix region/track naming on MIDI import (remove ugly/unnecessary %a %b etc suffix).

[ardour.git] / gtk2_ardour / midi_streamview.h

diff --git a/gtk2_ardour/midi_streamview.h b/gtk2_ardour/midi_streamview.h
index 567844e6787a80d70c1241f215a503596f04d822..60dde8cc8505a9b8ed6aa1675aa55e48fdf12dae 100644 (file)
--- a/gtk2_ardour/midi_streamview.h
+++ b/gtk2_ardour/midi_streamview.h
@@ -24,10 +24,10 @@
 
 #include <ardour/location.h>
 #include "enums.h"
-#include "simplerect.h"
 #include "streamview.h"
 #include "time_axis_view_item.h"
 #include "route_time_axis.h"
+#include "canvas.h"
 
 namespace Gdk {
        class Color;
@@ -40,6 +40,7 @@ namespace ARDOUR {
        class PeakData;
        class MidiRegion;
        class Source;
+       class MidiModel;
 }
 
 class PublicEditor;
@@ -65,8 +66,12 @@ class MidiStreamView : public StreamView
                ContentsRange
        };
 
+       Gtk::Adjustment note_range_adjustment;
+       ArdourCanvas::Group* midi_underlay_group;
+
        VisibleNoteRange note_range() { return _range; }
        void set_note_range(VisibleNoteRange r);
+       void set_note_range(uint8_t lowest, uint8_t highest);
 
        uint8_t lowest_note()  const { return (_range == FullRange) ? 0 : _lowest_note; }
        uint8_t highest_note() const { return (_range == FullRange) ? 127 : _highest_note; }
@@ -92,26 +97,30 @@ class MidiStreamView : public StreamView
        
        inline uint8_t contents_note_range() const
                { return _highest_note - _lowest_note + 1; }
+       
+       sigc::signal<void> NoteRangeChanged;
 
   private:
        void setup_rec_box ();
-       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);
+       void rec_data_range_ready (jack_nframes_t start, jack_nframes_t dur, boost::weak_ptr<ARDOUR::Source> src); 
+       void update_rec_regions (boost::shared_ptr<ARDOUR::MidiModel> 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 update_contents_y_position_and_height ();
-       void draw_note_separators();
+       void draw_note_lines();
 
        void color_handler ();
 
+       void note_range_adjustment_changed();
+
        VisibleNoteRange          _range;
+       double                    _range_sum_cache;
        uint8_t                   _lowest_note;
        uint8_t                   _highest_note;
-       ArdourCanvas::Group*      _note_line_group;
-       ArdourCanvas::SimpleLine* _note_lines[127];
+       ArdourCanvas::Lineset*    _note_lines;
 };
 
 #endif /* __ardour_midi_streamview_h__ */