summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/server/EventWriter.cpp12
-rw-r--r--src/server/events.hpp2
-rw-r--r--src/server/events/Delta.cpp (renamed from src/server/events/SetMetadata.cpp)34
-rw-r--r--src/server/events/Delta.hpp (renamed from src/server/events/SetMetadata.hpp)24
-rw-r--r--src/server/wscript2
5 files changed, 37 insertions, 37 deletions
diff --git a/src/server/EventWriter.cpp b/src/server/EventWriter.cpp
index 33462c1c..a6482a38 100644
--- a/src/server/EventWriter.cpp
+++ b/src/server/EventWriter.cpp
@@ -61,8 +61,8 @@ EventWriter::put(const Raul::URI& uri,
const Resource::Graph ctx)
{
_engine.enqueue_event(
- new Events::SetMetadata(_engine, _respondee.get(), _request_id, now(),
- true, ctx, uri, properties));
+ new Events::Delta(_engine, _respondee.get(), _request_id, now(),
+ true, ctx, uri, properties));
}
void
@@ -71,8 +71,8 @@ EventWriter::delta(const Raul::URI& uri,
const Resource::Properties& add)
{
_engine.enqueue_event(
- new Events::SetMetadata(_engine, _respondee.get(), _request_id, now(),
- false, Resource::DEFAULT, uri, add, remove));
+ new Events::Delta(_engine, _respondee.get(), _request_id, now(),
+ false, Resource::DEFAULT, uri, add, remove));
}
void
@@ -129,8 +129,8 @@ EventWriter::set_property(const Raul::URI& uri,
Resource::Properties add;
add.insert(make_pair(predicate, value));
_engine.enqueue_event(
- new Events::SetMetadata(_engine, _respondee.get(), _request_id, now(),
- false, Resource::DEFAULT, uri, add, remove));
+ new Events::Delta(_engine, _respondee.get(), _request_id, now(),
+ false, Resource::DEFAULT, uri, add, remove));
}
void
diff --git a/src/server/events.hpp b/src/server/events.hpp
index 9c1ed8aa..cf764fa9 100644
--- a/src/server/events.hpp
+++ b/src/server/events.hpp
@@ -22,11 +22,11 @@
#include "events/CreatePatch.hpp"
#include "events/CreatePort.hpp"
#include "events/Delete.hpp"
+#include "events/Delta.hpp"
#include "events/Disconnect.hpp"
#include "events/DisconnectAll.hpp"
#include "events/Get.hpp"
#include "events/Move.hpp"
-#include "events/SetMetadata.hpp"
#include "events/SetPortValue.hpp"
#endif // INGEN_ENGINE_EVENTS_HPP
diff --git a/src/server/events/SetMetadata.cpp b/src/server/events/Delta.cpp
index cc2ae563..34e9d63d 100644
--- a/src/server/events/SetMetadata.cpp
+++ b/src/server/events/Delta.cpp
@@ -32,6 +32,7 @@
#include "CreateNode.hpp"
#include "CreatePatch.hpp"
#include "CreatePort.hpp"
+#include "Delta.hpp"
#include "Driver.hpp"
#include "Engine.hpp"
#include "EngineStore.hpp"
@@ -40,10 +41,9 @@
#include "PluginImpl.hpp"
#include "PortImpl.hpp"
#include "PortType.hpp"
-#include "SetMetadata.hpp"
#include "SetPortValue.hpp"
-#define LOG(s) s << "[SetMetadata] "
+#define LOG(s) s << "[Delta] "
namespace Ingen {
namespace Server {
@@ -51,15 +51,15 @@ namespace Events {
typedef Resource::Properties Properties;
-SetMetadata::SetMetadata(Engine& engine,
- Interface* client,
- int32_t id,
- SampleCount timestamp,
- bool create,
- Resource::Graph context,
- const Raul::URI& subject,
- const Properties& properties,
- const Properties& remove)
+Delta::Delta(Engine& engine,
+ Interface* client,
+ int32_t id,
+ SampleCount timestamp,
+ bool create,
+ Resource::Graph context,
+ const Raul::URI& subject,
+ const Properties& properties,
+ const Properties& remove)
: Event(engine, client, id, timestamp)
, _create_event(NULL)
, _subject(subject)
@@ -76,7 +76,7 @@ SetMetadata::SetMetadata(Engine& engine,
}
/*
- LOG(Raul::info) << "Patch " << subject << " : " << context << " {" << std::endl;
+ LOG(Raul::info) << "Delta " << subject << " : " << context << " {" << std::endl;
typedef Resource::Properties::const_iterator iterator;
for (iterator i = properties.begin(); i != properties.end(); ++i) {
LOG(Raul::info) << " + " << i->first
@@ -86,14 +86,14 @@ SetMetadata::SetMetadata(Engine& engine,
typedef Resource::Properties::const_iterator iterator;
for (iterator i = remove.begin(); i != remove.end(); ++i) {
LOG(Raul::info) << " - " << i->first
- << " = " << engine.world()->forge().str(i->second)
+ << " = " << engine.world()->forge().str(i->second)
<< " :: " << engine.world()->uri_map().unmap_uri(i->second.type()) << std::endl;
}
LOG(Raul::info) << "}" << std::endl;
*/
}
-SetMetadata::~SetMetadata()
+Delta::~Delta()
{
for (SetEvents::iterator i = _set_events.begin(); i != _set_events.end(); ++i)
delete *i;
@@ -102,7 +102,7 @@ SetMetadata::~SetMetadata()
}
bool
-SetMetadata::pre_process()
+Delta::pre_process()
{
typedef Properties::const_iterator iterator;
@@ -257,7 +257,7 @@ SetMetadata::pre_process()
}
void
-SetMetadata::execute(ProcessContext& context)
+Delta::execute(ProcessContext& context)
{
if (_status) {
return;
@@ -340,7 +340,7 @@ SetMetadata::execute(ProcessContext& context)
}
void
-SetMetadata::post_process()
+Delta::post_process()
{
for (SetEvents::iterator i = _set_events.begin(); i != _set_events.end(); ++i)
(*i)->post_process();
diff --git a/src/server/events/SetMetadata.hpp b/src/server/events/Delta.hpp
index 223339da..935dcfac 100644
--- a/src/server/events/SetMetadata.hpp
+++ b/src/server/events/Delta.hpp
@@ -63,20 +63,20 @@ class SetPortValue;
/** Set properties of a graph object.
* \ingroup engine
*/
-class SetMetadata : public Event
+class Delta : public Event
{
public:
- SetMetadata(Engine& engine,
- Interface* client,
- int32_t id,
- SampleCount timestamp,
- bool create,
- Resource::Graph context,
- const Raul::URI& subject,
- const Resource::Properties& properties,
- const Resource::Properties& remove = Resource::Properties());
-
- ~SetMetadata();
+ Delta(Engine& engine,
+ Interface* client,
+ int32_t id,
+ SampleCount timestamp,
+ bool create,
+ Resource::Graph context,
+ const Raul::URI& subject,
+ const Resource::Properties& properties,
+ const Resource::Properties& remove = Resource::Properties());
+
+ ~Delta();
bool pre_process();
void execute(ProcessContext& context);
diff --git a/src/server/wscript b/src/server/wscript
index c1ea75e9..1d80b926 100644
--- a/src/server/wscript
+++ b/src/server/wscript
@@ -35,11 +35,11 @@ def build(bld):
events/CreatePatch.cpp
events/CreatePort.cpp
events/Delete.cpp
+ events/Delta.cpp
events/Disconnect.cpp
events/DisconnectAll.cpp
events/Get.cpp
events/Move.cpp
- events/SetMetadata.cpp
events/SetPortValue.cpp
ingen_engine.cpp
internals/Controller.cpp
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-28 17:05:46 +0000