diff options
author | David Robillard <d@drobilla.net> | 2012-05-14 05:11:04 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2012-05-14 05:11:04 +0000 |
commit | bf7116520bc723980edb1120eaa66455a4c66ca5 (patch) | |
tree | db8320d389e5ecdecbf7df8efbb3962f5a851648 /src/server/events | |
parent | 1952ad39639b620a8ce43b0b0edf5c1283e5e8c5 (diff) | |
download | ingen-bf7116520bc723980edb1120eaa66455a4c66ca5.tar.gz ingen-bf7116520bc723980edb1120eaa66455a4c66ca5.tar.bz2 ingen-bf7116520bc723980edb1120eaa66455a4c66ca5.zip |
Tidy.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4410 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/server/events')
-rw-r--r-- | src/server/events/Connect.cpp | 17 | ||||
-rw-r--r-- | src/server/events/Connect.hpp | 4 | ||||
-rw-r--r-- | src/server/events/CreateNode.cpp | 4 | ||||
-rw-r--r-- | src/server/events/CreatePatch.cpp | 2 | ||||
-rw-r--r-- | src/server/events/CreatePort.cpp | 9 | ||||
-rw-r--r-- | src/server/events/Delete.hpp | 4 | ||||
-rw-r--r-- | src/server/events/Disconnect.hpp | 4 | ||||
-rw-r--r-- | src/server/events/Move.cpp | 2 | ||||
-rw-r--r-- | src/server/events/SetPortValue.cpp | 2 |
9 files changed, 24 insertions, 24 deletions
diff --git a/src/server/events/Connect.cpp b/src/server/events/Connect.cpp index edea8f15..8fec67f6 100644 --- a/src/server/events/Connect.cpp +++ b/src/server/events/Connect.cpp @@ -85,8 +85,8 @@ Connect::pre_process() } if (src_node->parent() != dst_node->parent() - && src_node != dst_node->parent() - && src_node->parent() != dst_node) { + && src_node != dst_node->parent() + && src_node->parent() != dst_node) { _status = PARENT_DIFFERS; Event::pre_process(); return; @@ -98,20 +98,19 @@ Connect::pre_process() return; } - // Edge to a patch port from inside the patch if (src_node->parent_patch() != dst_node->parent_patch()) { + // Edge to a patch port from inside the patch assert(src_node->parent() == dst_node || dst_node->parent() == src_node); - if (src_node->parent() == dst_node) + if (src_node->parent() == dst_node) { _patch = dynamic_cast<PatchImpl*>(dst_node); - else + } else { _patch = dynamic_cast<PatchImpl*>(src_node); - - // Edge from a patch input to a patch output (pass through) + } } else if (src_node == dst_node && dynamic_cast<PatchImpl*>(src_node)) { + // Edge from a patch input to a patch output (pass through) _patch = dynamic_cast<PatchImpl*>(src_node); - - // Normal edge between nodes with the same parent } else { + // Normal edge between nodes with the same parent _patch = src_node->parent_patch(); } diff --git a/src/server/events/Connect.hpp b/src/server/events/Connect.hpp index 9d807503..f5939386 100644 --- a/src/server/events/Connect.hpp +++ b/src/server/events/Connect.hpp @@ -24,8 +24,8 @@ #include "types.hpp" namespace Raul { - template <typename T> class ListNode; - template <typename T> class Array; +template <typename T> class ListNode; +template <typename T> class Array; } namespace Ingen { diff --git a/src/server/events/CreateNode.cpp b/src/server/events/CreateNode.cpp index 414003d8..b2a6a995 100644 --- a/src/server/events/CreateNode.cpp +++ b/src/server/events/CreateNode.cpp @@ -54,9 +54,9 @@ CreateNode::CreateNode(Engine& engine, , _properties(properties) { const Resource::Properties::const_iterator p = properties.find( - engine.world()->uris().ingen_polyphonic); + engine.world()->uris().ingen_polyphonic); if (p != properties.end() && p->second.type() == engine.world()->forge().Bool - && p->second.get_bool()) + && p->second.get_bool()) _polyphonic = true; } diff --git a/src/server/events/CreatePatch.cpp b/src/server/events/CreatePatch.cpp index 465dbe86..68359a5b 100644 --- a/src/server/events/CreatePatch.cpp +++ b/src/server/events/CreatePatch.cpp @@ -79,7 +79,7 @@ CreatePatch::pre_process() const Ingen::Shared::URIs& uris = _engine.world()->uris(); _patch = new PatchImpl(_engine, path.symbol(), poly, _parent, - _engine.driver()->sample_rate(), _poly); + _engine.driver()->sample_rate(), _poly); _patch->properties().insert(_properties.begin(), _properties.end()); _patch->add_property(uris.rdf_type, uris.ingen_Patch); _patch->add_property(uris.rdf_type, diff --git a/src/server/events/CreatePort.cpp b/src/server/events/CreatePort.cpp index 1cb172d2..c4ba0a3b 100644 --- a/src/server/events/CreatePort.cpp +++ b/src/server/events/CreatePort.cpp @@ -114,15 +114,16 @@ CreatePort::pre_process() std::make_pair(uris.lv2_index, _engine.world()->forge().make(int32_t(old_num_ports)))); } else if (index_i->second.type() != uris.forge.Int - || index_i->second.get_int32() != static_cast<int32_t>(old_num_ports)) { + || index_i->second.get_int32() != static_cast<int32_t>(old_num_ports)) { Event::pre_process(); _status = BAD_INDEX; return; } Resource::Properties::const_iterator poly_i = _properties.find(uris.ingen_polyphonic); - bool polyphonic = (poly_i != _properties.end() && poly_i->second.type() == uris.forge.Bool - && poly_i->second.get_bool()); + bool polyphonic = (poly_i != _properties.end() && + poly_i->second.type() == uris.forge.Bool && + poly_i->second.get_bool()); _patch_port = _patch->create_port(*_engine.buffer_factory(), _path.symbol(), _port_type, _buffer_type, buffer_size, @@ -149,7 +150,7 @@ CreatePort::pre_process() if (!_patch->parent()) { _engine_port = _engine.driver()->create_port( - dynamic_cast<DuplexPort*>(_patch_port)); + dynamic_cast<DuplexPort*>(_patch_port)); } assert(_ports_array->size() == _patch->num_ports_non_rt()); diff --git a/src/server/events/Delete.hpp b/src/server/events/Delete.hpp index ff4a4e07..2ca24469 100644 --- a/src/server/events/Delete.hpp +++ b/src/server/events/Delete.hpp @@ -23,8 +23,8 @@ #include "ControlBindings.hpp" namespace Raul { - template<typename T> class Array; - template<typename T> class ListNode; +template<typename T> class Array; +template<typename T> class ListNode; } namespace Ingen { diff --git a/src/server/events/Disconnect.hpp b/src/server/events/Disconnect.hpp index 8f955311..fa17e9f4 100644 --- a/src/server/events/Disconnect.hpp +++ b/src/server/events/Disconnect.hpp @@ -24,8 +24,8 @@ #include "BufferFactory.hpp" namespace Raul { - template <typename T> class ListNode; - template <typename T> class Array; +template <typename T> class ListNode; +template <typename T> class Array; } namespace Ingen { diff --git a/src/server/events/Move.cpp b/src/server/events/Move.cpp index 2451c65e..3874fcf1 100644 --- a/src/server/events/Move.cpp +++ b/src/server/events/Move.cpp @@ -73,7 +73,7 @@ Move::pre_process() } SharedPtr< Raul::Table< Raul::Path, SharedPtr<GraphObject> > > removed - = _engine.engine_store()->remove(_store_iterator); + = _engine.engine_store()->remove(_store_iterator); assert(removed->size() > 0); diff --git a/src/server/events/SetPortValue.cpp b/src/server/events/SetPortValue.cpp index 1a12dcd4..df89dc2d 100644 --- a/src/server/events/SetPortValue.cpp +++ b/src/server/events/SetPortValue.cpp @@ -139,7 +139,7 @@ SetPortValue::apply(Context& context) for (uint32_t v = 0; v < _port->poly(); ++v) { ((AudioBuffer*)_port->buffer(v).get())->set_value( - _value.get_float(), start, _time); + _value.get_float(), start, _time); } return; } |