From 2dbd0cd81dff72aea42344188d20f7d7f6d20e1a Mon Sep 17 00:00:00 2001 From: David Robillard Date: Tue, 18 Jul 2006 05:46:24 +0000 Subject: Removed globals (Om.h) git-svn-id: http://svn.drobilla.net/lad/ingen@96 a436a847-0d15-0410-975c-d299462d15a1 --- src/libs/engine/ClientBroadcaster.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/libs/engine/ClientBroadcaster.cpp') diff --git a/src/libs/engine/ClientBroadcaster.cpp b/src/libs/engine/ClientBroadcaster.cpp index e8636805..f073fd19 100644 --- a/src/libs/engine/ClientBroadcaster.cpp +++ b/src/libs/engine/ClientBroadcaster.cpp @@ -18,8 +18,7 @@ #include #include #include -#include "Om.h" -#include "OmApp.h" +#include "Ingen.h" #include "ObjectStore.h" #include "NodeFactory.h" #include "util.h" @@ -129,13 +128,14 @@ 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) { - om->node_factory()->lock_plugin_list(); + Ingen::instance().node_factory()->lock_plugin_list(); - const list& plugs = om->node_factory()->plugins(); + const list& plugs = Ingen::instance().node_factory()->plugins(); const Plugin* plugin; lo_timetag tt; @@ -175,7 +175,7 @@ ClientBroadcaster::send_plugins_to(ClientInterface* client) for (list::const_iterator i = msgs.begin(); i != msgs.end(); ++i) lo_message_free(*i); - om->node_factory()->unlock_plugin_list(); + Ingen::instance().node_factory()->unlock_plugin_list(); } -- cgit v1.2.1