Clear out any command line session name on closing a session so that the same session...

[ardour.git] / gtk2_ardour / midi_streamview.h

diff --git a/gtk2_ardour/midi_streamview.h b/gtk2_ardour/midi_streamview.h
index e6d325c0c501606d4bb12465fb9a2381e31dc978..2b7a7b02fa827eee6f092a050604c2ad6eff418b 100644 (file)
--- a/gtk2_ardour/midi_streamview.h
+++ b/gtk2_ardour/midi_streamview.h
@@ -22,7 +22,7 @@
 #include <list>
 #include <cmath>
 
-#include <ardour/location.h>
+#include "ardour/location.h"
 #include "enums.h"
 #include "streamview.h"
 #include "time_axis_view_item.h"
@@ -58,8 +58,8 @@ class MidiStreamView : public StreamView
        ~MidiStreamView ();
 
        void set_selected_regionviews (RegionSelection&);
-       void get_selectables (jack_nframes_t start, jack_nframes_t end, list<Selectable* >&);
-       void get_inverted_selectables (Selection&, list<Selectable* >& results);
+       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 {
                FullRange,
@@ -98,6 +98,8 @@ class MidiStreamView : public StreamView
        
        sigc::signal<void> NoteRangeChanged;
 
+       RegionView* create_region_view (boost::shared_ptr<ARDOUR::Region>, bool, bool);
+
   private:
        void setup_rec_box ();
 
@@ -121,8 +123,9 @@ class MidiStreamView : public StreamView
        
        void update_contents_height ();
        void draw_note_lines();
-       void apply_note_range(uint8_t lowest, uint8_t highest);
+       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 ();
 
@@ -134,7 +137,7 @@ class MidiStreamView : public StreamView
        uint8_t                   _highest_note;  ///< currently visible
        uint8_t                   _data_note_min; ///< in data
        uint8_t                   _data_note_max; ///< in data
-       ArdourCanvas::Lineset*    _note_lines;
+       ArdourCanvas::LineSet*    _note_lines;
 };
 
 #endif /* __ardour_midi_streamview_h__ */