diff options
| author | Carl Hetherington <carl@carlh.net> | 2011-11-09 17:44:39 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2011-11-09 17:44:39 +0000 |
| commit | 69c88d165dfd3bf373a708d19bfedaa7672acec5 (patch) | |
| tree | 4920d214837cc388d34b53e3b2ae2ca78905ca7d /libs/ardour/session_process.cc | |
| parent | 0ed06420c2364a038f9909255bda93d2d134d5cc (diff) | |
Alert the user if a connection is made which causes
feedback, and preserve the route graph in the state
that it was in before the feedback was introduced. The
intent being to simplify the code, reduce the number of
areas of code which must consider feedback, and fix a
few bugs.
git-svn-id: svn://localhost/ardour2/branches/3.0@10510 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/session_process.cc')
| -rw-r--r-- | libs/ardour/session_process.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libs/ardour/session_process.cc b/libs/ardour/session_process.cc index 2384dd5fb3..33c4e5621c 100644 --- a/libs/ardour/session_process.cc +++ b/libs/ardour/session_process.cc @@ -107,9 +107,9 @@ Session::no_roll (pframes_t nframes) _click_io->silence (nframes); } - if (route_graph->threads_in_use() > 0) { + if (_process_graph->threads_in_use() > 0) { DEBUG_TRACE(DEBUG::ProcessThreads,"calling graph/no-roll\n"); - route_graph->routes_no_roll( nframes, _transport_frame, end_frame, non_realtime_work_pending(), declick); + _process_graph->routes_no_roll( nframes, _transport_frame, end_frame, non_realtime_work_pending(), declick); } else { for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { @@ -148,9 +148,9 @@ Session::process_routes (pframes_t nframes, bool& need_butler) using 1 thread. its needed because otherwise when we remove tracks, the graph never gets updated. */ - if (1 || route_graph->threads_in_use() > 0) { + if (1 || _process_graph->threads_in_use() > 0) { DEBUG_TRACE(DEBUG::ProcessThreads,"calling graph/process-routes\n"); - route_graph->process_routes (nframes, start_frame, end_frame, declick, need_butler); + _process_graph->process_routes (nframes, start_frame, end_frame, declick, need_butler); } else { for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { @@ -185,8 +185,8 @@ Session::silent_process_routes (pframes_t nframes, bool& need_butler) using 1 thread. its needed because otherwise when we remove tracks, the graph never gets updated. */ - if (1 || route_graph->threads_in_use() > 0) { - route_graph->silent_process_routes (nframes, start_frame, end_frame, need_butler); + if (1 || _process_graph->threads_in_use() > 0) { + _process_graph->silent_process_routes (nframes, start_frame, end_frame, need_butler); } else { for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { |