diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2008-02-07 03:16:27 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-02-07 03:16:27 +0000 |
| commit | e48780ad4578f7ca7efa035f53afac4199228de2 (patch) | |
| tree | 4c0a8628182df3dfaa8b13df2628386d4befcc43 | |
| parent | 2ea0562416d39f87a0c373bcc17912f1db8c838f (diff) | |
final part of tape track waveview problem, and fix crash at session close caused by marker handling
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3028 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | gtk2_ardour/editor_markers.cc | 4 | ||||
| -rw-r--r-- | gtk2_ardour/tape_region_view.cc | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc index 56eed50e4f..300cfe3cf7 100644 --- a/gtk2_ardour/editor_markers.cc +++ b/gtk2_ardour/editor_markers.cc @@ -1151,6 +1151,10 @@ Editor::update_punch_range_view (bool visibility) void Editor::marker_selection_changed () { + if (session && session->deletion_in_progress()) { + return; + } + for (LocationMarkerMap::iterator i = location_markers.begin(); i != location_markers.end(); ++i) { LocationMarkers* lam = i->second; diff --git a/gtk2_ardour/tape_region_view.cc b/gtk2_ardour/tape_region_view.cc index 9022e35896..c198d86066 100644 --- a/gtk2_ardour/tape_region_view.cc +++ b/gtk2_ardour/tape_region_view.cc @@ -62,7 +62,11 @@ TapeAudioRegionView::TapeAudioRegionView (ArdourCanvas::Group *parent, RouteTime void TapeAudioRegionView::init (Gdk::Color& basic_color, bool wfw) { - AudioRegionView::init(basic_color, wfw); + /* never wait for data: always just create the waves, connect once and then + we'll update whenever we need to. + */ + + AudioRegionView::init(basic_color, false); /* every time the wave data changes and peaks are ready, redraw */ |