diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2010-02-19 21:49:56 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-02-19 21:49:56 +0000 |
| commit | d9d1a4a5cf5825945e68ee7e66018d3ae6f00b26 (patch) | |
| tree | beeab484491f7ddc6239664033517170dadfd236 /gtk2_ardour | |
| parent | fa701b8c065251d242342b86a54d91826d2290a0 (diff) | |
add begin/end undo/redo signals so that playlist can freeze/thaw itself around potentially NxM region property changes; clean up debug output; don't connect streamview to Playlist::ContentsChanged because there appears to be no need for it - we catch add/remove region, and region property changes are handled by RegionView
git-svn-id: svn://localhost/ardour2/branches/3.0@6702 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/audio_streamview.cc | 6 | ||||
| -rw-r--r-- | gtk2_ardour/streamview.cc | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/gtk2_ardour/audio_streamview.cc b/gtk2_ardour/audio_streamview.cc index 6b1aed6268..640120516c 100644 --- a/gtk2_ardour/audio_streamview.cc +++ b/gtk2_ardour/audio_streamview.cc @@ -254,19 +254,13 @@ AudioStreamView::playlist_layered (boost::weak_ptr<Diskstream> wds) return; } - cerr << "AS, call SV::modified @ " << get_microseconds() << endl; - StreamView::playlist_layered (wds); - cerr << "AS, done with SV::modified @ " << get_microseconds() << endl; - /* make sure xfades are on top and all the regionviews are stacked correctly. */ - cerr << "AS, raise xfades @ " << get_microseconds() << endl; for (CrossfadeViewList::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) { i->second->get_canvas_group()->raise_to_top(); } - cerr << "AS, done with xfades @ " << get_microseconds() << endl; } void diff --git a/gtk2_ardour/streamview.cc b/gtk2_ardour/streamview.cc index 8c53fd0596..3aff2f2d18 100644 --- a/gtk2_ardour/streamview.cc +++ b/gtk2_ardour/streamview.cc @@ -336,7 +336,7 @@ StreamView::playlist_switched (boost::weak_ptr<Diskstream> wds) ds->playlist()->LayeringChanged.connect (playlist_connections, boost::bind (&StreamView::playlist_layered, this, boost::weak_ptr<Diskstream>(ds)), gui_context()); ds->playlist()->RegionAdded.connect (playlist_connections, ui_bind (&StreamView::add_region_view, this, _1), gui_context()); ds->playlist()->RegionRemoved.connect (playlist_connections, ui_bind (&StreamView::remove_region_view, this, _1), gui_context()); - ds->playlist()->ContentsChanged.connect (playlist_connections, boost::bind (&StreamView::redisplay_diskstream, this), gui_context()); + // ds->playlist()->ContentsChanged.connect (playlist_connections, boost::bind (&StreamView::redisplay_diskstream, this), gui_context()); } void |