diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2010-08-20 13:24:38 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-08-20 13:24:38 +0000 |
| commit | 8d1b41180ab0c5901894609e1b58f79419757165 (patch) | |
| tree | a1112fef3eb594bc42f3368b4cfa80e4fb578710 | |
| parent | 812e95da016e334b8856b24aba14db809da3f774 (diff) | |
forward port 7015 from 2.x
git-svn-id: svn://localhost/ardour2/branches/3.0@7658 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | gtk2_ardour/editor_selection.cc | 4 | ||||
| -rw-r--r-- | libs/ardour/route.cc | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/gtk2_ardour/editor_selection.cc b/gtk2_ardour/editor_selection.cc index 7569c3e0a7..854d4ad985 100644 --- a/gtk2_ardour/editor_selection.cc +++ b/gtk2_ardour/editor_selection.cc @@ -1286,6 +1286,10 @@ Editor::select_range_between () nframes64_t start; nframes64_t end; + if (mouse_mode == MouseRange && !selection->time.empty()) { + selection->clear_time (); + } + if (!get_edit_op_range (start, end)) { return; } diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc index 290d9209d9..4541783cf1 100644 --- a/libs/ardour/route.cc +++ b/libs/ardour/route.cc @@ -483,7 +483,11 @@ Route::process_output_buffers (BufferSet& bufs, << endl; } assert (bufs.count() == (*i)->input_streams()); - + + /* should we NOT run plugins here if the route is inactive? + do we catch route != active somewhere higher? + */ + (*i)->run (bufs, start_frame, end_frame, nframes, *i != _processors.back()); bufs.set_count ((*i)->output_streams()); } |