diff options
Diffstat (limited to 'src/server/events')
-rw-r--r-- | src/server/events/CreatePatch.cpp | 15 | ||||
-rw-r--r-- | src/server/events/SetMetadata.cpp | 2 |
2 files changed, 5 insertions, 12 deletions
diff --git a/src/server/events/CreatePatch.cpp b/src/server/events/CreatePatch.cpp index 5463cb99..794ff7d6 100644 --- a/src/server/events/CreatePatch.cpp +++ b/src/server/events/CreatePatch.cpp @@ -99,7 +99,6 @@ CreatePatch::pre_process() _patch->activate(*_engine.buffer_factory()); // Insert into EngineStore - //_patch->add_to_store(_engine.engine_store()); _engine.engine_store()->add(_patch); Event::pre_process(); @@ -111,16 +110,10 @@ CreatePatch::execute(ProcessContext& context) Event::execute(context); if (_patch) { - if (!_parent) { - assert(_path.is_root()); - assert(_patch->parent_patch() == NULL); - _engine.driver()->set_root_patch(_patch); - } else { - assert(_parent); - assert(!_path.is_root()); - _engine.maid()->push(_parent->compiled_patch()); - _parent->compiled_patch(_compiled_patch); - } + assert(_parent); + assert(!_path.is_root()); + _engine.maid()->push(_parent->compiled_patch()); + _parent->compiled_patch(_compiled_patch); } } diff --git a/src/server/events/SetMetadata.cpp b/src/server/events/SetMetadata.cpp index 7d88c83c..68cdbbbd 100644 --- a/src/server/events/SetMetadata.cpp +++ b/src/server/events/SetMetadata.cpp @@ -319,7 +319,7 @@ SetMetadata::execute(ProcessContext& context) break; case POLYPHONY: if (_patch->internal_poly() != static_cast<uint32_t>(value.get_int32()) && - !_patch->apply_internal_poly(_engine.driver()->context(), + !_patch->apply_internal_poly(_engine.process_context(), *_engine.buffer_factory(), *_engine.maid(), value.get_int32())) { _status = INTERNAL_ERROR; |