fix conflicts after merge with master

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

diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index ce82f79bb5a122edf4b33a9b340137beca47ce59..9667bbcd2c496b6253fb0c48929f626d8227a890 100644 (file)
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -346,8 +346,8 @@ Session::when_engine_running ()
 
        BootMessage (_("Set block size and sample rate"));
 
-       set_block_size (_engine.frames_per_cycle());
-       set_frame_rate (_engine.frame_rate());
+       set_block_size (_engine.samples_per_cycle());
+       set_frame_rate (_engine.sample_rate());
 
        BootMessage (_("Using configuration"));