From e9dd575ca573e7bfc1226d4d7edfbfe3de8debd4 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 27 Jul 2017 12:32:10 -0400 Subject: remove all code related to "silent roll" concept. some debug output added --- libs/ardour/graph.cc | 32 +------------------------------- 1 file changed, 1 insertion(+), 31 deletions(-) (limited to 'libs/ardour/graph.cc') diff --git a/libs/ardour/graph.cc b/libs/ardour/graph.cc index 7efcd046f0..504491b9ab 100644 --- a/libs/ardour/graph.cc +++ b/libs/ardour/graph.cc @@ -512,32 +512,6 @@ Graph::dump (int chain) #endif } -int -Graph::silent_process_routes (pframes_t nframes, framepos_t start_frame, framepos_t end_frame, bool& need_butler) -{ - if (!_threads_active) return 0; - - _process_nframes = nframes; - _process_start_frame = start_frame; - _process_end_frame = end_frame; - - _process_silent = true; - _process_noroll = false; - _process_retval = 0; - _process_need_butler = false; - - if (!_graph_empty) { - DEBUG_TRACE(DEBUG::ProcessThreads, "wake graph for silent process\n"); - _callback_start_sem.signal (); - _callback_done_sem.wait (); - DEBUG_TRACE (DEBUG::ProcessThreads, "graph execution complete\n"); - } - - need_butler = _process_need_butler; - - return _process_retval; -} - int Graph::process_routes (pframes_t nframes, framepos_t start_frame, framepos_t end_frame, int declick, bool& need_butler) { @@ -550,7 +524,6 @@ Graph::process_routes (pframes_t nframes, framepos_t start_frame, framepos_t end _process_end_frame = end_frame; _process_declick = declick; - _process_silent = false; _process_noroll = false; _process_retval = 0; _process_need_butler = false; @@ -579,7 +552,6 @@ Graph::routes_no_roll (pframes_t nframes, framepos_t start_frame, framepos_t end _process_declick = declick; _process_non_rt_pending = non_rt_pending; - _process_silent = false; _process_noroll = true; _process_retval = 0; _process_need_butler = false; @@ -601,9 +573,7 @@ Graph::process_one_route (Route* route) DEBUG_TRACE (DEBUG::ProcessThreads, string_compose ("%1 runs route %2\n", pthread_name(), route->name())); - if (_process_silent) { - retval = route->silent_roll (_process_nframes, _process_start_frame, _process_end_frame, need_butler); - } else if (_process_noroll) { + if (_process_noroll) { route->set_pending_declick (_process_declick); retval = route->no_roll (_process_nframes, _process_start_frame, _process_end_frame, _process_non_rt_pending); } else { -- cgit v1.2.3