diff options
| author | David Robillard <d@drobilla.net> | 2006-11-19 16:45:16 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2006-11-19 16:45:16 +0000 |
| commit | ef6b25432d9c46d71b08c0f7d5f2686df428c4e8 (patch) | |
| tree | 9b30d87b6670aadce365c9b112321dd674a0bab4 /libs/ardour/diskstream.cc | |
| parent | af105afe6cde5b0088647cea7d5e4e3314f8478b (diff) | |
Merged with trunk R1141
git-svn-id: svn://localhost/ardour2/branches/midi@1142 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/diskstream.cc')
| -rw-r--r-- | libs/ardour/diskstream.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libs/ardour/diskstream.cc b/libs/ardour/diskstream.cc index e9f8499981..5f6f3956cf 100644 --- a/libs/ardour/diskstream.cc +++ b/libs/ardour/diskstream.cc @@ -390,14 +390,14 @@ Diskstream::set_name (string str) } void -Diskstream::set_destructive (bool yn) +Diskstream::remove_region_from_last_capture (boost::weak_ptr<Region> wregion) { - if (yn != destructive()) { - reset_write_sources (true, true); - if (yn) { - _flags |= Destructive; - } else { - _flags &= ~Destructive; - } + boost::shared_ptr<Region> region (wregion.lock()); + + if (!region) { + return; } + + _last_capture_regions.remove (region); } + |