summaryrefslogtreecommitdiff
path: root/libs/ardour/internal_send.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2013-09-14 16:42:40 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2013-09-14 16:42:40 -0400
commit7a30e63eaad66ded1c47f5cdb2e0f28c3b0a1d4a (patch)
tree25e1b01865e76193f3c88483d4f9de1c8abf2f9d /libs/ardour/internal_send.cc
parente6521bb0434d88802aa28e75235bc8c19ebb9262 (diff)
parentf5191e62578bd2ba2b3e2adf8cfc3634aa4b929c (diff)
fix merge conflicts with master
Diffstat (limited to 'libs/ardour/internal_send.cc')
-rw-r--r--libs/ardour/internal_send.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/ardour/internal_send.cc b/libs/ardour/internal_send.cc
index 029a46ce53..8136985e1f 100644
--- a/libs/ardour/internal_send.cc
+++ b/libs/ardour/internal_send.cc
@@ -310,7 +310,7 @@ bool
InternalSend::configure_io (ChanCount in, ChanCount out)
{
bool ret = Send::configure_io (in, out);
- set_block_size (_session.engine().frames_per_cycle());
+ set_block_size (_session.engine().samples_per_cycle());
return ret;
}