Removed globals (Om.h)

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

1 files changed, 14 insertions, 23 deletions

diff --git a/src/libs/engine/NodeFactory.cpp b/src/libs/engine/NodeFactory.cpp
index 652576a7..60d8f44a 100644
--- a/src/libs/engine/NodeFactory.cpp
+++ b/src/libs/engine/NodeFactory.cpp
@@ -22,24 +22,15 @@
 #include <float.h>
 #include <cmath>
 #include <dlfcn.h>
+#include "Ingen.h"
 #include "AudioDriver.h"
 #include "MidiNoteNode.h"
 #include "MidiTriggerNode.h"
 #include "MidiControlNode.h"
-#if 0
-#include "AudioInputNode.h"
-#include "AudioOutputNode.h"
-#include "ControlInputNode.h"
-#include "ControlOutputNode.h"
-#include "MidiInputNode.h"
-#include "MidiOutputNode.h"
-#endif
 #include "TransportNode.h"
 #include "PluginLibrary.h"
 #include "Plugin.h"
 #include "Patch.h"
-#include "Om.h"
-#include "OmApp.h"
 #ifdef HAVE_SLV2
 #include "LV2Node.h"
 #include <slv2/slv2.h>
@@ -227,40 +218,40 @@ NodeFactory::load_internal_plugin(const string& uri, const string& name, size_t
 
 	string plug_label = uri.substr(3);
 	/*if (plug_label == "midi_input") {
-		MidiInputNode* tn = new MidiInputNode(name, 1, parent, om->audio_driver()->sample_rate(), om->audio_driver()->buffer_size());
+		MidiInputNode* tn = new MidiInputNode(name, 1, parent, Ingen::instance().audio_driver()->sample_rate(), Ingen::instance().audio_driver()->buffer_size());
 		return tn;
 	} else if (plug_label == "midi_output") {
-		MidiOutputNode* tn = new MidiOutputNode(name, 1, parent, om->audio_driver()->sample_rate(), om->audio_driver()->buffer_size());
+		MidiOutputNode* tn = new MidiOutputNode(name, 1, parent, Ingen::instance().audio_driver()->sample_rate(), Ingen::instance().audio_driver()->buffer_size());
 		return tn;
 	} else if (plug_label == "audio_input") {
 		AudioInputNode* in = new AudioInputNode(name, poly, parent,
-			om->audio_driver()->sample_rate(), om->audio_driver()->buffer_size());
+			Ingen::instance().audio_driver()->sample_rate(), Ingen::instance().audio_driver()->buffer_size());
 		return in;
 	} else if (plug_label == "control_input") {
 		ControlInputNode* in = new ControlInputNode(name, poly, parent,
-			om->audio_driver()->sample_rate(), om->audio_driver()->buffer_size());
+			Ingen::instance().audio_driver()->sample_rate(), Ingen::instance().audio_driver()->buffer_size());
 		return in;
 	} else if (plug_label == "audio_output") {
 		AudioOutputNode* on = new AudioOutputNode(name, poly, parent,
-			om->audio_driver()->sample_rate(), om->audio_driver()->buffer_size());
+			Ingen::instance().audio_driver()->sample_rate(), Ingen::instance().audio_driver()->buffer_size());
 		return on;
 	} else if (plug_label == "control_output") {
 		ControlOutputNode* on = new ControlOutputNode(name, poly, parent,
-			om->audio_driver()->sample_rate(), om->audio_driver()->buffer_size());
+			Ingen::instance().audio_driver()->sample_rate(), Ingen::instance().audio_driver()->buffer_size());
 		return on;
 	} else
 	*/
 	if (plug_label == "note_in" || plug_label == "midi_note_in") {
-		MidiNoteNode* mn = new MidiNoteNode(name, poly, parent, om->audio_driver()->sample_rate(), om->audio_driver()->buffer_size());
+		MidiNoteNode* mn = new MidiNoteNode(name, poly, parent, Ingen::instance().audio_driver()->sample_rate(), Ingen::instance().audio_driver()->buffer_size());
 		return mn;
 	} else if (plug_label == "trigger_in" || plug_label == "midi_trigger_in") {
-		MidiTriggerNode* mn = new MidiTriggerNode(name, 1, parent, om->audio_driver()->sample_rate(), om->audio_driver()->buffer_size());
+		MidiTriggerNode* mn = new MidiTriggerNode(name, 1, parent, Ingen::instance().audio_driver()->sample_rate(), Ingen::instance().audio_driver()->buffer_size());
 		return mn;
 	} else if (plug_label == "midi_control_in") {
-		MidiControlNode* mn = new MidiControlNode(name, 1, parent, om->audio_driver()->sample_rate(), om->audio_driver()->buffer_size());
+		MidiControlNode* mn = new MidiControlNode(name, 1, parent, Ingen::instance().audio_driver()->sample_rate(), Ingen::instance().audio_driver()->buffer_size());
 		return mn;
 	} else if (plug_label == "transport") {
-		TransportNode* tn = new TransportNode(name, 1, parent, om->audio_driver()->sample_rate(), om->audio_driver()->buffer_size());
+		TransportNode* tn = new TransportNode(name, 1, parent, Ingen::instance().audio_driver()->sample_rate(), Ingen::instance().audio_driver()->buffer_size());
 		return tn;
 	} else {
 		cerr << "Unknown internal plugin type '" << plug_label << "'" << endl;
@@ -343,7 +334,7 @@ NodeFactory::load_lv2_plugin(const string& plug_uri,
 
 	if (plugin) {
 		n = new Om::LV2Node(plugin, node_name, poly, parent,
-			om->audio_driver()->sample_rate(), om->audio_driver()->buffer_size());
+			Ingen::instance().audio_driver()->sample_rate(), Ingen::instance().audio_driver()->buffer_size());
 		bool success = ((LV2Node*)n)->instantiate();
 		if (!success) {
 			delete n;
@@ -519,7 +510,7 @@ NodeFactory::load_dssi_plugin(const string& uri,
 	}
 
 	n = new DSSINode(plugin, name, poly, parent, descriptor,
-		om->audio_driver()->sample_rate(), om->audio_driver()->buffer_size());
+		Ingen::instance().audio_driver()->sample_rate(), Ingen::instance().audio_driver()->buffer_size());
 	bool success = ((DSSINode*)n)->instantiate();
 	if (!success) {
 		delete n;
@@ -686,7 +677,7 @@ NodeFactory::load_ladspa_plugin(const string& uri,
 	}
 
 	n = new LADSPANode(plugin, name, poly, parent, descriptor,
-		om->audio_driver()->sample_rate(), om->audio_driver()->buffer_size());
+		Ingen::instance().audio_driver()->sample_rate(), Ingen::instance().audio_driver()->buffer_size());
 	bool success = ((LADSPANode*)n)->instantiate();
 	if (!success) {
 		delete n;