diff options
| author | David Robillard <d@drobilla.net> | 2006-09-08 03:58:00 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2006-09-08 03:58:00 +0000 |
| commit | 48f87f1f1649fb7e169fdaac2cd38370e8a4a1fa (patch) | |
| tree | 9da4b4b075791ac1ec78b499dbcbec6101f54690 /src/libs/engine/ClientBroadcaster.cpp | |
| parent | acbe9a26ec3ab689e430225d15e95e73a7378aa9 (diff) | |
| download | ingen-48f87f1f1649fb7e169fdaac2cd38370e8a4a1fa.tar.gz ingen-48f87f1f1649fb7e169fdaac2cd38370e8a4a1fa.tar.bz2 ingen-48f87f1f1649fb7e169fdaac2cd38370e8a4a1fa.zip | |
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
Diffstat (limited to 'src/libs/engine/ClientBroadcaster.cpp')
| -rw-r--r-- | src/libs/engine/ClientBroadcaster.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/libs/engine/ClientBroadcaster.cpp b/src/libs/engine/ClientBroadcaster.cpp index 4dc992db..1fa64d9a 100644 --- a/src/libs/engine/ClientBroadcaster.cpp +++ b/src/libs/engine/ClientBroadcaster.cpp @@ -18,7 +18,6 @@ #include <cassert> #include <iostream> #include <unistd.h> -#include "Engine.h" #include "ObjectStore.h" #include "NodeFactory.h" #include "util.h" @@ -131,11 +130,11 @@ ClientBroadcaster::send_error(const string& msg) /* FIXME: Make a copy method for list and just make a copy and pass it here * instead of this global+locking mess */ void -ClientBroadcaster::send_plugins_to(ClientInterface* client) +ClientBroadcaster::send_plugins_to(ClientInterface* client, const list<Plugin*>& plugin_list) { - Engine::instance().node_factory()->lock_plugin_list(); - - const list<Plugin*>& plugs = Engine::instance().node_factory()->plugins(); + // FIXME: This probably isn't actually thread safe + const list<Plugin*> plugs = plugin_list; // make a copy + const Plugin* plugin; lo_timetag tt; @@ -174,8 +173,6 @@ ClientBroadcaster::send_plugins_to(ClientInterface* client) } for (list<lo_bundle>::const_iterator i = msgs.begin(); i != msgs.end(); ++i) lo_message_free(*i); - - Engine::instance().node_factory()->unlock_plugin_list(); } |