more MIDI binding map syntax corrections

[ardour.git] / gtk2_ardour / midi_streamview.h

diff --git a/gtk2_ardour/midi_streamview.h b/gtk2_ardour/midi_streamview.h
index 1ab832986a3cd90c24216528915fd4edde88a9a2..a939d8ea7d5e76b511784e65bfe819a339789e5a 100644 (file)
--- a/gtk2_ardour/midi_streamview.h
+++ b/gtk2_ardour/midi_streamview.h
@@ -57,7 +57,6 @@ class MidiStreamView : public StreamView
        ~MidiStreamView ();
 
        void set_selected_regionviews (RegionSelection&);
-       void get_selectables (nframes_t start, nframes_t end, std::list<Selectable* >&);
        void get_inverted_selectables (Selection&, std::list<Selectable* >& results);
 
        enum VisibleNoteRange {
@@ -78,16 +77,13 @@ class MidiStreamView : public StreamView
        void redisplay_track ();
 
        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(); }
@@ -99,30 +95,23 @@ class MidiStreamView : public StreamView
 
        RegionView* create_region_view (boost::shared_ptr<ARDOUR::Region>, bool, bool);
 
+       void apply_note_range(uint8_t lowest, uint8_t highest, bool to_region_views);
+
   private:
        void setup_rec_box ();
-
-       void rec_data_range_ready (
-                       nframes_t start,
-                       nframes_t dur,
-                       boost::weak_ptr<ARDOUR::Source> src);
-
-       void update_rec_regions (
-                       boost::shared_ptr<ARDOUR::MidiModel> data,
-                       nframes_t start,
-                       nframes_t dur);
+       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_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);