aboutsummaryrefslogtreecommitdiffstats
path: root/src/engine/Controller.cpp
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2013-01-13 01:11:58 +0000
committerDavid Robillard <d@drobilla.net>2013-01-13 01:11:58 +0000
commit79acce6ded68062851b9e4ab4966c74e9fc7a714 (patch)
treec98649e6e7f9d7b59e8c2c5de811f6436d0fa522 /src/engine/Controller.cpp
parent8941b58c8737d948f4c925955506da666ceb60ed (diff)
downloadmachina-79acce6ded68062851b9e4ab4966c74e9fc7a714.tar.gz
machina-79acce6ded68062851b9e4ab4966c74e9fc7a714.tar.bz2
machina-79acce6ded68062851b9e4ab4966c74e9fc7a714.zip
Use lowercase namespace names.
git-svn-id: http://svn.drobilla.net/lad/trunk/machina@4945 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/engine/Controller.cpp')
-rw-r--r--src/engine/Controller.cpp44
1 files changed, 22 insertions, 22 deletions
diff --git a/src/engine/Controller.cpp b/src/engine/Controller.cpp
index ffe30e1..6d0cf86 100644
--- a/src/engine/Controller.cpp
+++ b/src/engine/Controller.cpp
@@ -25,10 +25,10 @@
#include "Edge.hpp"
-namespace Machina {
+namespace machina {
Controller::Controller(SPtr<Engine> engine,
- Client::ClientModel& client_model)
+ client::ClientModel& client_model)
: _engine(engine)
, _client_model(client_model)
, _updates(new Raul::RingBuffer(4096))
@@ -37,13 +37,13 @@ Controller::Controller(SPtr<Engine> engine,
}
uint64_t
-Controller::create(const Client::ClientObject& properties)
+Controller::create(const client::ClientObject& properties)
{
TimeDuration dur(_engine->machine()->time().unit(),
properties.get(URIs::instance().machina_duration).get_float());
- SPtr<Machina::Node> node(new Machina::Node(dur));
- SPtr<Client::ClientObject> obj(
- new Client::ClientObject(properties, node->id()));
+ SPtr<machina::Node> node(new machina::Node(dur));
+ SPtr<client::ClientObject> obj(
+ new client::ClientObject(properties, node->id()));
_objects.insert(node);
_client_model.new_object(obj);
_engine->machine()->add_node(node);
@@ -55,10 +55,10 @@ Controller::announce(SPtr<Machine> machine)
{
Raul::Forge& forge = _engine->forge();
- for (Machina::Machine::Nodes::const_iterator n = machine->nodes().begin();
+ for (machina::Machine::Nodes::const_iterator n = machine->nodes().begin();
n != machine->nodes().end(); ++n) {
- SPtr<Machina::Client::ClientObject> obj(
- new Machina::Client::ClientObject((*n)->id()));
+ SPtr<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,
@@ -70,13 +70,13 @@ Controller::announce(SPtr<Machine> machine)
_client_model.new_object(obj);
}
- for (Machina::Machine::Nodes::const_iterator n = machine->nodes().begin();
+ for (machina::Machine::Nodes::const_iterator n = machine->nodes().begin();
n != machine->nodes().end(); ++n) {
- for (Machina::Node::Edges::const_iterator e = (*n)->edges().begin();
+ for (machina::Node::Edges::const_iterator e = (*n)->edges().begin();
e != (*n)->edges().end(); ++e) {
_objects.insert(*e);
- SPtr<Client::ClientObject> eobj(
- new Client::ClientObject((*e)->id()));
+ SPtr<client::ClientObject> eobj(
+ new client::ClientObject((*e)->id()));
eobj->set(URIs::instance().rdf_type,
forge.make_urid(URIs::instance().machina_Edge));
eobj->set(URIs::instance().machina_probability,
@@ -105,7 +105,7 @@ Controller::find(uint64_t id)
void
Controller::learn(SPtr<Raul::Maid> maid, uint64_t node_id)
{
- SPtr<Machina::Node> node = dynamic_ptr_cast<Machina::Node>(find(node_id));
+ SPtr<machina::Node> node = dynamic_ptr_cast<machina::Node>(find(node_id));
if (node) {
_engine->machine()->learn(maid, node);
} else {
@@ -129,16 +129,16 @@ Controller::set_property(uint64_t object_id,
uint64_t
Controller::connect(uint64_t tail_id, uint64_t head_id)
{
- SPtr<Machina::Node> tail = dynamic_ptr_cast<Machina::Node>(find(tail_id));
- SPtr<Machina::Node> head = dynamic_ptr_cast<Machina::Node>(find(head_id));
+ SPtr<machina::Node> tail = dynamic_ptr_cast<machina::Node>(find(tail_id));
+ SPtr<machina::Node> head = dynamic_ptr_cast<machina::Node>(find(head_id));
- SPtr<Machina::Edge> edge(new Machina::Edge(tail, head));
+ SPtr<machina::Edge> edge(new machina::Edge(tail, head));
tail->add_edge(edge);
_objects.insert(edge);
Raul::Forge& forge = _engine->forge();
- SPtr<Client::ClientObject> obj(new Client::ClientObject(edge->id()));
+ SPtr<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));
@@ -153,8 +153,8 @@ Controller::connect(uint64_t tail_id, uint64_t head_id)
void
Controller::disconnect(uint64_t tail_id, uint64_t head_id)
{
- SPtr<Machina::Node> tail = dynamic_ptr_cast<Machina::Node>(find(tail_id));
- SPtr<Machina::Node> head = dynamic_ptr_cast<Machina::Node>(find(head_id));
+ SPtr<machina::Node> tail = dynamic_ptr_cast<machina::Node>(find(tail_id));
+ SPtr<machina::Node> head = dynamic_ptr_cast<machina::Node>(find(head_id));
SPtr<Edge> edge = tail->remove_edge_to(head);
if (edge) {
@@ -192,11 +192,11 @@ Controller::process_updates()
Raul::Atom value;
for (uint32_t i = 0; i < read_space; ) {
i += read_set(_updates, &subject, &key, &value);
- SPtr<Machina::Client::ClientObject> obj = _client_model.find(subject);
+ SPtr<machina::client::ClientObject> obj = _client_model.find(subject);
if (obj) {
obj->set(key, value);
} else {
- SPtr<Client::ClientObject> obj(new Client::ClientObject(subject));
+ SPtr<client::ClientObject> obj(new client::ClientObject(subject));
obj->set(key, value);
_client_model.new_object(obj);
}