diff options
| -rw-r--r-- | src/server/Engine.cpp | 3 | ||||
| -rw-r--r-- | src/server/Event.cpp | 1 | ||||
| -rw-r--r-- | src/server/InputPort.cpp | 2 | ||||
| -rw-r--r-- | src/server/MessageContext.hpp | 1 | ||||
| -rw-r--r-- | src/server/PatchImpl.cpp | 2 | ||||
| -rw-r--r-- | src/server/PreProcessor.cpp | 4 | ||||
| -rw-r--r-- | src/server/PreProcessor.hpp | 4 | ||||
| -rw-r--r-- | src/server/events/Disconnect.cpp | 2 |
8 files changed, 4 insertions, 15 deletions
diff --git a/src/server/Engine.cpp b/src/server/Engine.cpp index 5c90009f..1d3b4024 100644 --- a/src/server/Engine.cpp +++ b/src/server/Engine.cpp @@ -276,8 +276,7 @@ Engine::enqueue_event(Event* ev) void Engine::process_events(ProcessContext& context) { - ThreadManager::assert_thread(THREAD_PROCESS); - _pre_processor->process(*_post_processor, context); + _pre_processor->process(context, *_post_processor); } void diff --git a/src/server/Event.cpp b/src/server/Event.cpp index 4bba44d8..7063acdb 100644 --- a/src/server/Event.cpp +++ b/src/server/Event.cpp @@ -43,7 +43,6 @@ Event::pre_process() void Event::execute(ProcessContext& context) { - ThreadManager::assert_thread(THREAD_PROCESS); assert(_pre_processed); assert(!_executed); assert(_time <= context.end()); diff --git a/src/server/InputPort.cpp b/src/server/InputPort.cpp index 515b6ca0..0d211095 100644 --- a/src/server/InputPort.cpp +++ b/src/server/InputPort.cpp @@ -138,8 +138,6 @@ InputPort::add_edge(EdgeImpl* c) EdgeImpl* InputPort::remove_edge(ProcessContext& context, const OutputPort* tail) { - ThreadManager::assert_thread(THREAD_PROCESS); - EdgeImpl* edge = NULL; for (Edges::iterator i = _edges.begin(); i != _edges.end(); ++i) { if (i->tail() == tail) { diff --git a/src/server/MessageContext.hpp b/src/server/MessageContext.hpp index 0bc8ecf5..4d2ec826 100644 --- a/src/server/MessageContext.hpp +++ b/src/server/MessageContext.hpp @@ -62,7 +62,6 @@ public: * AUDIO THREAD ONLY. */ inline void signal(ProcessContext& context) { - ThreadManager::assert_thread(THREAD_PROCESS); const Request cycle_end_request(context.end(), NULL); _requests.write(sizeof(Request), &cycle_end_request); _sem.post(); diff --git a/src/server/PatchImpl.cpp b/src/server/PatchImpl.cpp index 112e2a49..02b43d02 100644 --- a/src/server/PatchImpl.cpp +++ b/src/server/PatchImpl.cpp @@ -124,8 +124,6 @@ PatchImpl::apply_internal_poly(ProcessContext& context, Raul::Maid& maid, uint32_t poly) { - ThreadManager::assert_thread(THREAD_PROCESS); - // TODO: Subpatch dynamic polyphony (i.e. changing port polyphony) for (Nodes::iterator i = _nodes.begin(); i != _nodes.end(); ++i) diff --git a/src/server/PreProcessor.cpp b/src/server/PreProcessor.cpp index 4f51ad00..67d53054 100644 --- a/src/server/PreProcessor.cpp +++ b/src/server/PreProcessor.cpp @@ -67,10 +67,8 @@ PreProcessor::event(Event* const ev) } bool -PreProcessor::process(PostProcessor& dest, ProcessContext& context, bool limit) +PreProcessor::process(ProcessContext& context, PostProcessor& dest, bool limit) { - ThreadManager::assert_thread(THREAD_PROCESS); - if (!_head.get()) return true; diff --git a/src/server/PreProcessor.hpp b/src/server/PreProcessor.hpp index 4fd1c91e..c5b781f4 100644 --- a/src/server/PreProcessor.hpp +++ b/src/server/PreProcessor.hpp @@ -46,8 +46,8 @@ public: /** Process events for a cycle. * @return False iff this source is finished and should be removed. */ - bool process(PostProcessor& dest, - ProcessContext& context, + bool process(ProcessContext& context, + PostProcessor& dest, bool limit = true); protected: diff --git a/src/server/events/Disconnect.cpp b/src/server/events/Disconnect.cpp index 9396d1fe..04e3fb93 100644 --- a/src/server/events/Disconnect.cpp +++ b/src/server/events/Disconnect.cpp @@ -178,8 +178,6 @@ Disconnect::pre_process() bool Disconnect::Impl::execute(ProcessContext& context, bool set_dst_buffers) { - ThreadManager::assert_thread(THREAD_PROCESS); - EdgeImpl* const port_edge = _dst_input_port->remove_edge(context, _src_output_port); if (!port_edge) { |