From 48f87f1f1649fb7e169fdaac2cd38370e8a4a1fa Mon Sep 17 00:00:00 2001 From: David Robillard Date: Fri, 8 Sep 2006 03:58:00 +0000 Subject: De-singleton-ified Engine Slight rework of Responder/ClientKey/ClientInterface for Requests git-svn-id: http://svn.drobilla.net/lad/ingen@119 a436a847-0d15-0410-975c-d299462d15a1 --- src/libs/engine/ObjectSender.cpp | 26 ++------------------------ 1 file changed, 2 insertions(+), 24 deletions(-) (limited to 'src/libs/engine/ObjectSender.cpp') diff --git a/src/libs/engine/ObjectSender.cpp b/src/libs/engine/ObjectSender.cpp index 3055217c..063a2d1d 100644 --- a/src/libs/engine/ObjectSender.cpp +++ b/src/libs/engine/ObjectSender.cpp @@ -16,7 +16,6 @@ #include "ObjectSender.h" #include "interface/ClientInterface.h" -#include "Engine.h" #include "ObjectStore.h" #include "Patch.h" #include "Node.h" @@ -27,22 +26,6 @@ namespace Ingen { -/** Send all currently existing objects to client. - */ -void -ObjectSender::send_all(ClientInterface* client) -{ - Patch* root = Engine::instance().object_store()->find_patch("/"); - assert(root); - send_patch(client, root); - /*for (Tree::iterator i = Engine::instance().object_store()->objects().begin(); - i != Engine::instance().object_store()->objects().end(); ++i) - if ((*i)->as_patch() != NULL && (*i)->parent() == NULL) - send_patch(client, (*i)->as_patch());*/ - //(*i)->as_node()->send_creation_messages(client); - -} - void ObjectSender::send_patch(ClientInterface* client, const Patch* patch) @@ -85,7 +68,7 @@ ObjectSender::send_patch(ClientInterface* client, const Patch* patch) for (map::const_iterator j = data.begin(); j != data.end(); ++j) client->metadata_update(patch->path(), (*j).first, (*j).second); - if (patch->process()) + if (patch->enabled()) client->patch_enabled(patch->path()); } @@ -173,12 +156,8 @@ ObjectSender::send_port(ClientInterface* client, const Port* port) void -ObjectSender::send_plugins(ClientInterface* client) +ObjectSender::send_plugins(ClientInterface* client, const list& plugs) { - Engine::instance().node_factory()->lock_plugin_list(); - - const list& plugs = Engine::instance().node_factory()->plugins(); - /* lo_timetag tt; lo_timetag_now(&tt); @@ -221,7 +200,6 @@ ObjectSender::send_plugins(ClientInterface* client) for (list::const_iterator i = msgs.begin(); i != msgs.end(); ++i) lo_message_free(*i); */ - Engine::instance().node_factory()->unlock_plugin_list(); } -- cgit v1.2.1