From d73c292ac9d19c4abe080c4c7b885c3c059a59e1 Mon Sep 17 00:00:00 2001 From: paul Date: Sat, 5 Mar 2011 23:23:36 +0000 Subject: [PATCH] revert recent-ish change so that regardless of the number of DSP threads, we always use the graph code (fixes a crash or lockup when removing a track and using only 1 DSP thread) git-svn-id: http://subversion.ardour.org/svn/ardour2/ardour2/branches/3.0@9082 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/session_process.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/ardour/session_process.cc b/libs/ardour/session_process.cc index fb39e7115..c189afd9e 100644 --- a/libs/ardour/session_process.cc +++ b/libs/ardour/session_process.cc @@ -106,7 +106,7 @@ Session::no_roll (pframes_t nframes) _click_io->silence (nframes); } - if (route_graph->threads_in_use() > 1) { + if (route_graph->threads_in_use() > 0) { DEBUG_TRACE(DEBUG::Graph,"calling graph/no-roll\n"); route_graph->routes_no_roll( nframes, _transport_frame, end_frame, non_realtime_work_pending(), actively_recording(), declick); } else { @@ -148,7 +148,7 @@ Session::process_routes (pframes_t nframes, bool& need_butler) const framepos_t start_frame = _transport_frame; const framepos_t end_frame = _transport_frame + floor (nframes * _transport_speed); - if (route_graph->threads_in_use() > 1) { + if (route_graph->threads_in_use() > 0) { DEBUG_TRACE(DEBUG::Graph,"calling graph/process-routes\n"); route_graph->process_routes( nframes, start_frame, end_frame, declick, record_active, rec_monitors, need_butler); } else { @@ -189,7 +189,7 @@ Session::silent_process_routes (pframes_t nframes, bool& need_butler) const framepos_t start_frame = _transport_frame; const framepos_t end_frame = _transport_frame + lrintf(nframes * _transport_speed); - if (route_graph->threads_in_use() > 1) { + if (route_graph->threads_in_use() > 0) { route_graph->silent_process_routes( nframes, start_frame, end_frame, record_active, rec_monitors, need_butler); } else { for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { -- 2.11.4.GIT