Reorganize two 'store' implementations, move header to shared module (prepare for factoring out).

git-svn-id: http://svn.drobilla.net/lad/ingen@1395 a436a847-0d15-0410-975c-d299462d15a1

27 files changed, 33 insertions, 33 deletions

diff --git a/src/libs/engine/events/AllNotesOffEvent.cpp b/src/libs/engine/events/AllNotesOffEvent.cpp
index a0b3360f..6012ea92 100644
--- a/src/libs/engine/events/AllNotesOffEvent.cpp
+++ b/src/libs/engine/events/AllNotesOffEvent.cpp
@@ -18,9 +18,9 @@
 #include "AllNotesOffEvent.hpp"
 #include "Responder.hpp"
 #include "Engine.hpp"
-#include "ObjectStore.hpp"
+#include "EngineStore.hpp"
 #include "module/World.hpp"
-#include "interface/Store.hpp"
+#include "shared/Store.hpp"
 
 namespace Ingen {
 
diff --git a/src/libs/engine/events/ClearPatchEvent.cpp b/src/libs/engine/events/ClearPatchEvent.cpp
index 0e725e65..60b882f9 100644
--- a/src/libs/engine/events/ClearPatchEvent.cpp
+++ b/src/libs/engine/events/ClearPatchEvent.cpp
@@ -22,7 +22,7 @@
 #include "PatchImpl.hpp"
 #include "ClientBroadcaster.hpp"
 #include "util.hpp"
-#include "ObjectStore.hpp"
+#include "EngineStore.hpp"
 #include "PortImpl.hpp"
 #include "NodeImpl.hpp"
 #include "ConnectionImpl.hpp"
@@ -47,7 +47,7 @@ ClearPatchEvent::ClearPatchEvent(Engine& engine, SharedPtr<Responder> responder,
 void
 ClearPatchEvent::pre_process()
 {
-	ObjectStore::Objects::iterator patch_iterator = _engine.object_store()->find(_patch_path);
+	EngineStore::Objects::iterator patch_iterator = _engine.object_store()->find(_patch_path);
 	
 	if (patch_iterator != _engine.object_store()->objects().end()) {
 		_patch = PtrCast<PatchImpl>(patch_iterator->second);
@@ -88,7 +88,7 @@ ClearPatchEvent::execute(ProcessContext& context)
 
 		// Remove driver ports, if necessary
 		if (_patch->parent() == NULL) {
-			for (ObjectStore::Objects::iterator i = _removed_table->begin(); i != _removed_table->end(); ++i) {
+			for (EngineStore::Objects::iterator i = _removed_table->begin(); i != _removed_table->end(); ++i) {
 				SharedPtr<PortImpl> port = PtrCast<PortImpl>(i->second);
 				if (port && port->type() == DataType::AUDIO)
 					_driver_port = _engine.audio_driver()->remove_port(port->path());
diff --git a/src/libs/engine/events/ClearPatchEvent.hpp b/src/libs/engine/events/ClearPatchEvent.hpp
index 0353dc01..803721fb 100644
--- a/src/libs/engine/events/ClearPatchEvent.hpp
+++ b/src/libs/engine/events/ClearPatchEvent.hpp
@@ -23,7 +23,7 @@
 #include <raul/Table.hpp>
 #include <raul/Path.hpp>
 #include "QueuedEvent.hpp"
-#include "ObjectStore.hpp"
+#include "EngineStore.hpp"
 #include "PatchImpl.hpp"
 
 using std::string;
diff --git a/src/libs/engine/events/ConnectionEvent.cpp b/src/libs/engine/events/ConnectionEvent.cpp
index ac04d1cc..55286ffd 100644
--- a/src/libs/engine/events/ConnectionEvent.cpp
+++ b/src/libs/engine/events/ConnectionEvent.cpp
@@ -25,7 +25,7 @@
 #include "ConnectionImpl.hpp"
 #include "Engine.hpp"
 #include "InputPort.hpp"
-#include "ObjectStore.hpp"
+#include "EngineStore.hpp"
 #include "OutputPort.hpp"
 #include "PatchImpl.hpp"
 #include "PortImpl.hpp"
diff --git a/src/libs/engine/events/CreateNodeEvent.cpp b/src/libs/engine/events/CreateNodeEvent.cpp
index 7589b150..d1d21a36 100644
--- a/src/libs/engine/events/CreateNodeEvent.cpp
+++ b/src/libs/engine/events/CreateNodeEvent.cpp
@@ -29,7 +29,7 @@
 #include "PatchImpl.hpp"
 #include "NodeFactory.hpp"
 #include "ClientBroadcaster.hpp"
-#include "ObjectStore.hpp"
+#include "EngineStore.hpp"
 #include "PortImpl.hpp"
 #include "AudioDriver.hpp"
 
diff --git a/src/libs/engine/events/CreatePatchEvent.cpp b/src/libs/engine/events/CreatePatchEvent.cpp
index 8642dc1d..2b396cbb 100644
--- a/src/libs/engine/events/CreatePatchEvent.cpp
+++ b/src/libs/engine/events/CreatePatchEvent.cpp
@@ -25,7 +25,7 @@
 #include "Engine.hpp"
 #include "ClientBroadcaster.hpp"
 #include "AudioDriver.hpp"
-#include "ObjectStore.hpp"
+#include "EngineStore.hpp"
 
 namespace Ingen {
 
@@ -79,7 +79,7 @@ CreatePatchEvent::pre_process()
 	
 	_patch->activate();
 	
-	// Insert into ObjectStore
+	// Insert into EngineStore
 	//_patch->add_to_store(_engine.object_store());
 	_engine.object_store()->add(_patch);
 	
diff --git a/src/libs/engine/events/CreatePortEvent.cpp b/src/libs/engine/events/CreatePortEvent.cpp
index aca33c67..b8ef244f 100644
--- a/src/libs/engine/events/CreatePortEvent.cpp
+++ b/src/libs/engine/events/CreatePortEvent.cpp
@@ -26,7 +26,7 @@
 #include "Engine.hpp"
 #include "PatchImpl.hpp"
 #include "QueuedEventSource.hpp"
-#include "ObjectStore.hpp"
+#include "EngineStore.hpp"
 #include "ClientBroadcaster.hpp"
 #include "PortImpl.hpp"
 #include "AudioDriver.hpp"
diff --git a/src/libs/engine/events/DestroyEvent.cpp b/src/libs/engine/events/DestroyEvent.cpp
index bc28501e..bdcb1ad2 100644
--- a/src/libs/engine/events/DestroyEvent.cpp
+++ b/src/libs/engine/events/DestroyEvent.cpp
@@ -27,7 +27,7 @@
 #include "MidiDriver.hpp"
 #include "DisconnectAllEvent.hpp"
 #include "ClientBroadcaster.hpp"
-#include "ObjectStore.hpp"
+#include "EngineStore.hpp"
 #include "QueuedEventSource.hpp"
 #include "PortImpl.hpp"
 
diff --git a/src/libs/engine/events/DestroyEvent.hpp b/src/libs/engine/events/DestroyEvent.hpp
index 5d87f27c..c2cf9ed5 100644
--- a/src/libs/engine/events/DestroyEvent.hpp
+++ b/src/libs/engine/events/DestroyEvent.hpp
@@ -21,7 +21,7 @@
 #include <string>
 #include <raul/Path.hpp>
 #include "QueuedEvent.hpp"
-#include "ObjectStore.hpp"
+#include "EngineStore.hpp"
 #include "PatchImpl.hpp"
 
 using std::string;
@@ -58,7 +58,7 @@ public:
 
 private:
 	Path                                         _path;
-	ObjectStore::Objects::iterator               _store_iterator;
+	EngineStore::Objects::iterator               _store_iterator;
 	SharedPtr<NodeImpl>                          _node;  ///< Non-NULL iff a node
 	SharedPtr<PortImpl>                          _port;  ///< Non-NULL iff a port
 	DriverPort*                                  _driver_port;
diff --git a/src/libs/engine/events/DisablePortMonitoringEvent.cpp b/src/libs/engine/events/DisablePortMonitoringEvent.cpp
index d5b99618..02d64c0b 100644
--- a/src/libs/engine/events/DisablePortMonitoringEvent.cpp
+++ b/src/libs/engine/events/DisablePortMonitoringEvent.cpp
@@ -21,7 +21,7 @@
 #include "Responder.hpp"
 #include "Engine.hpp"
 #include "PortImpl.hpp"
-#include "ObjectStore.hpp"
+#include "EngineStore.hpp"
 #include "ClientBroadcaster.hpp"
 #include "AudioBuffer.hpp"
 
diff --git a/src/libs/engine/events/DisconnectAllEvent.cpp b/src/libs/engine/events/DisconnectAllEvent.cpp
index a536fffc..78c2b23b 100644
--- a/src/libs/engine/events/DisconnectAllEvent.cpp
+++ b/src/libs/engine/events/DisconnectAllEvent.cpp
@@ -27,7 +27,7 @@
 #include "Engine.hpp"
 #include "InputPort.hpp"
 #include "NodeImpl.hpp"
-#include "ObjectStore.hpp"
+#include "EngineStore.hpp"
 #include "OutputPort.hpp"
 #include "PatchImpl.hpp"
 #include "PortImpl.hpp"
diff --git a/src/libs/engine/events/DisconnectionEvent.cpp b/src/libs/engine/events/DisconnectionEvent.cpp
index 03110f9e..d796877f 100644
--- a/src/libs/engine/events/DisconnectionEvent.cpp
+++ b/src/libs/engine/events/DisconnectionEvent.cpp
@@ -27,7 +27,7 @@
 #include "PatchImpl.hpp"
 #include "ClientBroadcaster.hpp"
 #include "PortImpl.hpp"
-#include "ObjectStore.hpp"
+#include "EngineStore.hpp"
 
 using std::string;
 namespace Ingen {
diff --git a/src/libs/engine/events/EnablePatchEvent.cpp b/src/libs/engine/events/EnablePatchEvent.cpp
index b1cda98a..aff5885b 100644
--- a/src/libs/engine/events/EnablePatchEvent.cpp
+++ b/src/libs/engine/events/EnablePatchEvent.cpp
@@ -21,7 +21,7 @@
 #include "PatchImpl.hpp"
 #include "util.hpp"
 #include "ClientBroadcaster.hpp"
-#include "ObjectStore.hpp"
+#include "EngineStore.hpp"
 
 namespace Ingen {
 
diff --git a/src/libs/engine/events/EnablePortBroadcastingEvent.cpp b/src/libs/engine/events/EnablePortBroadcastingEvent.cpp
index dcc09ac4..cb7dc5ec 100644
--- a/src/libs/engine/events/EnablePortBroadcastingEvent.cpp
+++ b/src/libs/engine/events/EnablePortBroadcastingEvent.cpp
@@ -21,7 +21,7 @@
 #include "Responder.hpp"
 #include "Engine.hpp"
 #include "PortImpl.hpp"
-#include "ObjectStore.hpp"
+#include "EngineStore.hpp"
 #include "ClientBroadcaster.hpp"
 #include "AudioBuffer.hpp"
 
diff --git a/src/libs/engine/events/MidiLearnEvent.cpp b/src/libs/engine/events/MidiLearnEvent.cpp
index 8d5b0658..3e8947b7 100644
--- a/src/libs/engine/events/MidiLearnEvent.cpp
+++ b/src/libs/engine/events/MidiLearnEvent.cpp
@@ -18,7 +18,7 @@
 #include "MidiLearnEvent.hpp"
 #include "Responder.hpp"
 #include "Engine.hpp"
-#include "ObjectStore.hpp"
+#include "EngineStore.hpp"
 #include "NodeImpl.hpp"
 #include "MidiControlNode.hpp"
 #include "ClientBroadcaster.hpp"
diff --git a/src/libs/engine/events/NoteEvent.cpp b/src/libs/engine/events/NoteEvent.cpp
index 8f262d14..d5f2cf76 100644
--- a/src/libs/engine/events/NoteEvent.cpp
+++ b/src/libs/engine/events/NoteEvent.cpp
@@ -18,7 +18,7 @@
 #include "NoteEvent.hpp"
 #include "Responder.hpp"
 #include "Engine.hpp"
-#include "ObjectStore.hpp"
+#include "EngineStore.hpp"
 #include "NodeImpl.hpp"
 #include "MidiNoteNode.hpp"
 #include "MidiTriggerNode.hpp"
diff --git a/src/libs/engine/events/RenameEvent.cpp b/src/libs/engine/events/RenameEvent.cpp
index 7d487cc1..cd2189e8 100644
--- a/src/libs/engine/events/RenameEvent.cpp
+++ b/src/libs/engine/events/RenameEvent.cpp
@@ -19,7 +19,7 @@
 #include "ClientBroadcaster.hpp"
 #include "Engine.hpp"
 #include "NodeImpl.hpp"
-#include "ObjectStore.hpp"
+#include "EngineStore.hpp"
 #include "PatchImpl.hpp"
 #include "RenameEvent.hpp"
 #include "Responder.hpp"
diff --git a/src/libs/engine/events/RenameEvent.hpp b/src/libs/engine/events/RenameEvent.hpp
index dbfc6d53..114b59fa 100644
--- a/src/libs/engine/events/RenameEvent.hpp
+++ b/src/libs/engine/events/RenameEvent.hpp
@@ -21,7 +21,7 @@
 #include <string>
 #include <raul/Path.hpp>
 #include "QueuedEvent.hpp"
-#include "ObjectStore.hpp"
+#include "EngineStore.hpp"
 
 using std::string;
 
@@ -54,7 +54,7 @@ private:
 	string                         _name;
 	Path                           _new_path;
 	PatchImpl*                     _parent_patch;
-	ObjectStore::Objects::iterator _store_iterator;
+	EngineStore::Objects::iterator _store_iterator;
 	ErrorType                      _error;
 };
 
diff --git a/src/libs/engine/events/RequestAllObjectsEvent.cpp b/src/libs/engine/events/RequestAllObjectsEvent.cpp
index 7865cd9b..94e34f3b 100644
--- a/src/libs/engine/events/RequestAllObjectsEvent.cpp
+++ b/src/libs/engine/events/RequestAllObjectsEvent.cpp
@@ -20,7 +20,7 @@
 #include "Engine.hpp"
 #include "ObjectSender.hpp"
 #include "ClientBroadcaster.hpp"
-#include "ObjectStore.hpp"
+#include "EngineStore.hpp"
 
 namespace Ingen {
 
diff --git a/src/libs/engine/events/RequestMetadataEvent.cpp b/src/libs/engine/events/RequestMetadataEvent.cpp
index 99f0e04e..cf428c05 100644
--- a/src/libs/engine/events/RequestMetadataEvent.cpp
+++ b/src/libs/engine/events/RequestMetadataEvent.cpp
@@ -20,7 +20,7 @@
 #include "Responder.hpp"
 #include "Engine.hpp"
 #include "GraphObjectImpl.hpp"
-#include "ObjectStore.hpp"
+#include "EngineStore.hpp"
 #include "interface/ClientInterface.hpp"
 #include "ClientBroadcaster.hpp"
 using std::string;
diff --git a/src/libs/engine/events/RequestObjectEvent.cpp b/src/libs/engine/events/RequestObjectEvent.cpp
index 34c04889..c1c93129 100644
--- a/src/libs/engine/events/RequestObjectEvent.cpp
+++ b/src/libs/engine/events/RequestObjectEvent.cpp
@@ -20,7 +20,7 @@
 #include "interface/ClientInterface.hpp"
 #include "Responder.hpp"
 #include "Engine.hpp"
-#include "ObjectStore.hpp"
+#include "EngineStore.hpp"
 #include "ClientBroadcaster.hpp"
 #include "PatchImpl.hpp"
 #include "NodeImpl.hpp"
diff --git a/src/libs/engine/events/RequestPluginEvent.cpp b/src/libs/engine/events/RequestPluginEvent.cpp
index 1c1df99e..36358df7 100644
--- a/src/libs/engine/events/RequestPluginEvent.cpp
+++ b/src/libs/engine/events/RequestPluginEvent.cpp
@@ -21,7 +21,7 @@
 #include "Responder.hpp"
 #include "Engine.hpp"
 #include "PortImpl.hpp"
-#include "ObjectStore.hpp"
+#include "EngineStore.hpp"
 #include "ClientBroadcaster.hpp"
 #include "NodeFactory.hpp"
 #include "PluginImpl.hpp"
diff --git a/src/libs/engine/events/RequestPortValueEvent.cpp b/src/libs/engine/events/RequestPortValueEvent.cpp
index e26b1036..1e09662b 100644
--- a/src/libs/engine/events/RequestPortValueEvent.cpp
+++ b/src/libs/engine/events/RequestPortValueEvent.cpp
@@ -21,7 +21,7 @@
 #include "Responder.hpp"
 #include "Engine.hpp"
 #include "PortImpl.hpp"
-#include "ObjectStore.hpp"
+#include "EngineStore.hpp"
 #include "ClientBroadcaster.hpp"
 #include "AudioBuffer.hpp"
 #include "ProcessContext.hpp"
diff --git a/src/libs/engine/events/SetMetadataEvent.cpp b/src/libs/engine/events/SetMetadataEvent.cpp
index 2829eb1e..14293037 100644
--- a/src/libs/engine/events/SetMetadataEvent.cpp
+++ b/src/libs/engine/events/SetMetadataEvent.cpp
@@ -21,7 +21,7 @@
 #include "Engine.hpp"
 #include "ClientBroadcaster.hpp"
 #include "GraphObjectImpl.hpp"
-#include "ObjectStore.hpp"
+#include "EngineStore.hpp"
 
 using std::string;
 
diff --git a/src/libs/engine/events/SetPolyphonicEvent.cpp b/src/libs/engine/events/SetPolyphonicEvent.cpp
index 73e27c93..d2ff97aa 100644
--- a/src/libs/engine/events/SetPolyphonicEvent.cpp
+++ b/src/libs/engine/events/SetPolyphonicEvent.cpp
@@ -22,7 +22,7 @@
 #include "PatchImpl.hpp"
 #include "ClientBroadcaster.hpp"
 #include "util.hpp"
-#include "ObjectStore.hpp"
+#include "EngineStore.hpp"
 #include "PortImpl.hpp"
 #include "NodeImpl.hpp"
 #include "ConnectionImpl.hpp"
diff --git a/src/libs/engine/events/SetPolyphonyEvent.cpp b/src/libs/engine/events/SetPolyphonyEvent.cpp
index 7efa7386..2a22da2f 100644
--- a/src/libs/engine/events/SetPolyphonyEvent.cpp
+++ b/src/libs/engine/events/SetPolyphonyEvent.cpp
@@ -22,7 +22,7 @@
 #include "PatchImpl.hpp"
 #include "ClientBroadcaster.hpp"
 #include "util.hpp"
-#include "ObjectStore.hpp"
+#include "EngineStore.hpp"
 #include "PortImpl.hpp"
 #include "NodeImpl.hpp"
 #include "ConnectionImpl.hpp"
diff --git a/src/libs/engine/events/SetPortValueEvent.cpp b/src/libs/engine/events/SetPortValueEvent.cpp
index 9ab6349d..ee9be86e 100644
--- a/src/libs/engine/events/SetPortValueEvent.cpp
+++ b/src/libs/engine/events/SetPortValueEvent.cpp
@@ -23,7 +23,7 @@
 #include "PortImpl.hpp"
 #include "ClientBroadcaster.hpp"
 #include "NodeImpl.hpp"
-#include "ObjectStore.hpp"
+#include "EngineStore.hpp"
 #include "AudioBuffer.hpp"
 #include "EventBuffer.hpp"
 #include "ProcessContext.hpp"