merge from 2.0-ongoing @ 3581

[ardour.git] / gtk2_ardour / midi_streamview.h

diff --git a/gtk2_ardour/midi_streamview.h b/gtk2_ardour/midi_streamview.h
index 60dde8cc8505a9b8ed6aa1675aa55e48fdf12dae..1caad3481999a6d416d5ebb12bf8d5704c9411e2 100644 (file)
--- a/gtk2_ardour/midi_streamview.h
+++ b/gtk2_ardour/midi_streamview.h
@@ -81,7 +81,7 @@ class MidiStreamView : public StreamView
        void redisplay_diskstream ();
        
        inline double contents_height() const
-               { return (_trackview.height - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 2); }
+       { return (_trackview.current_height() - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 2); }
        
        inline double note_to_y(uint8_t note) const
                { return contents_height()
@@ -105,7 +105,7 @@ class MidiStreamView : public StreamView
        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);
+       RegionView* add_region_view_internal (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);