summaryrefslogtreecommitdiffstats
path: root/src/server
diff options
context:
space:
mode:
Diffstat (limited to 'src/server')
-rw-r--r--src/server/LV2Info.hpp3
-rw-r--r--src/server/NodeFactory.cpp2
-rw-r--r--src/server/events/Delete.cpp9
-rw-r--r--src/server/events/SetPortValue.cpp15
-rw-r--r--src/server/events/SetPortValue.hpp8
5 files changed, 1 insertions, 36 deletions
diff --git a/src/server/LV2Info.hpp b/src/server/LV2Info.hpp
index 03ff37e4..2c31b243 100644
--- a/src/server/LV2Info.hpp
+++ b/src/server/LV2Info.hpp
@@ -17,9 +17,6 @@
#ifndef INGEN_ENGINE_LV2INFO_HPP
#define INGEN_ENGINE_LV2INFO_HPP
-#include <map>
-#include <string>
-
#include "lilv/lilv.h"
#include "ingen/shared/World.hpp"
diff --git a/src/server/NodeFactory.cpp b/src/server/NodeFactory.cpp
index d6e0ab2c..7bcb4088 100644
--- a/src/server/NodeFactory.cpp
+++ b/src/server/NodeFactory.cpp
@@ -89,7 +89,7 @@ NodeFactory::load_plugins()
// this (expensive!) stuff to happen. Not the best solution - would be nice
// if clients could refresh plugins list for whatever reason :/
if (!_has_loaded) {
- _plugins.clear(); // FIXME: assert empty?
+ _plugins.clear();
load_internal_plugins();
load_lv2_plugins();
_has_loaded = true;
diff --git a/src/server/events/Delete.cpp b/src/server/events/Delete.cpp
index 5e7dd20e..6c322059 100644
--- a/src/server/events/Delete.cpp
+++ b/src/server/events/Delete.cpp
@@ -94,15 +94,7 @@ Delete::pre_process()
_disconnect_event->pre_process();
if (_node->parent_patch()->enabled()) {
- // FIXME: is this called multiple times?
_compiled_patch = _node->parent_patch()->compile();
-#ifndef NDEBUG
- // Be sure node is removed from process order, so it can be deleted
- for (size_t i=0; i < _compiled_patch->size(); ++i) {
- assert(_compiled_patch->at(i).node() != _node.get());
- // FIXME: check providers/dependants too
- }
-#endif
}
}
} else if (_port) {
@@ -115,7 +107,6 @@ Delete::pre_process()
_disconnect_event->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_non_rt());
diff --git a/src/server/events/SetPortValue.cpp b/src/server/events/SetPortValue.cpp
index 9eb57d55..f01f1966 100644
--- a/src/server/events/SetPortValue.cpp
+++ b/src/server/events/SetPortValue.cpp
@@ -35,21 +35,6 @@ namespace Ingen {
namespace Server {
namespace Events {
-SetPortValue::SetPortValue(Engine& engine,
- Interface* client,
- int32_t id,
- bool queued,
- SampleCount timestamp,
- const Raul::Path& port_path,
- const Raul::Atom& value)
- : Event(engine, client, id, timestamp)
- , _queued(queued)
- , _port_path(port_path)
- , _value(value)
- , _port(NULL)
-{
-}
-
/** Internal */
SetPortValue::SetPortValue(Engine& engine,
Interface* client,
diff --git a/src/server/events/SetPortValue.hpp b/src/server/events/SetPortValue.hpp
index 4d97ee99..cdda9d99 100644
--- a/src/server/events/SetPortValue.hpp
+++ b/src/server/events/SetPortValue.hpp
@@ -45,14 +45,6 @@ public:
SetPortValue(Engine& engine,
Interface* client,
int32_t id,
- bool queued,
- SampleCount timestamp,
- const Raul::Path& port_path,
- const Raul::Atom& value);
-
- SetPortValue(Engine& engine,
- Interface* client,
- int32_t id,
SampleCount timestamp,
PortImpl* port,
const Raul::Atom& value);