summaryrefslogtreecommitdiffstats
path: root/src/engine/EventBuffer.cpp
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2009-06-02 22:55:11 +0000
committerDavid Robillard <d@drobilla.net>2009-06-02 22:55:11 +0000
commita9f1f6912fa3e6b485a5c6e4195233ef3fb087a1 (patch)
treeca66aa1f973d127127c3a72ed1e4a98b53116e9b /src/engine/EventBuffer.cpp
parent9cc7a1adb60ad24da0926f15af13f2a7acd0c2e3 (diff)
downloadingen-a9f1f6912fa3e6b485a5c6e4195233ef3fb087a1.tar.gz
ingen-a9f1f6912fa3e6b485a5c6e4195233ef3fb087a1.tar.bz2
ingen-a9f1f6912fa3e6b485a5c6e4195233ef3fb087a1.zip
Remove redundant EventBuffer::_iter.
Fix EventBuffer unjoining. Don't pre-process patch input port connections twice. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2060 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/engine/EventBuffer.cpp')
-rw-r--r--src/engine/EventBuffer.cpp11
1 files changed, 2 insertions, 9 deletions
diff --git a/src/engine/EventBuffer.cpp b/src/engine/EventBuffer.cpp
index f8e3a5de..7110ccc2 100644
--- a/src/engine/EventBuffer.cpp
+++ b/src/engine/EventBuffer.cpp
@@ -51,16 +51,10 @@ bool
EventBuffer::join(Buffer* buf)
{
EventBuffer* ebuf = dynamic_cast<EventBuffer*>(buf);
- if (ebuf) {
- _buf = ebuf->_local_buf;
- _joined_buf = ebuf;
- _iter = ebuf->_iter;
- _iter.buf = _buf->data();
+ if (!ebuf)
return false;
- } else {
- return false;
- }
+ _buf = ebuf->_local_buf;
_joined_buf = ebuf;
return true;
@@ -72,7 +66,6 @@ EventBuffer::unjoin()
{
_joined_buf = NULL;
_buf = _local_buf;
- reset(_this_nframes);
}