summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-06-11 18:05:56 +0000
committerDavid Robillard <d@drobilla.net>2011-06-11 18:05:56 +0000
commit6201df44e0187cb0606aaf1b9858c099db2a93c6 (patch)
tree15ee10e09967fbc9d85b7503ca306c812ac2bace
parent15611d1f9d7a6aba34b70ccaf63f564d565b55f3 (diff)
downloadingen-6201df44e0187cb0606aaf1b9858c099db2a93c6.tar.gz
ingen-6201df44e0187cb0606aaf1b9858c099db2a93c6.tar.bz2
ingen-6201df44e0187cb0606aaf1b9858c099db2a93c6.zip
Remove dead code.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3385 a436a847-0d15-0410-975c-d299462d15a1
-rw-r--r--src/client/NodeModel.cpp4
-rw-r--r--src/gui/ControlPanel.cpp3
-rw-r--r--src/server/InputPort.hpp2
-rw-r--r--src/server/LV2Node.cpp1
4 files changed, 3 insertions, 7 deletions
diff --git a/src/client/NodeModel.cpp b/src/client/NodeModel.cpp
index ff9a92cd..73ee5a5a 100644
--- a/src/client/NodeModel.cpp
+++ b/src/client/NodeModel.cpp
@@ -140,10 +140,8 @@ NodeModel::add_port(SharedPtr<PortModel> pm)
assert(pm->path().is_child_of(path()));
assert(pm->parent().get() == this);
- Ports::iterator existing = find(_ports.begin(), _ports.end(), pm);
-
// Store should have handled this by merging the two
- assert(existing == _ports.end());
+ assert(find(_ports.begin(), _ports.end(), pm) == _ports.end());
_ports.push_back(pm);
_signal_new_port.emit(pm);
diff --git a/src/gui/ControlPanel.cpp b/src/gui/ControlPanel.cpp
index 7916af9e..4dbb9ba0 100644
--- a/src/gui/ControlPanel.cpp
+++ b/src/gui/ControlPanel.cpp
@@ -128,12 +128,9 @@ ControlPanel::add_port(SharedPtr<const PortModel> pm)
void
ControlPanel::remove_port(const Path& path)
{
- bool was_first = false;
for (vector<Control*>::iterator cg = _controls.begin(); cg != _controls.end(); ++cg) {
if ((*cg)->port_model()->path() == path) {
_control_box->remove(**cg);
- if (cg == _controls.begin())
- was_first = true;
_controls.erase(cg);
break;
}
diff --git a/src/server/InputPort.hpp b/src/server/InputPort.hpp
index 0ecd5317..a5e81b6c 100644
--- a/src/server/InputPort.hpp
+++ b/src/server/InputPort.hpp
@@ -53,7 +53,7 @@ public:
const Raul::Symbol& symbol,
uint32_t index,
uint32_t poly,
- PortType type,
+ PortType type,
const Raul::Atom& value,
size_t buffer_size=0);
diff --git a/src/server/LV2Node.cpp b/src/server/LV2Node.cpp
index c59a20f6..f6a80cb8 100644
--- a/src/server/LV2Node.cpp
+++ b/src/server/LV2Node.cpp
@@ -280,6 +280,7 @@ LV2Node::instantiate(BufferFactory& bufs)
if (val.type() == Atom::NIL)
val = isnan(def_values[j]) ? 0.0f : def_values[j];
+ // TODO: set buffer size when necessary
if (direction == INPUT)
port = new InputPort(bufs, this, port_name, j, _polyphony, data_type, val);
else