summaryrefslogtreecommitdiffstats
path: root/src/libs/engine
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2008-08-16 18:45:27 +0000
committerDavid Robillard <d@drobilla.net>2008-08-16 18:45:27 +0000
commit42936aa5d924ca89fe3d887fd0ffeb7a281b547e (patch)
tree0bc295b9f021bee109822782af4c15504b25efa4 /src/libs/engine
parent1116f096282e47c4f85c4681906bacf2516d5a01 (diff)
downloadingen-42936aa5d924ca89fe3d887fd0ffeb7a281b547e.tar.gz
ingen-42936aa5d924ca89fe3d887fd0ffeb7a281b547e.tar.bz2
ingen-42936aa5d924ca89fe3d887fd0ffeb7a281b547e.zip
Add missing Store.cpp.
More serialisation work. git-svn-id: http://svn.drobilla.net/lad/ingen@1402 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/libs/engine')
-rw-r--r--src/libs/engine/Engine.cpp14
-rw-r--r--src/libs/engine/Engine.hpp2
-rw-r--r--src/libs/engine/HTTPEngineReceiver.cpp30
-rw-r--r--src/libs/engine/events/AllNotesOffEvent.cpp2
-rw-r--r--src/libs/engine/events/ClearPatchEvent.cpp6
-rw-r--r--src/libs/engine/events/ConnectionEvent.cpp4
-rw-r--r--src/libs/engine/events/CreateNodeEvent.cpp8
-rw-r--r--src/libs/engine/events/CreatePatchEvent.cpp8
-rw-r--r--src/libs/engine/events/CreatePortEvent.cpp8
-rw-r--r--src/libs/engine/events/DestroyEvent.cpp10
-rw-r--r--src/libs/engine/events/DisablePortMonitoringEvent.cpp2
-rw-r--r--src/libs/engine/events/DisconnectAllEvent.cpp4
-rw-r--r--src/libs/engine/events/DisconnectionEvent.cpp4
-rw-r--r--src/libs/engine/events/EnablePatchEvent.cpp2
-rw-r--r--src/libs/engine/events/EnablePortBroadcastingEvent.cpp2
-rw-r--r--src/libs/engine/events/MidiLearnEvent.cpp2
-rw-r--r--src/libs/engine/events/NoteEvent.cpp2
-rw-r--r--src/libs/engine/events/RenameEvent.cpp12
-rw-r--r--src/libs/engine/events/RequestAllObjectsEvent.cpp2
-rw-r--r--src/libs/engine/events/RequestMetadataEvent.cpp2
-rw-r--r--src/libs/engine/events/RequestObjectEvent.cpp2
-rw-r--r--src/libs/engine/events/RequestPortValueEvent.cpp2
-rw-r--r--src/libs/engine/events/SetMetadataEvent.cpp2
-rw-r--r--src/libs/engine/events/SetPolyphonicEvent.cpp2
-rw-r--r--src/libs/engine/events/SetPolyphonyEvent.cpp2
-rw-r--r--src/libs/engine/events/SetPortValueEvent.cpp4
26 files changed, 82 insertions, 58 deletions
diff --git a/src/libs/engine/Engine.cpp b/src/libs/engine/Engine.cpp
index 13fcafa0..ba5dcd15 100644
--- a/src/libs/engine/Engine.cpp
+++ b/src/libs/engine/Engine.cpp
@@ -75,8 +75,8 @@ Engine::~Engine()
{
deactivate();
- for (EngineStore::iterator i = object_store()->begin();
- i != object_store()->end(); ++i) {
+ for (EngineStore::iterator i = engine_store()->begin();
+ i != engine_store()->end(); ++i) {
if ( ! PtrCast<GraphObjectImpl>(i->second)->parent() )
i->second.reset();
}
@@ -93,10 +93,10 @@ Engine::~Engine()
}
-EngineStore*
-Engine::object_store() const
+SharedPtr<EngineStore>
+Engine::engine_store() const
{
- return dynamic_cast<EngineStore*>(_world->store.get());
+ return PtrCast<EngineStore>(_world->store);
}
@@ -270,8 +270,8 @@ Engine::deactivate()
_event_source->deactivate();
- /*for (Tree<GraphObject*>::iterator i = _object_store->objects().begin();
- i != _object_store->objects().end(); ++i)
+ /*for (Tree<GraphObject*>::iterator i = _engine_store->objects().begin();
+ i != _engine_store->objects().end(); ++i)
if ((*i)->as_node() != NULL && (*i)->as_node()->parent() == NULL)
(*i)->as_node()->deactivate();*/
diff --git a/src/libs/engine/Engine.hpp b/src/libs/engine/Engine.hpp
index dd8f3b15..26884f73 100644
--- a/src/libs/engine/Engine.hpp
+++ b/src/libs/engine/Engine.hpp
@@ -92,7 +92,7 @@ public:
ClientBroadcaster* broadcaster() const { return _broadcaster; }
NodeFactory* node_factory() const { return _node_factory; }
- EngineStore* object_store() const;
+ SharedPtr<EngineStore> engine_store() const;
/** Return the active driver for the given type */
Driver* driver(DataType type, EventType event_type);
diff --git a/src/libs/engine/HTTPEngineReceiver.cpp b/src/libs/engine/HTTPEngineReceiver.cpp
index b9cd1d7b..7427f18d 100644
--- a/src/libs/engine/HTTPEngineReceiver.cpp
+++ b/src/libs/engine/HTTPEngineReceiver.cpp
@@ -17,6 +17,7 @@
#include <iostream>
#include <cstdlib>
+#include <cstdio>
#include <string>
#include "types.hpp"
#include <raul/SharedPtr.hpp>
@@ -55,7 +56,7 @@ HTTPEngineReceiver::HTTPEngineReceiver(Engine& engine, uint16_t port)
if (engine.world()->serialisation_module) {
if (!engine.world()->serialiser)
engine.world()->serialiser = SharedPtr<Serialiser>(
- Ingen::Serialisation::new_serialiser(engine.world()));
+ Ingen::Serialisation::new_serialiser(engine.world(), engine.engine_store()));
if (!engine.world()->loader)
engine.world()->loader = SharedPtr<Loader>(
@@ -129,9 +130,27 @@ HTTPEngineReceiver::message_callback(SoupServer* server, SoupMessage* msg, const
return;
}
+#if 0
+ SoupMessageHeaders* in_head = msg->request_headers;
+ const char* str = soup_message_headers_get(in_head, "Accept");
+ cout << "Accept: " << str << endl;
+#endif
+
// Serialise object
- string base_uri = string("ingen:").append(start->second->path());
- const string response = serialiser->to_string(start->second, base_uri, GraphObject::Variables());
+ const string response = serialiser->to_string(start->second, "http://example.org",
+ GraphObject::Variables());
+
+#if 0
+ FILE* xhtml_file = fopen("/home/dave/ingen_ui.xhtml", "r");
+ string response;
+ while (!feof(xhtml_file)) {
+ int c = fgetc(xhtml_file);
+ if (c != EOF)
+ response += (char)c;
+ }
+ fclose(xhtml_file);
+#endif
+
soup_message_set_status (msg, SOUP_STATUS_OK);
soup_message_set_response (msg, "text/plain", SOUP_MEMORY_COPY,
response.c_str(), response.length());
@@ -152,9 +171,14 @@ HTTPEngineReceiver::message_callback(SoupServer* server, SoupMessage* msg, const
soup_message_set_status (msg, SOUP_STATUS_INTERNAL_SERVER_ERROR);
return;
}
+
+ //cout << "POST: " << msg->request_body->data << endl;
// Load object
soup_message_set_status (msg, SOUP_STATUS_NOT_IMPLEMENTED);
+ } else if (msg->method == SOUP_METHOD_POST) {
+ //cout << "PUT: " << msg->request_body->data << endl;
+ soup_message_set_status (msg, SOUP_STATUS_NOT_IMPLEMENTED);
} else {
soup_message_set_status (msg, SOUP_STATUS_NOT_IMPLEMENTED);
}
diff --git a/src/libs/engine/events/AllNotesOffEvent.cpp b/src/libs/engine/events/AllNotesOffEvent.cpp
index 6012ea92..fcb68b31 100644
--- a/src/libs/engine/events/AllNotesOffEvent.cpp
+++ b/src/libs/engine/events/AllNotesOffEvent.cpp
@@ -50,7 +50,7 @@ AllNotesOffEvent::execute(ProcessContext& context)
Event::execute(context);
if (_patch == NULL && _patch_path != "")
- _patch = _engine.object_store()->find_patch(_patch_path);
+ _patch = _engine.engine_store()->find_patch(_patch_path);
//if (_patch != NULL)
// for (Raul::List<MidiInNode*>::iterator j = _patch->midi_in_nodes().begin(); j != _patch->midi_in_nodes().end(); ++j)
diff --git a/src/libs/engine/events/ClearPatchEvent.cpp b/src/libs/engine/events/ClearPatchEvent.cpp
index 30b69915..c1fb0749 100644
--- a/src/libs/engine/events/ClearPatchEvent.cpp
+++ b/src/libs/engine/events/ClearPatchEvent.cpp
@@ -47,13 +47,13 @@ ClearPatchEvent::ClearPatchEvent(Engine& engine, SharedPtr<Responder> responder,
void
ClearPatchEvent::pre_process()
{
- EngineStore::Objects::iterator patch_iterator = _engine.object_store()->find(_patch_path);
+ EngineStore::Objects::iterator patch_iterator = _engine.engine_store()->find(_patch_path);
- if (patch_iterator != _engine.object_store()->end()) {
+ if (patch_iterator != _engine.engine_store()->end()) {
_patch = PtrCast<PatchImpl>(patch_iterator->second);
if (_patch) {
_process = _patch->enabled();
- _removed_table = _engine.object_store()->remove_children(patch_iterator);
+ _removed_table = _engine.engine_store()->remove_children(patch_iterator);
_patch->nodes().clear();
_patch->connections().clear();
_ports_array = _patch->build_ports_array();
diff --git a/src/libs/engine/events/ConnectionEvent.cpp b/src/libs/engine/events/ConnectionEvent.cpp
index 55286ffd..24b80dee 100644
--- a/src/libs/engine/events/ConnectionEvent.cpp
+++ b/src/libs/engine/events/ConnectionEvent.cpp
@@ -62,8 +62,8 @@ ConnectionEvent::pre_process()
return;
}
- _src_port = _engine.object_store()->find_port(_src_port_path);
- _dst_port = _engine.object_store()->find_port(_dst_port_path);
+ _src_port = _engine.engine_store()->find_port(_src_port_path);
+ _dst_port = _engine.engine_store()->find_port(_dst_port_path);
if (_src_port == NULL || _dst_port == NULL) {
_error = PORT_NOT_FOUND;
diff --git a/src/libs/engine/events/CreateNodeEvent.cpp b/src/libs/engine/events/CreateNodeEvent.cpp
index d1d21a36..49cbb58e 100644
--- a/src/libs/engine/events/CreateNodeEvent.cpp
+++ b/src/libs/engine/events/CreateNodeEvent.cpp
@@ -73,13 +73,13 @@ CreateNodeEvent::CreateNodeEvent(Engine& engine, SharedPtr<Responder> responder,
void
CreateNodeEvent::pre_process()
{
- if (_engine.object_store()->find_object(_path) != NULL) {
+ if (_engine.engine_store()->find_object(_path) != NULL) {
_node_already_exists = true;
QueuedEvent::pre_process();
return;
}
- _patch = _engine.object_store()->find_patch(_path.parent());
+ _patch = _engine.engine_store()->find_patch(_path.parent());
PluginImpl* const plugin = (_plugin_uri != "")
? _engine.node_factory()->plugin(_plugin_uri)
@@ -98,8 +98,8 @@ CreateNodeEvent::pre_process()
// This can be done here because the audio thread doesn't touch the
// node tree - just the process order array
_patch->add_node(new PatchImpl::Nodes::Node(_node));
- //_node->add_to_store(_engine.object_store());
- _engine.object_store()->add(_node);
+ //_node->add_to_store(_engine.engine_store());
+ _engine.engine_store()->add(_node);
// FIXME: not really necessary to build process order since it's not connected,
// just append to the list
diff --git a/src/libs/engine/events/CreatePatchEvent.cpp b/src/libs/engine/events/CreatePatchEvent.cpp
index 2b396cbb..e054412f 100644
--- a/src/libs/engine/events/CreatePatchEvent.cpp
+++ b/src/libs/engine/events/CreatePatchEvent.cpp
@@ -45,7 +45,7 @@ CreatePatchEvent::CreatePatchEvent(Engine& engine, SharedPtr<Responder> responde
void
CreatePatchEvent::pre_process()
{
- if (_path == "/" || _engine.object_store()->find_object(_path) != NULL) {
+ if (_path == "/" || _engine.engine_store()->find_object(_path) != NULL) {
_error = OBJECT_EXISTS;
QueuedEvent::pre_process();
return;
@@ -57,7 +57,7 @@ CreatePatchEvent::pre_process()
return;
}
- _parent = _engine.object_store()->find_patch(_path.parent());
+ _parent = _engine.engine_store()->find_patch(_path.parent());
if (_parent == NULL) {
_error = PARENT_NOT_FOUND;
QueuedEvent::pre_process();
@@ -80,8 +80,8 @@ CreatePatchEvent::pre_process()
_patch->activate();
// Insert into EngineStore
- //_patch->add_to_store(_engine.object_store());
- _engine.object_store()->add(_patch);
+ //_patch->add_to_store(_engine.engine_store());
+ _engine.engine_store()->add(_patch);
QueuedEvent::pre_process();
}
diff --git a/src/libs/engine/events/CreatePortEvent.cpp b/src/libs/engine/events/CreatePortEvent.cpp
index b8ef244f..e767f522 100644
--- a/src/libs/engine/events/CreatePortEvent.cpp
+++ b/src/libs/engine/events/CreatePortEvent.cpp
@@ -72,14 +72,14 @@ CreatePortEvent::CreatePortEvent(Engine& engine,
void
CreatePortEvent::pre_process()
{
- if (_error == UNKNOWN_TYPE || _engine.object_store()->find_object(_path)) {
+ if (_error == UNKNOWN_TYPE || _engine.engine_store()->find_object(_path)) {
QueuedEvent::pre_process();
return;
}
// FIXME: this is just a mess :/
- _patch = _engine.object_store()->find_patch(_path.parent());
+ _patch = _engine.engine_store()->find_patch(_path.parent());
if (_patch != NULL) {
assert(_patch->path() == _path.parent());
@@ -106,8 +106,8 @@ CreatePortEvent::pre_process()
_ports_array->at(_patch->num_ports()-1) = _patch_port;
- //_patch_port->add_to_store(_engine.object_store());
- _engine.object_store()->add(_patch_port);
+ //_patch_port->add_to_store(_engine.engine_store());
+ _engine.engine_store()->add(_patch_port);
if (!_patch->parent()) {
if (_type == "ingen:AudioPort")
diff --git a/src/libs/engine/events/DestroyEvent.cpp b/src/libs/engine/events/DestroyEvent.cpp
index 6d1fc3fb..9c9db2db 100644
--- a/src/libs/engine/events/DestroyEvent.cpp
+++ b/src/libs/engine/events/DestroyEvent.cpp
@@ -37,7 +37,7 @@ namespace Ingen {
DestroyEvent::DestroyEvent(Engine& engine, SharedPtr<Responder> responder, FrameTime time, QueuedEventSource* source, const string& path, bool block)
: QueuedEvent(engine, responder, time, source, source)
, _path(path)
- , _store_iterator(engine.object_store()->end())
+ , _store_iterator(engine.engine_store()->end())
, _driver_port(NULL)
, _patch_node_listnode(NULL)
, _patch_port_listnode(NULL)
@@ -58,17 +58,17 @@ DestroyEvent::~DestroyEvent()
void
DestroyEvent::pre_process()
{
- _store_iterator = _engine.object_store()->find(_path);
+ _store_iterator = _engine.engine_store()->find(_path);
- if (_store_iterator != _engine.object_store()->end()) {
+ if (_store_iterator != _engine.engine_store()->end()) {
_node = PtrCast<NodeImpl>(_store_iterator->second);
if (!_node)
_port = PtrCast<PortImpl>(_store_iterator->second);
}
- if (_store_iterator != _engine.object_store()->end()) {
- _removed_table = _engine.object_store()->remove(_store_iterator);
+ if (_store_iterator != _engine.engine_store()->end()) {
+ _removed_table = _engine.engine_store()->remove(_store_iterator);
}
if (_node != NULL && _path != "/") {
diff --git a/src/libs/engine/events/DisablePortMonitoringEvent.cpp b/src/libs/engine/events/DisablePortMonitoringEvent.cpp
index 02d64c0b..cecc8dfd 100644
--- a/src/libs/engine/events/DisablePortMonitoringEvent.cpp
+++ b/src/libs/engine/events/DisablePortMonitoringEvent.cpp
@@ -44,7 +44,7 @@ DisablePortMonitoringEvent::DisablePortMonitoringEvent(Engine& engi
void
DisablePortMonitoringEvent::pre_process()
{
- _port = _engine.object_store()->find_port(_port_path);
+ _port = _engine.engine_store()->find_port(_port_path);
QueuedEvent::pre_process();
}
diff --git a/src/libs/engine/events/DisconnectAllEvent.cpp b/src/libs/engine/events/DisconnectAllEvent.cpp
index 78c2b23b..77b1b1b3 100644
--- a/src/libs/engine/events/DisconnectAllEvent.cpp
+++ b/src/libs/engine/events/DisconnectAllEvent.cpp
@@ -76,7 +76,7 @@ void
DisconnectAllEvent::pre_process()
{
if (_lookup) {
- _parent = _engine.object_store()->find_patch(_parent_path);
+ _parent = _engine.engine_store()->find_patch(_parent_path);
if (_parent == NULL) {
_error = PARENT_NOT_FOUND;
@@ -84,7 +84,7 @@ DisconnectAllEvent::pre_process()
return;
}
- GraphObjectImpl* object = _engine.object_store()->find_object(_path);
+ GraphObjectImpl* object = _engine.engine_store()->find_object(_path);
if (object == NULL) {
_error = OBJECT_NOT_FOUND;
diff --git a/src/libs/engine/events/DisconnectionEvent.cpp b/src/libs/engine/events/DisconnectionEvent.cpp
index d796877f..86ad8b4e 100644
--- a/src/libs/engine/events/DisconnectionEvent.cpp
+++ b/src/libs/engine/events/DisconnectionEvent.cpp
@@ -83,8 +83,8 @@ DisconnectionEvent::pre_process()
return;
}
- _src_port = _engine.object_store()->find_port(_src_port_path);
- _dst_port = _engine.object_store()->find_port(_dst_port_path);
+ _src_port = _engine.engine_store()->find_port(_src_port_path);
+ _dst_port = _engine.engine_store()->find_port(_dst_port_path);
}
if (_src_port == NULL || _dst_port == NULL) {
diff --git a/src/libs/engine/events/EnablePatchEvent.cpp b/src/libs/engine/events/EnablePatchEvent.cpp
index aff5885b..48657146 100644
--- a/src/libs/engine/events/EnablePatchEvent.cpp
+++ b/src/libs/engine/events/EnablePatchEvent.cpp
@@ -39,7 +39,7 @@ EnablePatchEvent::EnablePatchEvent(Engine& engine, SharedPtr<Responder> responde
void
EnablePatchEvent::pre_process()
{
- _patch = _engine.object_store()->find_patch(_patch_path);
+ _patch = _engine.engine_store()->find_patch(_patch_path);
if (_enable && _patch) {
/* Any event that requires a new process order will set the patch's
diff --git a/src/libs/engine/events/EnablePortBroadcastingEvent.cpp b/src/libs/engine/events/EnablePortBroadcastingEvent.cpp
index cb7dc5ec..1d3d2c9e 100644
--- a/src/libs/engine/events/EnablePortBroadcastingEvent.cpp
+++ b/src/libs/engine/events/EnablePortBroadcastingEvent.cpp
@@ -46,7 +46,7 @@ EnablePortBroadcastingEvent::EnablePortBroadcastingEvent(Engine& en
void
EnablePortBroadcastingEvent::pre_process()
{
- _port = _engine.object_store()->find_port(_port_path);
+ _port = _engine.engine_store()->find_port(_port_path);
QueuedEvent::pre_process();
}
diff --git a/src/libs/engine/events/MidiLearnEvent.cpp b/src/libs/engine/events/MidiLearnEvent.cpp
index 3e8947b7..45216e70 100644
--- a/src/libs/engine/events/MidiLearnEvent.cpp
+++ b/src/libs/engine/events/MidiLearnEvent.cpp
@@ -51,7 +51,7 @@ MidiLearnEvent::MidiLearnEvent(Engine& engine, SharedPtr<Responder> responder, S
void
MidiLearnEvent::pre_process()
{
- _node = _engine.object_store()->find_node(_node_path);
+ _node = _engine.engine_store()->find_node(_node_path);
_response_event = new MidiLearnResponseEvent(_engine, _node_path + "/Controller_Number", _time);
QueuedEvent::pre_process();
diff --git a/src/libs/engine/events/NoteEvent.cpp b/src/libs/engine/events/NoteEvent.cpp
index d5f2cf76..d74d5cd0 100644
--- a/src/libs/engine/events/NoteEvent.cpp
+++ b/src/libs/engine/events/NoteEvent.cpp
@@ -65,7 +65,7 @@ NoteEvent::execute(ProcessContext& context)
// Lookup if neccessary
if (!_node)
- _node = _engine.object_store()->find_node(_node_path);
+ _node = _engine.engine_store()->find_node(_node_path);
// FIXME: barf
diff --git a/src/libs/engine/events/RenameEvent.cpp b/src/libs/engine/events/RenameEvent.cpp
index 73426a59..164676aa 100644
--- a/src/libs/engine/events/RenameEvent.cpp
+++ b/src/libs/engine/events/RenameEvent.cpp
@@ -37,7 +37,7 @@ RenameEvent::RenameEvent(Engine& engine, SharedPtr<Responder> responder, SampleC
_name(name),
_new_path("/"),
_parent_patch(NULL),
- _store_iterator(engine.object_store()->end()),
+ _store_iterator(engine.engine_store()->end()),
_error(NO_ERROR)
{
/*
@@ -64,21 +64,21 @@ RenameEvent::pre_process()
_new_path = _old_path.parent().base() + _name;
- _store_iterator = _engine.object_store()->find(_old_path);
- if (_store_iterator == _engine.object_store()->end()) {
+ _store_iterator = _engine.engine_store()->find(_old_path);
+ if (_store_iterator == _engine.engine_store()->end()) {
_error = OBJECT_NOT_FOUND;
QueuedEvent::pre_process();
return;
}
- if (_engine.object_store()->find_object(_new_path)) {
+ if (_engine.engine_store()->find_object(_new_path)) {
_error = OBJECT_EXISTS;
QueuedEvent::pre_process();
return;
}
SharedPtr< Table<Path, SharedPtr<Shared::GraphObject> > > removed
- = _engine.object_store()->remove(_store_iterator);
+ = _engine.engine_store()->remove(_store_iterator);
assert(removed->size() > 0);
@@ -96,7 +96,7 @@ RenameEvent::pre_process()
i->first = child_new_path;
}
- _engine.object_store()->add(*removed.get());
+ _engine.engine_store()->add(*removed.get());
QueuedEvent::pre_process();
}
diff --git a/src/libs/engine/events/RequestAllObjectsEvent.cpp b/src/libs/engine/events/RequestAllObjectsEvent.cpp
index 94e34f3b..d57080aa 100644
--- a/src/libs/engine/events/RequestAllObjectsEvent.cpp
+++ b/src/libs/engine/events/RequestAllObjectsEvent.cpp
@@ -45,7 +45,7 @@ RequestAllObjectsEvent::post_process()
_responder->respond_ok();
// Everything is a child of the root patch, so this sends it all
- PatchImpl* root = _engine.object_store()->find_patch("/");
+ PatchImpl* root = _engine.engine_store()->find_patch("/");
if (root && _responder->client())
ObjectSender::send_patch(_responder->client(), root, true);
diff --git a/src/libs/engine/events/RequestMetadataEvent.cpp b/src/libs/engine/events/RequestMetadataEvent.cpp
index cf428c05..4a7571bb 100644
--- a/src/libs/engine/events/RequestMetadataEvent.cpp
+++ b/src/libs/engine/events/RequestMetadataEvent.cpp
@@ -41,7 +41,7 @@ void
RequestMetadataEvent::pre_process()
{
if (_responder->client()) {
- _object = _engine.object_store()->find_object(_path);
+ _object = _engine.engine_store()->find_object(_path);
if (_object == NULL) {
QueuedEvent::pre_process();
return;
diff --git a/src/libs/engine/events/RequestObjectEvent.cpp b/src/libs/engine/events/RequestObjectEvent.cpp
index c1c93129..88479482 100644
--- a/src/libs/engine/events/RequestObjectEvent.cpp
+++ b/src/libs/engine/events/RequestObjectEvent.cpp
@@ -44,7 +44,7 @@ RequestObjectEvent::RequestObjectEvent(Engine& engine, SharedPtr<Responder> resp
void
RequestObjectEvent::pre_process()
{
- _object = _engine.object_store()->find_object(_path);
+ _object = _engine.engine_store()->find_object(_path);
QueuedEvent::pre_process();
}
diff --git a/src/libs/engine/events/RequestPortValueEvent.cpp b/src/libs/engine/events/RequestPortValueEvent.cpp
index 1e09662b..20203f88 100644
--- a/src/libs/engine/events/RequestPortValueEvent.cpp
+++ b/src/libs/engine/events/RequestPortValueEvent.cpp
@@ -43,7 +43,7 @@ RequestPortValueEvent::RequestPortValueEvent(Engine& engine, SharedPtr<Responder
void
RequestPortValueEvent::pre_process()
{
- _port = _engine.object_store()->find_port(_port_path);
+ _port = _engine.engine_store()->find_port(_port_path);
QueuedEvent::pre_process();
}
diff --git a/src/libs/engine/events/SetMetadataEvent.cpp b/src/libs/engine/events/SetMetadataEvent.cpp
index 14293037..3e41a510 100644
--- a/src/libs/engine/events/SetMetadataEvent.cpp
+++ b/src/libs/engine/events/SetMetadataEvent.cpp
@@ -41,7 +41,7 @@ SetMetadataEvent::SetMetadataEvent(Engine& engine, SharedPtr<Responder> responde
void
SetMetadataEvent::pre_process()
{
- _object = _engine.object_store()->find_object(_path);
+ _object = _engine.engine_store()->find_object(_path);
if (_object == NULL) {
QueuedEvent::pre_process();
return;
diff --git a/src/libs/engine/events/SetPolyphonicEvent.cpp b/src/libs/engine/events/SetPolyphonicEvent.cpp
index d2ff97aa..bce65ba9 100644
--- a/src/libs/engine/events/SetPolyphonicEvent.cpp
+++ b/src/libs/engine/events/SetPolyphonicEvent.cpp
@@ -44,7 +44,7 @@ SetPolyphonicEvent::SetPolyphonicEvent(Engine& engine, SharedPtr<Responder> resp
void
SetPolyphonicEvent::pre_process()
{
- _object = _engine.object_store()->find_object(_path);
+ _object = _engine.engine_store()->find_object(_path);
QueuedEvent::pre_process();
}
diff --git a/src/libs/engine/events/SetPolyphonyEvent.cpp b/src/libs/engine/events/SetPolyphonyEvent.cpp
index 2a22da2f..17222330 100644
--- a/src/libs/engine/events/SetPolyphonyEvent.cpp
+++ b/src/libs/engine/events/SetPolyphonyEvent.cpp
@@ -43,7 +43,7 @@ SetPolyphonyEvent::SetPolyphonyEvent(Engine& engine, SharedPtr<Responder> respon
void
SetPolyphonyEvent::pre_process()
{
- _patch = _engine.object_store()->find_patch(_patch_path);
+ _patch = _engine.engine_store()->find_patch(_patch_path);
if (_patch && _poly > _patch->internal_polyphony())
_patch->prepare_internal_poly(_poly);
diff --git a/src/libs/engine/events/SetPortValueEvent.cpp b/src/libs/engine/events/SetPortValueEvent.cpp
index ee9be86e..01263d2c 100644
--- a/src/libs/engine/events/SetPortValueEvent.cpp
+++ b/src/libs/engine/events/SetPortValueEvent.cpp
@@ -94,7 +94,7 @@ SetPortValueEvent::pre_process()
if (_queued) {
if (_port == NULL) {
if (Path::is_valid(_port_path))
- _port = _engine.object_store()->find_port(_port_path);
+ _port = _engine.engine_store()->find_port(_port_path);
else
_error = ILLEGAL_PATH;
}
@@ -115,7 +115,7 @@ SetPortValueEvent::execute(ProcessContext& context)
if (_error == NO_ERROR && _port == NULL) {
if (Path::is_valid(_port_path))
- _port = _engine.object_store()->find_port(_port_path);
+ _port = _engine.engine_store()->find_port(_port_path);
else
_error = ILLEGAL_PATH;
}