summaryrefslogtreecommitdiffstats
path: root/src/server/events
diff options
context:
space:
mode:
Diffstat (limited to 'src/server/events')
-rw-r--r--src/server/events/Connect.cpp2
-rw-r--r--src/server/events/CreateNode.cpp2
-rw-r--r--src/server/events/CreatePatch.cpp10
-rw-r--r--src/server/events/CreatePort.cpp4
-rw-r--r--src/server/events/Delete.cpp6
-rw-r--r--src/server/events/Disconnect.cpp2
-rw-r--r--src/server/events/DisconnectAll.cpp2
-rw-r--r--src/server/events/Get.cpp2
-rw-r--r--src/server/events/Move.cpp2
-rw-r--r--src/server/events/SetMetadata.cpp2
-rw-r--r--src/server/events/SetPortValue.cpp2
11 files changed, 18 insertions, 18 deletions
diff --git a/src/server/events/Connect.cpp b/src/server/events/Connect.cpp
index e2d6cae7..edea8f15 100644
--- a/src/server/events/Connect.cpp
+++ b/src/server/events/Connect.cpp
@@ -22,7 +22,7 @@
#include "raul/Maid.hpp"
#include "raul/Path.hpp"
-#include "ClientBroadcaster.hpp"
+#include "Broadcaster.hpp"
#include "Connect.hpp"
#include "EdgeImpl.hpp"
#include "DuplexPort.hpp"
diff --git a/src/server/events/CreateNode.cpp b/src/server/events/CreateNode.cpp
index a90979ff..414003d8 100644
--- a/src/server/events/CreateNode.cpp
+++ b/src/server/events/CreateNode.cpp
@@ -20,7 +20,7 @@
#include "raul/log.hpp"
#include "sord/sordmm.hpp"
-#include "ClientBroadcaster.hpp"
+#include "Broadcaster.hpp"
#include "CreateNode.hpp"
#include "Driver.hpp"
#include "Engine.hpp"
diff --git a/src/server/events/CreatePatch.cpp b/src/server/events/CreatePatch.cpp
index 22c4a817..465dbe86 100644
--- a/src/server/events/CreatePatch.cpp
+++ b/src/server/events/CreatePatch.cpp
@@ -19,13 +19,13 @@
#include "raul/Path.hpp"
#include "events/CreatePatch.hpp"
-#include "PatchImpl.hpp"
-#include "NodeImpl.hpp"
-#include "PluginImpl.hpp"
-#include "Engine.hpp"
-#include "ClientBroadcaster.hpp"
+#include "Broadcaster.hpp"
#include "Driver.hpp"
+#include "Engine.hpp"
#include "EngineStore.hpp"
+#include "NodeImpl.hpp"
+#include "PatchImpl.hpp"
+#include "PluginImpl.hpp"
namespace Ingen {
namespace Server {
diff --git a/src/server/events/CreatePort.cpp b/src/server/events/CreatePort.cpp
index 0098ae6a..1cb172d2 100644
--- a/src/server/events/CreatePort.cpp
+++ b/src/server/events/CreatePort.cpp
@@ -23,7 +23,7 @@
#include "raul/Maid.hpp"
#include "raul/Path.hpp"
-#include "ClientBroadcaster.hpp"
+#include "Broadcaster.hpp"
#include "ControlBindings.hpp"
#include "CreatePort.hpp"
#include "Driver.hpp"
@@ -152,7 +152,7 @@ CreatePort::pre_process()
dynamic_cast<DuplexPort*>(_patch_port));
}
- assert(_ports_array->size() == _patch->num_ports());
+ assert(_ports_array->size() == _patch->num_ports_non_rt());
} else {
_status = CREATION_FAILED;
diff --git a/src/server/events/Delete.cpp b/src/server/events/Delete.cpp
index 4df6efb6..95e63d4d 100644
--- a/src/server/events/Delete.cpp
+++ b/src/server/events/Delete.cpp
@@ -17,7 +17,7 @@
#include "raul/Maid.hpp"
#include "raul/Path.hpp"
-#include "ClientBroadcaster.hpp"
+#include "Broadcaster.hpp"
#include "ControlBindings.hpp"
#include "Delete.hpp"
#include "DisconnectAll.hpp"
@@ -118,8 +118,8 @@ Delete::pre_process()
if (_port->parent_patch()->enabled()) {
// FIXME: is this called multiple times?
_compiled_patch = _port->parent_patch()->compile();
- _ports_array = _port->parent_patch()->build_ports_array();
- assert(_ports_array->size() == _port->parent_patch()->num_ports());
+ _ports_array = _port->parent_patch()->build_ports_array();
+ assert(_ports_array->size() == _port->parent_patch()->num_ports_non_rt());
}
}
diff --git a/src/server/events/Disconnect.cpp b/src/server/events/Disconnect.cpp
index 035a6f87..e1a86b13 100644
--- a/src/server/events/Disconnect.cpp
+++ b/src/server/events/Disconnect.cpp
@@ -23,7 +23,7 @@
#include "raul/log.hpp"
#include "AudioBuffer.hpp"
-#include "ClientBroadcaster.hpp"
+#include "Broadcaster.hpp"
#include "EdgeImpl.hpp"
#include "DuplexPort.hpp"
#include "Engine.hpp"
diff --git a/src/server/events/DisconnectAll.cpp b/src/server/events/DisconnectAll.cpp
index 04527212..0a4c2ef1 100644
--- a/src/server/events/DisconnectAll.cpp
+++ b/src/server/events/DisconnectAll.cpp
@@ -23,7 +23,7 @@
#include "raul/Maid.hpp"
#include "raul/Path.hpp"
-#include "ClientBroadcaster.hpp"
+#include "Broadcaster.hpp"
#include "EdgeImpl.hpp"
#include "Engine.hpp"
#include "EngineStore.hpp"
diff --git a/src/server/events/Get.cpp b/src/server/events/Get.cpp
index 503726a3..7e140ae4 100644
--- a/src/server/events/Get.cpp
+++ b/src/server/events/Get.cpp
@@ -16,7 +16,7 @@
#include "ingen/Interface.hpp"
-#include "ClientBroadcaster.hpp"
+#include "Broadcaster.hpp"
#include "Driver.hpp"
#include "Engine.hpp"
#include "EngineStore.hpp"
diff --git a/src/server/events/Move.cpp b/src/server/events/Move.cpp
index ecfe9508..2451c65e 100644
--- a/src/server/events/Move.cpp
+++ b/src/server/events/Move.cpp
@@ -18,7 +18,7 @@
#include "raul/Path.hpp"
-#include "ClientBroadcaster.hpp"
+#include "Broadcaster.hpp"
#include "Driver.hpp"
#include "Engine.hpp"
#include "EnginePort.hpp"
diff --git a/src/server/events/SetMetadata.cpp b/src/server/events/SetMetadata.cpp
index 15ed26cc..fa02f220 100644
--- a/src/server/events/SetMetadata.cpp
+++ b/src/server/events/SetMetadata.cpp
@@ -25,7 +25,7 @@
#include "ingen/shared/URIMap.hpp"
#include "ingen/shared/URIs.hpp"
-#include "ClientBroadcaster.hpp"
+#include "Broadcaster.hpp"
#include "ControlBindings.hpp"
#include "CreateNode.hpp"
#include "CreatePatch.hpp"
diff --git a/src/server/events/SetPortValue.cpp b/src/server/events/SetPortValue.cpp
index 1fb02cc4..1a12dcd4 100644
--- a/src/server/events/SetPortValue.cpp
+++ b/src/server/events/SetPortValue.cpp
@@ -22,7 +22,7 @@
#include "raul/log.hpp"
#include "AudioBuffer.hpp"
-#include "ClientBroadcaster.hpp"
+#include "Broadcaster.hpp"
#include "ControlBindings.hpp"
#include "Driver.hpp"
#include "Engine.hpp"
generated by cgit v1.2.1 (git 2.18.0) at 2024-04-19 19:58:53 +0000