From e317386c5cde5741a8279bf480240293720d6788 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 22 Jan 2012 12:28:49 +0000 Subject: For now, only use the multi-threaded process code if we are using >1 processor for DSP; this involves making the DSP use setting only take effect on a restart of Ardour. git-svn-id: svn://localhost/ardour2/branches/3.0@11302 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/session_process.cc | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'libs/ardour/session_process.cc') diff --git a/libs/ardour/session_process.cc b/libs/ardour/session_process.cc index 80f922117d..897b58ec8e 100644 --- a/libs/ardour/session_process.cc +++ b/libs/ardour/session_process.cc @@ -115,7 +115,7 @@ Session::no_roll (pframes_t nframes) _click_io->silence (nframes); } - if (1 || _process_graph->threads_in_use() > 0) { + if (_process_graph) { DEBUG_TRACE(DEBUG::ProcessThreads,"calling graph/no-roll\n"); _process_graph->routes_no_roll( nframes, _transport_frame, end_frame, non_realtime_work_pending(), declick); } else { @@ -155,11 +155,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); - /* XXX this is hack to force use of the graph even if we are only - using 1 thread. its needed because otherwise when we remove - tracks, the graph never gets updated. - */ - if (1 || _process_graph->threads_in_use() > 0) { + if (_process_graph) { DEBUG_TRACE(DEBUG::ProcessThreads,"calling graph/process-routes\n"); _process_graph->process_routes (nframes, start_frame, end_frame, declick, need_butler); } else { @@ -192,11 +188,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); - /* XXX this is hack to force use of the graph even if we are only - using 1 thread. its needed because otherwise when we remove - tracks, the graph never gets updated. - */ - if (1 || _process_graph->threads_in_use() > 0) { + if (_process_graph) { _process_graph->silent_process_routes (nframes, start_frame, end_frame, need_butler); } else { for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { -- cgit v1.2.3