diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2011-05-27 01:04:56 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-05-27 01:04:56 +0000 |
commit | f87baef1e73e21fb4f82558dbd4b5450b237b732 (patch) | |
tree | 44d76bf56925f0767bc70a95a01e6e66ded5062b /gtk2_ardour/editor_ops.cc | |
parent | e4a92029267dfc2f3e5ceac069f32aed3c133233 (diff) |
somewhat illogical and temporary workaround to the problems with consolidate & bounceable. it turns out that region bouncing never replaces the in-place region, so bounceable() doesn't matter; range bouncing only needs to check bounceable() if we're going to replace material in place and the op is with-processing. reword the error dialog too
git-svn-id: svn://localhost/ardour2/branches/3.0@9606 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_ops.cc')
-rw-r--r-- | gtk2_ardour/editor_ops.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index 9e46c04eed..b986976f9e 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -3319,10 +3319,11 @@ Editor::bounce_range_selection (bool replace, bool enable_processing) for (TrackViewList::iterator i = views.begin(); i != views.end(); ++i) { RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (*i); - if (rtv && rtv->track() && !rtv->track()->bounceable()) { + if (rtv && rtv->track() && replace && enable_processing && !rtv->track()->bounceable()) { MessageDialog d ( - _("One or more selected tracks cannot be bounced because it has more outputs than inputs. " - "You can fix this by increasing the number of inputs on that track.") + _("You can't perform this operation because the processing of the signal " + "will cause one or more of the tracks will end up with a region with more channels than this track has inputs.\n\n" + "You can do this without processing, which is a different operation.") ); d.set_title (_("Cannot bounce")); d.run (); |