diff options
| author | David Robillard <d@drobilla.net> | 2006-07-18 05:46:24 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2006-07-18 05:46:24 +0000 |
| commit | 2dbd0cd81dff72aea42344188d20f7d7f6d20e1a (patch) | |
| tree | a3af76b4164c75b19d3973c88b05591be9e9d67d /src/libs/engine/ClientBroadcaster.cpp | |
| parent | 1d81360a04e0e5c0a57b8be1708e29a3f2bde848 (diff) | |
| download | ingen-2dbd0cd81dff72aea42344188d20f7d7f6d20e1a.tar.gz ingen-2dbd0cd81dff72aea42344188d20f7d7f6d20e1a.tar.bz2 ingen-2dbd0cd81dff72aea42344188d20f7d7f6d20e1a.zip | |
Removed globals (Om.h)
git-svn-id: http://svn.drobilla.net/lad/ingen@96 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/libs/engine/ClientBroadcaster.cpp')
| -rw-r--r-- | src/libs/engine/ClientBroadcaster.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
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 <cassert> #include <iostream> #include <unistd.h> -#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<Plugin*>& plugs = om->node_factory()->plugins(); + const list<Plugin*>& plugs = Ingen::instance().node_factory()->plugins(); const Plugin* plugin; lo_timetag tt; @@ -175,7 +175,7 @@ ClientBroadcaster::send_plugins_to(ClientInterface* client) for (list<lo_bundle>::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(); } |