summaryrefslogtreecommitdiff
path: root/libs/ardour/ardour/buffer.h
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2009-06-16 14:58:33 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2009-06-16 14:58:33 +0000
commit86f24d20e1616ffaafc97de65db49fd6a91270f8 (patch)
tree17f4ac15f4ec6124e82482624f57ed2ceb8f81ca /libs/ardour/ardour/buffer.h
parent9c8ee46c764f036707f45ebfa8f6696a9a6e56c6 (diff)
first pass (ok, third really) at internal send+return - audio routing inside ardour without JACK. lots still to do, but at least the obvious works
git-svn-id: svn://localhost/ardour2/branches/3.0@5202 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour/buffer.h')
-rw-r--r--libs/ardour/ardour/buffer.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/libs/ardour/ardour/buffer.h b/libs/ardour/ardour/buffer.h
index da75556877..8ed054923b 100644
--- a/libs/ardour/ardour/buffer.h
+++ b/libs/ardour/ardour/buffer.h
@@ -76,6 +76,7 @@ public:
virtual void clear() { silence(_capacity, 0); }
virtual void read_from (const Buffer& src, nframes_t len, nframes_t dst_offset = 0, nframes_t src_offset = 0) = 0;
+ virtual void merge_from (const Buffer& src, nframes_t len, nframes_t dst_offset = 0, nframes_t src_offset = 0) = 0;
protected:
Buffer(DataType type, size_t capacity)