Accommodate newly added/renamed source(s) in our MSVC project (libardour)

[ardour.git] / libs / ardour / graph.cc

diff --git a/libs/ardour/graph.cc b/libs/ardour/graph.cc
index aee5ef77fdb8d032498f00d89b43605f88799deb..0389b2ef1a0e62e6e06aeeae4a4fa440787f3b65 100644 (file)
--- a/libs/ardour/graph.cc
+++ b/libs/ardour/graph.cc
@@ -125,7 +125,7 @@ Graph::reset_thread_list ()
                throw failed_constructor ();
        }
 
-       for (uint32_t i = 2; i < num_threads; ++i) {
+       for (uint32_t i = 1; i < num_threads; ++i) {
                if (AudioEngine::instance()->create_process_thread (boost::bind (&Graph::helper_thread, this))) {
                        throw failed_constructor ();
                }
@@ -272,6 +272,7 @@ void
 Graph::restart_cycle()
 {
        // we are through. wakeup our caller.
+       DEBUG_TRACE(DEBUG::ProcessThreads, string_compose ("%1 cycle done.\n", pthread_name()));
 
 again:
        _callback_done_sem.signal ();
@@ -283,6 +284,7 @@ again:
                return;
        }
 
+       DEBUG_TRACE(DEBUG::ProcessThreads, string_compose ("%1 prepare new cycle.\n", pthread_name()));
        prep ();
 
        if (_graph_empty && _threads_active) {
@@ -473,7 +475,7 @@ again:
 
        /* This loop will run forever */
        while (1) {
-               DEBUG_TRACE(DEBUG::ProcessThreads, "main thread runs one graph node\n");
+               DEBUG_TRACE(DEBUG::ProcessThreads, string_compose ("main thread (%1) runs one graph node\n", pthread_name ()));
                if (run_one()) {
                        break;
                }
@@ -511,43 +513,16 @@ Graph::dump (int chain)
 }
 
 int
-Graph::silent_process_routes (pframes_t nframes, framepos_t start_frame, framepos_t end_frame, bool& need_butler)
+Graph::process_routes (pframes_t nframes, samplepos_t start_sample, samplepos_t end_sample, 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 ();
-       }
-
-       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)
-{
-       DEBUG_TRACE (DEBUG::ProcessThreads, string_compose ("graph execution from %1 to %2 = %3\n", start_frame, end_frame, nframes));
+       DEBUG_TRACE (DEBUG::ProcessThreads, string_compose ("graph execution from %1 to %2 = %3\n", start_sample, end_sample, nframes));
 
        if (!_threads_active) return 0;
 
        _process_nframes = nframes;
-       _process_start_frame = start_frame;
-       _process_end_frame = end_frame;
-       _process_declick = declick;
+       _process_start_sample = start_sample;
+       _process_end_sample = end_sample;
 
-       _process_silent = false;
        _process_noroll = false;
        _process_retval = 0;
        _process_need_butler = false;
@@ -555,7 +530,6 @@ Graph::process_routes (pframes_t nframes, framepos_t start_frame, framepos_t end
        DEBUG_TRACE(DEBUG::ProcessThreads, "wake graph for non-silent process\n");
        _callback_start_sem.signal ();
        _callback_done_sem.wait ();
-
        DEBUG_TRACE (DEBUG::ProcessThreads, "graph execution complete\n");
 
        need_butler = _process_need_butler;
@@ -564,20 +538,17 @@ Graph::process_routes (pframes_t nframes, framepos_t start_frame, framepos_t end
 }
 
 int
-Graph::routes_no_roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame,
-                       bool non_rt_pending, int declick)
+Graph::routes_no_roll (pframes_t nframes, samplepos_t start_sample, samplepos_t end_sample, bool non_rt_pending)
 {
-       DEBUG_TRACE (DEBUG::ProcessThreads, string_compose ("no-roll graph execution from %1 to %2 = %3\n", start_frame, end_frame, nframes));
+       DEBUG_TRACE (DEBUG::ProcessThreads, string_compose ("no-roll graph execution from %1 to %2 = %3\n", start_sample, end_sample, nframes));
 
        if (!_threads_active) return 0;
 
        _process_nframes = nframes;
-       _process_start_frame = start_frame;
-       _process_end_frame = end_frame;
-       _process_declick = declick;
+       _process_start_sample = start_sample;
+       _process_end_sample = end_sample;
        _process_non_rt_pending = non_rt_pending;
 
-       _process_silent = false;
        _process_noroll = true;
        _process_retval = 0;
        _process_need_butler = false;
@@ -585,6 +556,7 @@ Graph::routes_no_roll (pframes_t nframes, framepos_t start_frame, framepos_t end
        DEBUG_TRACE(DEBUG::ProcessThreads, "wake graph for no-roll process\n");
        _callback_start_sem.signal ();
        _callback_done_sem.wait ();
+       DEBUG_TRACE (DEBUG::ProcessThreads, "graph execution complete\n");
 
        return _process_retval;
 }
@@ -598,14 +570,10 @@ 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) {
-               route->set_pending_declick (_process_declick);
-               retval = route->no_roll (_process_nframes, _process_start_frame, _process_end_frame, _process_non_rt_pending);
+       if (_process_noroll) {
+               retval = route->no_roll (_process_nframes, _process_start_sample, _process_end_sample, _process_non_rt_pending);
        } else {
-               route->set_pending_declick (_process_declick);
-               retval = route->roll (_process_nframes, _process_start_frame, _process_end_frame, _process_declick, need_butler);
+               retval = route->roll (_process_nframes, _process_start_sample, _process_end_sample, need_butler);
        }
 
        if (retval) {