diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2008-09-10 15:03:30 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-09-10 15:03:30 +0000 |
commit | 68e943265edf04e63a8e8b8f62bab20f99d9c637 (patch) | |
tree | ff8941a59662fc0c4622944b65f7b2d5e3bdd0c3 /gtk2_ardour/automation_streamview.h | |
parent | e4372df05b7d74a6b80dbbf4b6c00cc2b31c4723 (diff) |
merge from 2.0-ongoing @ 3581
git-svn-id: svn://localhost/ardour2/branches/3.0@3711 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/automation_streamview.h')
-rw-r--r-- | gtk2_ardour/automation_streamview.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gtk2_ardour/automation_streamview.h b/gtk2_ardour/automation_streamview.h index c5eac37021..5eebfaf28d 100644 --- a/gtk2_ardour/automation_streamview.h +++ b/gtk2_ardour/automation_streamview.h @@ -51,15 +51,16 @@ class AutomationStreamView : public StreamView void redisplay_diskstream (); - inline double contents_height() const - { return (_trackview.height - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 2); } + inline double contents_height() const { + return (_trackview.current_height() - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 2); + } private: void setup_rec_box (); void rec_data_range_ready (jack_nframes_t start, jack_nframes_t dur); void update_rec_regions (jack_nframes_t start, jack_nframes_t dur); - RegionView* add_region_view_internal (boost::shared_ptr<ARDOUR::Region>, bool wait_for_data); + RegionView* add_region_view_internal (boost::shared_ptr<ARDOUR::Region>, bool wait_for_data, bool recording = false); void display_region(AutomationRegionView* region_view); void color_handler (); |