From 70f982ceb6e7dd29282a8c8f647f8926dc076574 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Tue, 29 Jul 2008 22:31:09 +0000 Subject: Fix set_port_value crash when running separate engine w/ OSC. git-svn-id: http://svn.drobilla.net/lad/ingen@1306 a436a847-0d15-0410-975c-d299462d15a1 --- src/libs/engine/OSCEngineReceiver.cpp | 3 +++ src/libs/engine/events/SetPortValueEvent.cpp | 6 ------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/libs/engine/OSCEngineReceiver.cpp b/src/libs/engine/OSCEngineReceiver.cpp index d9cebba4..a27a44ca 100644 --- a/src/libs/engine/OSCEngineReceiver.cpp +++ b/src/libs/engine/OSCEngineReceiver.cpp @@ -24,6 +24,7 @@ #include #include #include "interface/ClientInterface.hpp" +#include "engine/ThreadManager.hpp" #include "OSCEngineReceiver.hpp" #include "QueuedEventSource.hpp" #include "OSCClientSender.hpp" @@ -168,6 +169,8 @@ OSCEngineReceiver::deactivate() void OSCEngineReceiver::ReceiveThread::_run() { + Thread::get().set_context(THREAD_PRE_PROCESS); + /* get a timestamp here and stamp all the events with the same time so * they all get executed in the same cycle */ diff --git a/src/libs/engine/events/SetPortValueEvent.cpp b/src/libs/engine/events/SetPortValueEvent.cpp index 267db836..a184bd95 100644 --- a/src/libs/engine/events/SetPortValueEvent.cpp +++ b/src/libs/engine/events/SetPortValueEvent.cpp @@ -53,9 +53,6 @@ SetPortValueEvent::SetPortValueEvent(Engine& engine, , _port(NULL) , _error(NO_ERROR) { - if (!_queued) - pre_process(); - memcpy(_data, data, data_size); } @@ -80,9 +77,6 @@ SetPortValueEvent::SetPortValueEvent(Engine& engine, , _port(NULL) , _error(NO_ERROR) { - if (!_queued) - pre_process(); - memcpy(_data, data, data_size); } -- cgit v1.2.1