summaryrefslogtreecommitdiffstats
path: root/src/server/events/Delta.cpp
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2012-07-26 15:27:03 +0000
committerDavid Robillard <d@drobilla.net>2012-07-26 15:27:03 +0000
commit3c5931bb13b5f88edcebb375fa6964dde8b85563 (patch)
tree9801897576b7fb9d8a9f700847c670f216fc93b7 /src/server/events/Delta.cpp
parentb83ed4f83cf4c9b5054dcf55bea710313c369633 (diff)
downloadingen-3c5931bb13b5f88edcebb375fa6964dde8b85563.tar.gz
ingen-3c5931bb13b5f88edcebb375fa6964dde8b85563.tar.bz2
ingen-3c5931bb13b5f88edcebb375fa6964dde8b85563.zip
Report subject with errors to client for more meaningful error messages.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4556 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/server/events/Delta.cpp')
-rw-r--r--src/server/events/Delta.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/server/events/Delta.cpp b/src/server/events/Delta.cpp
index 8da4b230..0f067a7e 100644
--- a/src/server/events/Delta.cpp
+++ b/src/server/events/Delta.cpp
@@ -113,7 +113,7 @@ Delta::pre_process()
: static_cast<Shared::ResourceImpl*>(_engine.node_factory()->plugin(_subject));
if (!_object && (!is_graph_object || !_create)) {
- return Event::pre_process_done(NOT_FOUND);
+ return Event::pre_process_done(NOT_FOUND, _subject);
}
const Ingen::Shared::URIs& uris = _engine.world()->uris();
@@ -139,7 +139,7 @@ Delta::pre_process()
// Grab the object for applying properties, if the create-event succeeded
_object = _engine.engine_store()->find_object(Raul::Path(_subject.str()));
} else {
- return Event::pre_process_done(BAD_OBJECT_TYPE);
+ return Event::pre_process_done(BAD_OBJECT_TYPE, _subject);
}
}
@@ -250,7 +250,8 @@ Delta::pre_process()
_types.push_back(op);
}
- return Event::pre_process_done(_status == NOT_PREPARED ? SUCCESS : _status);
+ return Event::pre_process_done(_status == NOT_PREPARED ? SUCCESS : _status,
+ _subject);
}
void
@@ -346,7 +347,7 @@ Delta::post_process()
if (_create_event) {
_create_event->post_process();
} else {
- respond(SUCCESS);
+ respond();
if (_create) {
_engine.broadcaster()->put(_subject, _properties, _context);
} else {
@@ -354,7 +355,7 @@ Delta::post_process()
}
}
} else {
- respond(_status);
+ respond();
}
}