From 608aeac60ef43243b85c0dcc5894ccc79f35fba5 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sun, 21 Oct 2007 19:02:02 +0000 Subject: Fix crash on OSC connection. Fix patch filename persistance. git-svn-id: http://svn.drobilla.net/lad/ingen@894 a436a847-0d15-0410-975c-d299462d15a1 --- src/libs/engine/OSCBuffer.cpp | 5 +---- src/libs/engine/OSCEngineReceiver.cpp | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'src/libs/engine') diff --git a/src/libs/engine/OSCBuffer.cpp b/src/libs/engine/OSCBuffer.cpp index f8454a14..f16bcfbf 100644 --- a/src/libs/engine/OSCBuffer.cpp +++ b/src/libs/engine/OSCBuffer.cpp @@ -76,9 +76,8 @@ OSCBuffer::unjoin() void OSCBuffer::prepare_read(SampleCount nframes) { - assert(!_joined_buf || data() == _joined_buf->data()); - rewind(); + _this_nframes = nframes; } @@ -86,8 +85,6 @@ void OSCBuffer::prepare_write(SampleCount nframes) { reset(nframes); - - assert(!_joined_buf || data() == _joined_buf->data()); } diff --git a/src/libs/engine/OSCEngineReceiver.cpp b/src/libs/engine/OSCEngineReceiver.cpp index 4a713dff..66e74e70 100644 --- a/src/libs/engine/OSCEngineReceiver.cpp +++ b/src/libs/engine/OSCEngineReceiver.cpp @@ -65,7 +65,7 @@ OSCEngineReceiver::OSCEngineReceiver(Engine& engine, size_t queue_size, uint16_t } // For debugging, print all incoming OSC messages - lo_server_add_method(_server, NULL, NULL, generic_cb, NULL); + //lo_server_add_method(_server, NULL, NULL, generic_cb, NULL); // Set response address for this message. // It's important this is first and returns nonzero. -- cgit v1.2.1