summaryrefslogtreecommitdiffstats
path: root/src/server/events
diff options
context:
space:
mode:
Diffstat (limited to 'src/server/events')
-rw-r--r--src/server/events/Connect.cpp4
-rw-r--r--src/server/events/CreateGraph.cpp2
-rw-r--r--src/server/events/CreatePort.cpp4
-rw-r--r--src/server/events/Delete.cpp4
-rw-r--r--src/server/events/Delta.cpp14
-rw-r--r--src/server/events/DisconnectAll.cpp10
-rw-r--r--src/server/events/DisconnectAll.hpp6
-rw-r--r--src/server/events/Get.cpp6
-rw-r--r--src/server/events/Get.hpp2
9 files changed, 26 insertions, 26 deletions
diff --git a/src/server/events/Connect.cpp b/src/server/events/Connect.cpp
index eeaa1904..5e749628 100644
--- a/src/server/events/Connect.cpp
+++ b/src/server/events/Connect.cpp
@@ -54,12 +54,12 @@ Connect::pre_process()
{
Glib::RWLock::ReaderLock rlock(_engine.store()->lock());
- GraphObject* tail = _engine.store()->get(_tail_path);
+ Node* tail = _engine.store()->get(_tail_path);
if (!tail) {
return Event::pre_process_done(NOT_FOUND, _tail_path);
}
- GraphObject* head = _engine.store()->get(_head_path);
+ Node* head = _engine.store()->get(_head_path);
if (!head) {
return Event::pre_process_done(NOT_FOUND, _head_path);
}
diff --git a/src/server/events/CreateGraph.cpp b/src/server/events/CreateGraph.cpp
index bfe08043..5be9d19e 100644
--- a/src/server/events/CreateGraph.cpp
+++ b/src/server/events/CreateGraph.cpp
@@ -114,7 +114,7 @@ void
CreateGraph::post_process()
{
if (!respond()) {
- _engine.broadcaster()->put(GraphObject::path_to_uri(_path), _update);
+ _engine.broadcaster()->put(Node::path_to_uri(_path), _update);
}
}
diff --git a/src/server/events/CreatePort.cpp b/src/server/events/CreatePort.cpp
index a32faaee..58402014 100644
--- a/src/server/events/CreatePort.cpp
+++ b/src/server/events/CreatePort.cpp
@@ -97,7 +97,7 @@ CreatePort::pre_process()
return Event::pre_process_done(_status, _path);
}
- GraphObject* parent = _engine.store()->get(_path.parent());
+ Node* parent = _engine.store()->get(_path.parent());
if (!parent) {
return Event::pre_process_done(PARENT_NOT_FOUND, _path.parent());
}
@@ -185,7 +185,7 @@ void
CreatePort::post_process()
{
if (!respond()) {
- _engine.broadcaster()->put(GraphObject::path_to_uri(_path), _update);
+ _engine.broadcaster()->put(Node::path_to_uri(_path), _update);
}
delete _old_ports_array;
diff --git a/src/server/events/Delete.cpp b/src/server/events/Delete.cpp
index a6207ba1..e4878f4e 100644
--- a/src/server/events/Delete.cpp
+++ b/src/server/events/Delete.cpp
@@ -47,8 +47,8 @@ Delete::Delete(Engine& engine,
, _disconnect_event(NULL)
, _lock(engine.store()->lock(), Glib::NOT_LOCK)
{
- if (GraphObject::uri_is_path(uri)) {
- _path = GraphObject::uri_to_path(uri);
+ if (Node::uri_is_path(uri)) {
+ _path = Node::uri_to_path(uri);
}
}
diff --git a/src/server/events/Delta.cpp b/src/server/events/Delta.cpp
index 06bd150c..6c935ce2 100644
--- a/src/server/events/Delta.cpp
+++ b/src/server/events/Delta.cpp
@@ -105,13 +105,13 @@ Delta::pre_process()
{
typedef Properties::const_iterator iterator;
- const bool is_graph_object = GraphObject::uri_is_path(_subject);
+ const bool is_graph_object = Node::uri_is_path(_subject);
// Take a writer lock while we modify the store
Glib::RWLock::WriterLock lock(_engine.store()->lock());
_object = is_graph_object
- ? static_cast<Ingen::Resource*>(_engine.store()->get(GraphObject::uri_to_path(_subject)))
+ ? static_cast<Ingen::Resource*>(_engine.store()->get(Node::uri_to_path(_subject)))
: static_cast<Ingen::Resource*>(_engine.block_factory()->plugin(_subject));
if (!_object && (!is_graph_object || !_create)) {
@@ -121,7 +121,7 @@ Delta::pre_process()
const Ingen::URIs& uris = _engine.world()->uris();
if (is_graph_object && !_object) {
- Raul::Path path(GraphObject::uri_to_path(_subject));
+ Raul::Path path(Node::uri_to_path(_subject));
bool is_graph = false, is_block = false, is_port = false, is_output = false;
Ingen::Resource::type(uris, _properties, is_graph, is_block, is_port, is_output);
@@ -147,7 +147,7 @@ Delta::pre_process()
_types.reserve(_properties.size());
- GraphObjectImpl* obj = dynamic_cast<GraphObjectImpl*>(_object);
+ NodeImpl* obj = dynamic_cast<NodeImpl*>(_object);
for (Properties::const_iterator p = _remove.begin(); p != _remove.end(); ++p) {
const Raul::URI& key = p->first;
@@ -270,9 +270,9 @@ Delta::execute(ProcessContext& context)
(*i)->execute(context);
}
- GraphObjectImpl* const object = dynamic_cast<GraphObjectImpl*>(_object);
- BlockImpl* const block = dynamic_cast<BlockImpl*>(_object);
- PortImpl* const port = dynamic_cast<PortImpl*>(_object);
+ NodeImpl* const object = dynamic_cast<NodeImpl*>(_object);
+ BlockImpl* const block = dynamic_cast<BlockImpl*>(_object);
+ PortImpl* const port = dynamic_cast<PortImpl*>(_object);
std::vector<SpecialType>::const_iterator t = _types.begin();
for (Properties::const_iterator p = _properties.begin(); p != _properties.end(); ++p, ++t) {
diff --git a/src/server/events/DisconnectAll.cpp b/src/server/events/DisconnectAll.cpp
index dbff2ab3..019193e6 100644
--- a/src/server/events/DisconnectAll.cpp
+++ b/src/server/events/DisconnectAll.cpp
@@ -59,9 +59,9 @@ DisconnectAll::DisconnectAll(Engine& engine,
/** Internal version for use by other events.
*/
-DisconnectAll::DisconnectAll(Engine& engine,
- GraphImpl* parent,
- GraphObject* object)
+DisconnectAll::DisconnectAll(Engine& engine,
+ GraphImpl* parent,
+ Node* object)
: Event(engine)
, _parent_path(parent->path())
, _path(object->path())
@@ -92,7 +92,7 @@ DisconnectAll::pre_process()
return Event::pre_process_done(PARENT_NOT_FOUND, _parent_path);
}
- GraphObjectImpl* const object = dynamic_cast<GraphObjectImpl*>(
+ NodeImpl* const object = dynamic_cast<NodeImpl*>(
_engine.store()->get(_path));
if (!object) {
return Event::pre_process_done(NOT_FOUND, _path);
@@ -112,7 +112,7 @@ DisconnectAll::pre_process()
// Find set of edges to remove
std::set<EdgeImpl*> to_remove;
- for (GraphObject::Edges::const_iterator i = _parent->edges().begin();
+ for (Node::Edges::const_iterator i = _parent->edges().begin();
i != _parent->edges().end(); ++i) {
EdgeImpl* const c = (EdgeImpl*)i->second.get();
if (_block) {
diff --git a/src/server/events/DisconnectAll.hpp b/src/server/events/DisconnectAll.hpp
index 8a785722..7db53bfa 100644
--- a/src/server/events/DisconnectAll.hpp
+++ b/src/server/events/DisconnectAll.hpp
@@ -50,9 +50,9 @@ public:
const Raul::Path& parent,
const Raul::Path& object);
- DisconnectAll(Engine& engine,
- GraphImpl* parent,
- GraphObject* object);
+ DisconnectAll(Engine& engine,
+ GraphImpl* parent,
+ Node* object);
~DisconnectAll();
diff --git a/src/server/events/Get.cpp b/src/server/events/Get.cpp
index c452328e..1493f161 100644
--- a/src/server/events/Get.cpp
+++ b/src/server/events/Get.cpp
@@ -16,8 +16,8 @@
#include <utility>
-#include "ingen/GraphObject.hpp"
#include "ingen/Interface.hpp"
+#include "ingen/Node.hpp"
#include "ingen/Store.hpp"
#include "BlockImpl.hpp"
@@ -60,8 +60,8 @@ Get::pre_process()
return Event::pre_process_done(SUCCESS);
} else if (_uri == "ingen:engine") {
return Event::pre_process_done(SUCCESS);
- } else if (GraphObject::uri_is_path(_uri)) {
- _object = _engine.store()->get(GraphObject::uri_to_path(_uri));
+ } else if (Node::uri_is_path(_uri)) {
+ _object = _engine.store()->get(Node::uri_to_path(_uri));
return Event::pre_process_done(_object ? SUCCESS : NOT_FOUND, _uri);
} else {
_plugin = _engine.block_factory()->plugin(_uri);
diff --git a/src/server/events/Get.hpp b/src/server/events/Get.hpp
index 7b33304e..12f48b09 100644
--- a/src/server/events/Get.hpp
+++ b/src/server/events/Get.hpp
@@ -49,7 +49,7 @@ public:
private:
const Raul::URI _uri;
- const GraphObject* _object;
+ const Node* _object;
const PluginImpl* _plugin;
BlockFactory::Plugins _plugins;
Glib::RWLock::ReaderLock _lock;
generated by cgit v1.2.1 (git 2.18.0) at 2024-04-19 18:18:00 +0000