Process order traversal / connection fixes (nasty edge cases where patches are involved)
git-svn-id: http://svn.drobilla.net/lad@82 a436a847-0d15-0410-975c-d299462d15a1
This commit is contained in:
parent
8a8cd140a7
commit
a1f30fe144
|
@ -44,14 +44,12 @@ public:
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Array(size_t size, const Array<T>* contents) : m_size(size), m_top(size+1) {
|
Array(size_t size, const Array<T>& contents) : m_size(size), m_top(size+1) {
|
||||||
m_elems = new T[size];
|
m_elems = new T[size];
|
||||||
if (contents) {
|
if (size <= contents.size())
|
||||||
if (size <= contents->size())
|
memcpy(m_elems, contents.m_elems, size * sizeof(T));
|
||||||
memcpy(m_elems, contents->m_elems, size * sizeof(T));
|
else
|
||||||
else
|
memcpy(m_elems, contents.m_elems, contents.size() * sizeof(T));
|
||||||
memcpy(m_elems, contents->m_elems, contents->size() * sizeof(T));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
~Array() {
|
~Array() {
|
||||||
|
|
|
@ -350,7 +350,7 @@ Patch::build_process_order() const
|
||||||
{
|
{
|
||||||
cerr << "*********** BUILDING PROCESS ORDER FOR " << path() << endl;
|
cerr << "*********** BUILDING PROCESS ORDER FOR " << path() << endl;
|
||||||
|
|
||||||
Array<Node*>* const process_order = new Array<Node*>(_nodes.size());
|
Array<Node*>* const process_order = new Array<Node*>(_nodes.size(), NULL);
|
||||||
|
|
||||||
// FIXME: tweak algorithm so it just ends up like this and save the cost of iteration?
|
// FIXME: tweak algorithm so it just ends up like this and save the cost of iteration?
|
||||||
for (List<Node*>::const_iterator i = _nodes.begin(); i != _nodes.end(); ++i)
|
for (List<Node*>::const_iterator i = _nodes.begin(); i != _nodes.end(); ++i)
|
||||||
|
@ -370,23 +370,24 @@ Patch::build_process_order() const
|
||||||
}*/
|
}*/
|
||||||
//}
|
//}
|
||||||
|
|
||||||
|
|
||||||
// Add any (disjoint) nodes that weren't hit by the traversal
|
|
||||||
/*for (List<Node*>::const_iterator i = _nodes.begin(); i != _nodes.end(); ++i) {
|
|
||||||
node = (*i);
|
|
||||||
if ( ! node->traversed()) {
|
|
||||||
process_order->push_back(*i);
|
|
||||||
node->traversed(true);
|
|
||||||
}
|
|
||||||
}*/
|
|
||||||
|
|
||||||
for (List<Node*>::const_iterator i = _nodes.begin(); i != _nodes.end(); ++i) {
|
for (List<Node*>::const_iterator i = _nodes.begin(); i != _nodes.end(); ++i) {
|
||||||
Node* const node = (*i);
|
Node* const node = (*i);
|
||||||
// Either a sink or connected to our output ports:
|
// Either a sink or connected to our output ports:
|
||||||
if ( (!node->traversed()) && node->dependants()->size() == 0)
|
if ( ( ! node->traversed()) && node->dependants()->size() == 0)
|
||||||
build_process_order_recursive(node, process_order);
|
build_process_order_recursive(node, process_order);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Add any (disjoint) nodes that weren't hit by the traversal
|
||||||
|
// FIXME: this shouldn't be necessary
|
||||||
|
/*for (List<Node*>::const_iterator i = _nodes.begin(); i != _nodes.end(); ++i) {
|
||||||
|
Node* const node = (*i);
|
||||||
|
if ( ! node->traversed()) {
|
||||||
|
process_order->push_back(*i);
|
||||||
|
node->traversed(true);
|
||||||
|
cerr << "********** APPENDED DISJOINT NODE " << node->path() << endl;
|
||||||
|
}
|
||||||
|
}*/
|
||||||
|
|
||||||
cerr << "----------------------------------------\n";
|
cerr << "----------------------------------------\n";
|
||||||
for (size_t i=0; i < process_order->size(); ++i) {
|
for (size_t i=0; i < process_order->size(); ++i) {
|
||||||
assert(process_order->at(i));
|
assert(process_order->at(i));
|
||||||
|
|
|
@ -80,7 +80,12 @@ AddPortEvent::pre_process()
|
||||||
_patch->add_output(new ListNode<Port*>(_patch_port));
|
_patch->add_output(new ListNode<Port*>(_patch_port));
|
||||||
else
|
else
|
||||||
_patch->add_input(new ListNode<Port*>(_patch_port));
|
_patch->add_input(new ListNode<Port*>(_patch_port));
|
||||||
_ports_array = new Array<Port*>(_patch->num_ports() + 1, _patch->external_ports());
|
|
||||||
|
if (_patch->external_ports())
|
||||||
|
_ports_array = new Array<Port*>(_patch->num_ports() + 1, *_patch->external_ports());
|
||||||
|
else
|
||||||
|
_ports_array = new Array<Port*>(_patch->num_ports() + 1, NULL);
|
||||||
|
|
||||||
_ports_array->at(_patch->num_ports()) = _patch_port;
|
_ports_array->at(_patch->num_ports()) = _patch_port;
|
||||||
om->object_store()->add(_patch_port);
|
om->object_store()->add(_patch_port);
|
||||||
|
|
||||||
|
|
|
@ -215,8 +215,8 @@ TypedConnectionEvent<T>::pre_process()
|
||||||
m_patch_listnode = new ListNode<Connection*>(m_connection);
|
m_patch_listnode = new ListNode<Connection*>(m_connection);
|
||||||
|
|
||||||
// Need to be careful about patch port connections here and adding a node's
|
// Need to be careful about patch port connections here and adding a node's
|
||||||
// parent as a dependant/provider...
|
// parent as a dependant/provider, or adding a patch as it's own provider...
|
||||||
if (src_node->parent() == dst_node->parent()) {
|
if (src_node != dst_node && src_node->parent() == dst_node->parent()) {
|
||||||
dst_node->providers()->push_back(new ListNode<Node*>(src_node));
|
dst_node->providers()->push_back(new ListNode<Node*>(src_node));
|
||||||
src_node->dependants()->push_back(new ListNode<Node*>(dst_node));
|
src_node->dependants()->push_back(new ListNode<Node*>(dst_node));
|
||||||
}
|
}
|
||||||
|
|
|
@ -135,7 +135,6 @@ SliderControlGroup::set_value(const float val)
|
||||||
m_slider.set_value(val);
|
m_slider.set_value(val);
|
||||||
m_value_spinner.set_value(val);
|
m_value_spinner.set_value(val);
|
||||||
}
|
}
|
||||||
m_port_model->value(val);
|
|
||||||
m_enable_signal = true;
|
m_enable_signal = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue