Bulk reformat.

git-svn-id: http://svn.drobilla.net/lad/trunk/machina@4929 a436a847-0d15-0410-975c-d299462d15a1

1 files changed, 29 insertions, 19 deletions

diff --git a/src/engine/Controller.cpp b/src/engine/Controller.cpp
index 7533a77..f209018 100644
--- a/src/engine/Controller.cpp
+++ b/src/engine/Controller.cpp
@@ -27,7 +27,8 @@
 
 namespace Machina {
 
-Controller::Controller(SharedPtr<Engine> engine, Client::ClientModel& client_model)
+Controller::Controller(SharedPtr<Engine>    engine,
+                       Client::ClientModel& client_model)
 	: _engine(engine)
 	, _client_model(client_model)
 	, _updates(new UpdateBuffer(4096))
@@ -39,9 +40,10 @@ uint64_t
 Controller::create(const Client::ClientObject& properties)
 {
 	TimeDuration dur(_engine->machine()->time().unit(),
-		properties.get(URIs::instance().machina_duration).get_float());
+	                 properties.get(URIs::instance().machina_duration).get_float());
 	SharedPtr<Machina::Node>        node(new Machina::Node(dur));
-	SharedPtr<Client::ClientObject> obj(new Client::ClientObject(properties, node->id()));
+	SharedPtr<Client::ClientObject> obj(
+		new Client::ClientObject(properties, node->id()));
 	_objects.insert(node);
 	_client_model.new_object(obj);
 	_engine->machine()->add_node(node);
@@ -55,16 +57,17 @@ Controller::announce(SharedPtr<Machine> machine)
 
 	for (Machina::Machine::Nodes::const_iterator n = machine->nodes().begin();
 	     n != machine->nodes().end(); ++n) {
-		   SharedPtr<Machina::Client::ClientObject> obj(new Machina::Client::ClientObject((*n)->id()));
-		   obj->set(URIs::instance().rdf_type,
-		            forge.make_urid(URIs::instance().machina_Node));
-		   obj->set(URIs::instance().machina_duration,
-		            forge.make(float((*n)->duration().to_double())));
-		   obj->set(URIs::instance().machina_canvas_x, forge.make(0.0f));
-		   obj->set(URIs::instance().machina_canvas_y, forge.make(0.0f));
-
-		   _objects.insert(*n);
-		   _client_model.new_object(obj);
+		SharedPtr<Machina::Client::ClientObject> obj(
+			new Machina::Client::ClientObject((*n)->id()));
+		obj->set(URIs::instance().rdf_type,
+		         forge.make_urid(URIs::instance().machina_Node));
+		obj->set(URIs::instance().machina_duration,
+		         forge.make(float((*n)->duration().to_double())));
+		obj->set(URIs::instance().machina_canvas_x, forge.make(0.0f));
+		obj->set(URIs::instance().machina_canvas_y, forge.make(0.0f));
+
+		_objects.insert(*n);
+		_client_model.new_object(obj);
 	}
 
 	for (Machina::Machine::Nodes::const_iterator n = machine->nodes().begin();
@@ -72,7 +75,8 @@ Controller::announce(SharedPtr<Machine> machine)
 		for (Machina::Node::Edges::const_iterator e = (*n)->edges().begin();
 		     e != (*n)->edges().end(); ++e) {
 			_objects.insert(*e);
-			SharedPtr<Client::ClientObject> eobj(new Client::ClientObject((*e)->id()));
+			SharedPtr<Client::ClientObject> eobj(
+				new Client::ClientObject((*e)->id()));
 			eobj->set(URIs::instance().rdf_type,
 			          forge.make_urid(URIs::instance().rdf_type));
 			eobj->set(URIs::instance().machina_probability,
@@ -105,12 +109,15 @@ Controller::learn(SharedPtr<Raul::Maid> maid, uint64_t node_id)
 	if (node) {
 		_engine->machine()->learn(maid, node);
 	} else {
-		std::cerr << "Failed to find node " << node_id << " for learn" << std::endl;
+		std::cerr << "Failed to find node " << node_id << " for learn"
+		          << std::endl;
 	}
 }
 
 void
-Controller::set_property(uint64_t object_id, URIInt key, const Raul::Atom& value)
+Controller::set_property(uint64_t          object_id,
+                         URIInt            key,
+                         const Raul::Atom& value)
 {
 	SharedPtr<Stateful> object = find(object_id);
 	if (object) {
@@ -131,7 +138,8 @@ Controller::connect(uint64_t tail_id, uint64_t head_id)
 
 	Raul::Forge& forge = _engine->forge();
 
-	SharedPtr<Client::ClientObject> obj(new Client::ClientObject(/**this,*/ edge->id()));
+	SharedPtr<Client::ClientObject> obj(
+		new Client::ClientObject(edge->id()));
 	obj->set(URIs::instance().rdf_type,
 	         forge.make_urid(URIs::instance().machina_Edge));
 	obj->set(URIs::instance().machina_probability, forge.make(1.0f));
@@ -185,11 +193,13 @@ Controller::process_updates()
 	Raul::Atom value;
 	for (uint32_t i = 0; i < read_space; ) {
 		i += read_set(_updates, &subject, &key, &value);
-		SharedPtr<Machina::Client::ClientObject> obj = _client_model.find(subject);
+		SharedPtr<Machina::Client::ClientObject> obj = _client_model.find(
+			subject);
 		if (obj) {
 			obj->set(key, value);
 		} else {
-			SharedPtr<Client::ClientObject> obj(new Client::ClientObject(subject));
+			SharedPtr<Client::ClientObject> obj(
+				new Client::ClientObject(subject));
 			obj->set(key, value);
 			_client_model.new_object(obj);
 		}