From 36f1e2ea3d2c7d20d8fa267a3a66438044e99e8e Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Sun, 18 Jun 2006 19:26:53 +0000
Subject: Reworked use of Plugin class in engine slightly (more RAII-ey)

git-svn-id: http://svn.drobilla.net/lad/grauph@56 a436a847-0d15-0410-975c-d299462d15a1
---
 src/libs/engine/events/DSSIConfigureEvent.cpp |  2 +-
 src/libs/engine/events/DSSIConfigureEvent.h   | 10 +++++-----
 src/libs/engine/events/DSSIControlEvent.cpp   |  2 +-
 src/libs/engine/events/DSSIControlEvent.h     | 10 +++++-----
 src/libs/engine/events/DSSIProgramEvent.cpp   |  2 +-
 src/libs/engine/events/DSSIProgramEvent.h     | 10 +++++-----
 src/libs/engine/events/DSSIUpdateEvent.cpp    |  4 ++--
 src/libs/engine/events/DSSIUpdateEvent.h      |  8 ++++----
 8 files changed, 24 insertions(+), 24 deletions(-)

(limited to 'src/libs/engine/events')

diff --git a/src/libs/engine/events/DSSIConfigureEvent.cpp b/src/libs/engine/events/DSSIConfigureEvent.cpp
index 2ade4671..c7bfdb61 100644
--- a/src/libs/engine/events/DSSIConfigureEvent.cpp
+++ b/src/libs/engine/events/DSSIConfigureEvent.cpp
@@ -41,7 +41,7 @@ DSSIConfigureEvent::pre_process()
 	Node* node = om->object_store()->find_node(m_node_path);
 
 	if (node != NULL && node->plugin()->type() == Plugin::DSSI) {
-		m_node = (DSSIPlugin*)node;
+		m_node = (DSSINode*)node;
 		m_node->configure(m_key, m_val);
 	}
 
diff --git a/src/libs/engine/events/DSSIConfigureEvent.h b/src/libs/engine/events/DSSIConfigureEvent.h
index 00b4a134..0e77e217 100644
--- a/src/libs/engine/events/DSSIConfigureEvent.h
+++ b/src/libs/engine/events/DSSIConfigureEvent.h
@@ -18,7 +18,7 @@
 #define DSSICONFIGUREEVENT_H
 
 #include "QueuedEvent.h"
-#include "DSSIPlugin.h"
+#include "DSSINode.h"
 
 namespace Om {
 
@@ -37,10 +37,10 @@ public:
 	void post_process();
 
 private:
-	string      m_node_path;
-	string      m_key;
-	string      m_val;
-	DSSIPlugin* m_node;
+	string    m_node_path;
+	string    m_key;
+	string    m_val;
+	DSSINode* m_node;
 };
 
 
diff --git a/src/libs/engine/events/DSSIControlEvent.cpp b/src/libs/engine/events/DSSIControlEvent.cpp
index ea3e70ac..986fa33c 100644
--- a/src/libs/engine/events/DSSIControlEvent.cpp
+++ b/src/libs/engine/events/DSSIControlEvent.cpp
@@ -42,7 +42,7 @@ DSSIControlEvent::pre_process()
 	if (node->plugin()->type() != Plugin::DSSI)
 		m_node = NULL;
 	else
-		m_node = (DSSIPlugin*)node;
+		m_node = (DSSINode*)node;
 
 	QueuedEvent::pre_process();
 }
diff --git a/src/libs/engine/events/DSSIControlEvent.h b/src/libs/engine/events/DSSIControlEvent.h
index 30a5279e..33d9ec5e 100644
--- a/src/libs/engine/events/DSSIControlEvent.h
+++ b/src/libs/engine/events/DSSIControlEvent.h
@@ -18,7 +18,7 @@
 #define DSSICONTROLEVENT_H
 
 #include "QueuedEvent.h"
-#include "DSSIPlugin.h"
+#include "DSSINode.h"
 
 namespace Om {
 	
@@ -39,10 +39,10 @@ public:
 	void post_process();
 
 private:
-	string      m_node_path;
-	int         m_port_num;
-	float       m_val;
-	DSSIPlugin* m_node;
+	string    m_node_path;
+	int       m_port_num;
+	float     m_val;
+	DSSINode* m_node;
 };
 
 
diff --git a/src/libs/engine/events/DSSIProgramEvent.cpp b/src/libs/engine/events/DSSIProgramEvent.cpp
index eb68ef77..970daef6 100644
--- a/src/libs/engine/events/DSSIProgramEvent.cpp
+++ b/src/libs/engine/events/DSSIProgramEvent.cpp
@@ -45,7 +45,7 @@ DSSIProgramEvent::pre_process()
 	Node* node = om->object_store()->find_node(m_node_path);
 
 	if (node != NULL && node->plugin()->type() == Plugin::DSSI)
-		m_node = (DSSIPlugin*)node;
+		m_node = (DSSINode*)node;
 
 	QueuedEvent::pre_process();
 }
diff --git a/src/libs/engine/events/DSSIProgramEvent.h b/src/libs/engine/events/DSSIProgramEvent.h
index 152f3cb1..27f70e41 100644
--- a/src/libs/engine/events/DSSIProgramEvent.h
+++ b/src/libs/engine/events/DSSIProgramEvent.h
@@ -18,7 +18,7 @@
 #define DSSIPROGRAMEVENT_H
 
 #include "QueuedEvent.h"
-#include "DSSIPlugin.h"
+#include "DSSINode.h"
 
 namespace Om {	
 
@@ -37,10 +37,10 @@ public:
 	void post_process();
 
 private:
-	string      m_node_path;
-	int         m_bank;
-	int         m_program;
-	DSSIPlugin* m_node;
+	string    m_node_path;
+	int       m_bank;
+	int       m_program;
+	DSSINode* m_node;
 };
 
 
diff --git a/src/libs/engine/events/DSSIUpdateEvent.cpp b/src/libs/engine/events/DSSIUpdateEvent.cpp
index 5650dd63..fb441e67 100644
--- a/src/libs/engine/events/DSSIUpdateEvent.cpp
+++ b/src/libs/engine/events/DSSIUpdateEvent.cpp
@@ -20,7 +20,7 @@
 #include "ObjectStore.h"
 #include "Om.h"
 #include "OmApp.h"
-#include "DSSIPlugin.h"
+#include "DSSINode.h"
 #include "Plugin.h"
 
 using std::cerr; using std::endl;
@@ -47,7 +47,7 @@ DSSIUpdateEvent::pre_process()
 		QueuedEvent::pre_process();
 		return;
 	} else {
-		m_node = (DSSIPlugin*)node;
+		m_node = (DSSINode*)node;
 	}
 	
 	QueuedEvent::pre_process();
diff --git a/src/libs/engine/events/DSSIUpdateEvent.h b/src/libs/engine/events/DSSIUpdateEvent.h
index cdd8851e..3cee300f 100644
--- a/src/libs/engine/events/DSSIUpdateEvent.h
+++ b/src/libs/engine/events/DSSIUpdateEvent.h
@@ -24,7 +24,7 @@ using std::string;
 
 namespace Om {
 	
-class DSSIPlugin;
+class DSSINode;
 
 
 /** A DSSI "update" responder for a DSSI plugin/node.
@@ -43,9 +43,9 @@ public:
 	void post_process();
 
 private:
-	string       m_path;
-	string       m_url;
-	DSSIPlugin*  m_node;
+	string     m_path;
+	string     m_url;
+	DSSINode*  m_node;
 };
 
 
-- 
cgit v1.2.1