Remove header namespace pollution (particularly from libs/gui/App.hpp).

Fix more LV2 plugin RDF race/lock issues with -eg.
Show human readable names on new ports when human readable is set (fix ticket #202).


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

1 files changed, 6 insertions, 17 deletions

diff --git a/src/libs/engine/InternalPlugin.cpp b/src/libs/engine/InternalPlugin.cpp
index 9141b545..1c6a92a5 100644
--- a/src/libs/engine/InternalPlugin.cpp
+++ b/src/libs/engine/InternalPlugin.cpp
@@ -21,33 +21,22 @@
 #include "MidiTriggerNode.hpp"
 #include "MidiControlNode.hpp"
 #include "TransportNode.hpp"
+#include "Engine.hpp"
+#include "AudioDriver.hpp"
 
 namespace Ingen {
 
 
-#if 0
-InternalPlugin::InternalPlugin(const InternalPlugin* const copy)
-{
-	_type = copy->_type;
-	_uri = copy->_uri;
-	_lib_path = copy->_lib_path;
-	_lib_name = copy->_lib_name;
-	_plug_label = copy->_plug_label;
-	_name = copy->_name;
-	_id = _id;
-	_module = copy->_module;
-}
-#endif
-
-
 NodeImpl*
 InternalPlugin::instantiate(const string&     name,
                             bool              polyphonic,
                             Ingen::PatchImpl* parent,
-                            SampleRate        srate,
-                            size_t            buffer_size)
+                            Engine&           engine)
 {
 	assert(_type == Internal);
+	
+	SampleCount srate       = engine.audio_driver()->sample_rate();
+	SampleCount buffer_size = engine.audio_driver()->buffer_size();
 
 	if (_uri == NS_INGEN "note_node") {
 		return new MidiNoteNode(name, polyphonic, parent, srate, buffer_size);