diff options
Diffstat (limited to 'src/libs/engine/MidiBuffer.cpp')
| -rw-r--r-- | src/libs/engine/MidiBuffer.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/libs/engine/MidiBuffer.cpp b/src/libs/engine/MidiBuffer.cpp index 35bda0a0..3dcb7b4c 100644 --- a/src/libs/engine/MidiBuffer.cpp +++ b/src/libs/engine/MidiBuffer.cpp @@ -38,8 +38,7 @@ MidiBuffer::join(Buffer* buf) _joined_buf = mbuf; - _buf = mbuf->data(); - _state = mbuf->state(); + _state = mbuf->data(); return true; } @@ -49,8 +48,9 @@ void MidiBuffer::unjoin() { _joined_buf = NULL; - _buf = _local_buf; _state = &_local_state; + _state->midi = _buf; + clear(); reset(_this_nframes); } @@ -71,7 +71,6 @@ void MidiBuffer::prepare_read(SampleCount nframes) { assert(!_joined_buf || data() == _joined_buf->data()); - assert(!_joined_buf || state() == _joined_buf->state()); reset(nframes); } @@ -84,7 +83,6 @@ MidiBuffer::prepare_write(SampleCount nframes) reset(nframes); assert(!_joined_buf || data() == _joined_buf->data()); - assert(!_joined_buf || state() == _joined_buf->state()); } |