Removed globals (Om.h)

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

1 files changed, 6 insertions, 8 deletions

diff --git a/src/libs/engine/OSCClient.cpp b/src/libs/engine/OSCClient.cpp
index 7ab78240..a902f629 100644
--- a/src/libs/engine/OSCClient.cpp
+++ b/src/libs/engine/OSCClient.cpp
@@ -18,8 +18,6 @@
 #include <cassert>
 #include <iostream>
 #include <unistd.h>
-#include "Om.h"
-#include "OmApp.h"
 #include "ObjectStore.h"
 #include "NodeFactory.h"
 #include "util.h"
@@ -136,9 +134,9 @@ OSCClient::num_plugins(uint32_t num)
 void
 OSCClient::plugins()
 {
-	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;
@@ -177,7 +175,7 @@ OSCClient::plugins()
 	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();
 }
 */
 
@@ -278,7 +276,7 @@ void OSCClient::new_node(const string& plugin_type,
 
 	// Send control values
 	for (size_t i=0; i < node->ports().size(); ++i) {
-		TypedPort<sample>* port = (TypedPort<sample>*)node->ports().at(i);
+		TypedPort<Sample>* port = (TypedPort<Sample>*)node->ports().at(i);
 		if (port->port_info()->is_input() && port->port_info()->is_control())
 			control_change(port->path(), port->buffer(0)->value_at(0));
 	}
@@ -474,8 +472,8 @@ OSCClient::object_renamed(const string& old_path, const string& new_path)
 void
 OSCClient::all_objects()
 {
-	for (Tree<GraphObject*>::iterator i = om->object_store()->objects().begin();
-			i != om->object_store()->objects().end(); ++i)
+	for (Tree<GraphObject*>::iterator i = Ingen::instance().object_store()->objects().begin();
+			i != Ingen::instance().object_store()->objects().end(); ++i)
 		if ((*i)->as_node() != NULL && (*i)->parent() == NULL)
 			(*i)->as_node()->send_creation_messages(this);
 }