ardour/livetrax
13
0
Fork 0
Code

if using only 1 processor for DSP, do not use the graph code to execute routes - fallback to original unthreaded code

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@8741 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2011-02-07 17:01:43 +00:00
parent d3300660a3
commit 44d938b6b2
1 changed files with 73 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libs/ardour/session_process.cc
View File

@ -106,9 +106,10 @@ Session::no_roll (pframes_t nframes)
_click_io->silence (nframes);
}
if (Config->get_processor_usage() != 1) {
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 {
for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
if ((*i)->is_hidden()) {
@ -124,7 +125,7 @@ Session::no_roll (pframes_t nframes)
break;
}
}
*/
}
return ret;
}
@ -147,9 +148,12 @@ 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 (Config->get_processor_usage() != 1) {
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 {
for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
int ret;
@ -165,7 +169,8 @@ Session::process_routes (pframes_t nframes, bool& need_butler)
return -1;
}
}
*/
}
return 0;
}
@ -185,8 +190,10 @@ 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 (Config->get_processor_usage() != 1) {
cerr << "GRAPH PROCESS\n";
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) {
int ret;
@ -200,7 +207,8 @@ Session::silent_process_routes (pframes_t nframes, bool& need_butler)
return -1;
}
}
*/
}
return 0;
}
@ -716,7 +724,7 @@ Session::track_slave_state (float slave_speed, framepos_t slave_transport_frame,
if (_transport_speed != 0.0f) {
DEBUG_TRACE (DEBUG::Slave, string_compose ("slave stops transport: %1 frame %2 tf %3\n", slave_speed, slave_transport_frame, _transport_frame));
stop_transport();
stop_transport ();
}
if (slave_transport_frame != _transport_frame) {