summaryrefslogtreecommitdiff
path: root/libs/ardour
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2013-09-14 16:21:32 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2013-09-14 16:21:32 -0400
commit60da662affe9ade1db4ecb988006a1293cce49b4 (patch)
tree2ebef5202700087d65a2fbf2eea8bf41ed6ea377 /libs/ardour
parent5cf1f7f3b28abd36f9390014016def94f4e1468d (diff)
parentf5191e62578bd2ba2b3e2adf8cfc3634aa4b929c (diff)
Merge branch 'master' into windows
Diffstat (limited to 'libs/ardour')
-rw-r--r--libs/ardour/session_state.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc
index 88a8a2ae04..2d91bdd4c2 100644
--- a/libs/ardour/session_state.cc
+++ b/libs/ardour/session_state.cc
@@ -178,13 +178,6 @@ Session::pre_engine_init (string fullpath)
set_history_depth (Config->get_history_depth());
- if (how_many_dsp_threads () > 1) {
- /* For now, only create the graph if we are using >1 DSP threads, as
- it is a bit slower than the old code with 1 thread.
- */
- _process_graph.reset (new Graph (*this));
- }
-
/* default: assume simple stereo speaker configuration */
_speakers->setup_default_speakers (2);
@@ -218,6 +211,13 @@ Session::post_engine_init ()
set_block_size (_engine.samples_per_cycle());
set_frame_rate (_engine.sample_rate());
+ if (how_many_dsp_threads () > 1) {
+ /* For now, only create the graph if we are using >1 DSP threads, as
+ it is a bit slower than the old code with 1 thread.
+ */
+ _process_graph.reset (new Graph (*this));
+ }
+
n_physical_outputs = _engine.n_physical_outputs ();
n_physical_inputs = _engine.n_physical_inputs ();