Ditched ghetto homebrew RTTI in favour of the real deal;

removed BridgeNode crap


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

5 files changed, 12 insertions, 15 deletions

diff --git a/src/libs/engine/events/CreatePatchEvent.cpp b/src/libs/engine/events/CreatePatchEvent.cpp
index 9f0ae7f2..2d8cce99 100644
--- a/src/libs/engine/events/CreatePatchEvent.cpp
+++ b/src/libs/engine/events/CreatePatchEvent.cpp
@@ -74,7 +74,7 @@ CreatePatchEvent::pre_process()
 	m_patch = new Patch(m_path.name(), poly, m_parent, om->audio_driver()->sample_rate(), om->audio_driver()->buffer_size(), m_poly);
 		
 	if (m_parent != NULL) {
-		m_parent->add_node(new ListNode<Node*>(m_patch->as_node()));
+		m_parent->add_node(new ListNode<Node*>(m_patch));
 
 		if (m_parent->process())
 			m_process_order = m_parent->build_process_order();
diff --git a/src/libs/engine/events/DestroyEvent.cpp b/src/libs/engine/events/DestroyEvent.cpp
index 85ec0011..f851c9b5 100644
--- a/src/libs/engine/events/DestroyEvent.cpp
+++ b/src/libs/engine/events/DestroyEvent.cpp
@@ -71,12 +71,8 @@ DestroyEvent::~DestroyEvent()
 void
 DestroyEvent::pre_process()
 {
-	if (m_node == NULL) {
-		OmObject* const obj = om->object_store()->find_node(m_path);
-	
-		if (obj != NULL && obj->as_node() != NULL)
-			m_node = obj->as_node();
-	}
+	if (m_node == NULL)
+		m_node = om->object_store()->find_node(m_path);
 
 	if (m_node != NULL && m_path != "/") {
 		assert(m_node->parent_patch() != NULL);
@@ -92,11 +88,12 @@ DestroyEvent::pre_process()
 			}
 			
 			// Create a recursive disconnect event for the parent port, if a bridge node
-			Port* parent_port = m_patch_listnode->elem()->as_port();
+			cerr << "FIXME: Destroy bridge\n";
+			/*Port* parent_port = m_patch_listnode->elem()->as_port();
 			if (parent_port != NULL) {  // Bridge node
 				m_parent_disconnect_event = new DisconnectPortEvent(parent_port);
 				m_parent_disconnect_event->pre_process();
-			}
+			}*/
 				
 			if (m_node->parent_patch()->process()) {
 				m_process_order = m_node->parent_patch()->build_process_order();
diff --git a/src/libs/engine/events/RenameEvent.cpp b/src/libs/engine/events/RenameEvent.cpp
index e2e98dd0..f1b74c59 100644
--- a/src/libs/engine/events/RenameEvent.cpp
+++ b/src/libs/engine/events/RenameEvent.cpp
@@ -74,11 +74,11 @@ RenameEvent::pre_process()
 	}
 	
 	// Renaming only works for Nodes and Patches (which are Nodes)
-	if (obj->as_node() == NULL) {
+	/*if (obj->as_node() == NULL) {
 		m_error = OBJECT_NOT_RENAMABLE;
 		QueuedEvent::pre_process();
 		return;
-	}
+	}*/
 	
 	if (obj != NULL) {
 		obj->set_path(m_new_path);
diff --git a/src/libs/engine/events/SetPortValueEvent.cpp b/src/libs/engine/events/SetPortValueEvent.cpp
index 6ca227e0..046e935f 100644
--- a/src/libs/engine/events/SetPortValueEvent.cpp
+++ b/src/libs/engine/events/SetPortValueEvent.cpp
@@ -80,11 +80,11 @@ SetPortValueEvent::post_process()
 		om->client_broadcaster()->send_control_change(m_port_path, m_val);
 		
 		// Send patch port control change, if this is a bridge port
-		Port* parent_port = m_port->parent_node()->as_port();
+		/*Port* parent_port = m_port->parent_node()->as_port();
 		if (parent_port != NULL) {
 			assert(parent_port->type() == DataType::FLOAT);
 			om->client_broadcaster()->send_control_change(parent_port->path(), m_val);
-		}
+		}*/
 
 	} else if (m_error == PORT_NOT_FOUND) {
 		string msg = "Unable to find port ";
diff --git a/src/libs/engine/events/SetPortValueQueuedEvent.cpp b/src/libs/engine/events/SetPortValueQueuedEvent.cpp
index b935beb9..c7750064 100644
--- a/src/libs/engine/events/SetPortValueQueuedEvent.cpp
+++ b/src/libs/engine/events/SetPortValueQueuedEvent.cpp
@@ -92,11 +92,11 @@ SetPortValueQueuedEvent::post_process()
 		om->client_broadcaster()->send_control_change(m_port_path, m_val);
 		
 		// Send patch port control change, if this is a bridge port
-		Port* parent_port = m_port->parent_node()->as_port();
+		/*Port* parent_port = m_port->parent_node()->as_port();
 		if (parent_port != NULL) {
 			assert(parent_port->type() == DataType::FLOAT);
 			om->client_broadcaster()->send_control_change(parent_port->path(), m_val);
-		}
+		}*/
 
 	} else if (m_error == PORT_NOT_FOUND) {
 		string msg = "Unable to find port ";