1 files changed, 20 insertions, 20 deletions

diff --git a/src/server/internals/BlockDelay.cpp b/src/server/internals/BlockDelay.cpp
index 0176c9b1..acc68851 100644
--- a/src/server/internals/BlockDelay.cpp
+++ b/src/server/internals/BlockDelay.cpp
@@ -14,33 +14,35 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "internals/BlockDelay.hpp"
+#include "BlockDelay.hpp"
 
+#include "BlockImpl.hpp"
 #include "Buffer.hpp"
+#include "BufferFactory.hpp"
 #include "InputPort.hpp"
 #include "InternalPlugin.hpp"
 #include "OutputPort.hpp"
+#include "PortType.hpp"
 
-#include "ingen/Forge.hpp"
-#include "ingen/URIs.hpp"
-#include "raul/Array.hpp"
-#include "raul/Maid.hpp"
+#include <ingen/Forge.hpp>
+#include <ingen/URI.hpp>
+#include <ingen/URIs.hpp>
+#include <raul/Array.hpp>
+#include <raul/Maid.hpp>
+#include <raul/Symbol.hpp>
 
-namespace ingen {
-namespace server {
+#include <memory>
 
-class RunContext;
-
-namespace internals {
+namespace ingen::server::internals {
 
 InternalPlugin* BlockDelayNode::internal_plugin(URIs& uris) {
 	return new InternalPlugin(
-		uris, URI(NS_INTERNALS "BlockDelay"), Raul::Symbol("blockDelay"));
+		uris, URI(NS_INTERNALS "BlockDelay"), raul::Symbol("blockDelay"));
 }
 
 BlockDelayNode::BlockDelayNode(InternalPlugin*     plugin,
                                BufferFactory&      bufs,
-                               const Raul::Symbol& symbol,
+                               const raul::Symbol& symbol,
                                bool                polyphonic,
                                GraphImpl*          parent,
                                SampleRate          srate)
@@ -49,12 +51,12 @@ BlockDelayNode::BlockDelayNode(InternalPlugin*     plugin,
 	const ingen::URIs& uris = bufs.uris();
 	_ports = bufs.maid().make_managed<Ports>(2);
 
-	_in_port = new InputPort(bufs, this, Raul::Symbol("in"), 0, 1,
+	_in_port = new InputPort(bufs, this, raul::Symbol("in"), 0, 1,
 	                         PortType::AUDIO, 0, bufs.forge().make(0.0f));
 	_in_port->set_property(uris.lv2_name, bufs.forge().alloc("In"));
 	_ports->at(0) = _in_port;
 
-	_out_port = new OutputPort(bufs, this, Raul::Symbol("out"), 0, 1,
+	_out_port = new OutputPort(bufs, this, raul::Symbol("out"), 0, 1,
 	                           PortType::AUDIO, 0, bufs.forge().make(0.0f));
 	_out_port->set_property(uris.lv2_name, bufs.forge().alloc("Out"));
 	_ports->at(1) = _out_port;
@@ -75,15 +77,13 @@ BlockDelayNode::activate(BufferFactory& bufs)
 }
 
 void
-BlockDelayNode::run(RunContext& context)
+BlockDelayNode::run(RunContext& ctx)
 {
 	// Copy buffer from last cycle to output
-	_out_port->buffer(0)->copy(context, _buffer.get());
+	_out_port->buffer(0)->copy(ctx, _buffer.get());
 
 	// Copy input from this cycle to buffer
-	_buffer->copy(context, _in_port->buffer(0).get());
+	_buffer->copy(ctx, _in_port->buffer(0).get());
 }
 
-} // namespace internals
-} // namespace server
-} // namespace ingen
+} // namespace ingen::server::internals