summaryrefslogtreecommitdiffstats
path: root/src/server/ServerInterfaceImpl.cpp
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-10-21 21:45:14 +0000
committerDavid Robillard <d@drobilla.net>2011-10-21 21:45:14 +0000
commit0d4792af695d94a1e476adcdb65eed8a501ddbd4 (patch)
tree1c0fc824541fcdbb057f5a0909bc8cf7704dccfe /src/server/ServerInterfaceImpl.cpp
parent4ce6781bd6727fca68d4c99337f47a75d849e5ab (diff)
downloadingen-0d4792af695d94a1e476adcdb65eed8a501ddbd4.tar.gz
ingen-0d4792af695d94a1e476adcdb65eed8a501ddbd4.tar.bz2
ingen-0d4792af695d94a1e476adcdb65eed8a501ddbd4.zip
Make OSCEngineReceiver and HTTPEngineReceiver has-a ServerInterfaceImpl (instead of is-a).
Towards further modularization... git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3570 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/server/ServerInterfaceImpl.cpp')
-rw-r--r--src/server/ServerInterfaceImpl.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/server/ServerInterfaceImpl.cpp b/src/server/ServerInterfaceImpl.cpp
index 1109a388..fcf9cc00 100644
--- a/src/server/ServerInterfaceImpl.cpp
+++ b/src/server/ServerInterfaceImpl.cpp
@@ -35,7 +35,7 @@ namespace Server {
ServerInterfaceImpl::ServerInterfaceImpl(Engine& engine)
: EventSource()
- , _request(new Request(this, NULL, 0))
+ , _request(new Request(NULL, 0))
, _engine(engine)
, _in_bundle(false)
{
@@ -80,7 +80,7 @@ ServerInterfaceImpl::register_client(ClientInterface* client)
{
push_queued(new Events::RegisterClient(_engine, _request, now(), client->uri(), client));
if (!_request) {
- _request = SharedPtr<Request>(new Request(this, client, 1));
+ _request = SharedPtr<Request>(new Request(client, 1));
} else {
_request->set_id(1);
_request->set_client(client);
@@ -115,23 +115,23 @@ ServerInterfaceImpl::bundle_end()
void
ServerInterfaceImpl::put(const URI& uri,
- const Resource::Properties& properties,
- const Resource::Graph ctx)
+ const Resource::Properties& properties,
+ const Resource::Graph ctx)
{
push_queued(new Events::SetMetadata(_engine, _request, now(), true, ctx, uri, properties));
}
void
ServerInterfaceImpl::delta(const URI& uri,
- const Resource::Properties& remove,
- const Resource::Properties& add)
+ const Resource::Properties& remove,
+ const Resource::Properties& add)
{
push_queued(new Events::SetMetadata(_engine, _request, now(), false, Resource::DEFAULT, uri, add, remove));
}
void
ServerInterfaceImpl::move(const Path& old_path,
- const Path& new_path)
+ const Path& new_path)
{
push_queued(new Events::Move(_engine, _request, now(), old_path, new_path));
}
@@ -149,7 +149,7 @@ ServerInterfaceImpl::del(const URI& uri)
void
ServerInterfaceImpl::connect(const Path& src_port_path,
- const Path& dst_port_path)
+ const Path& dst_port_path)
{
push_queued(new Events::Connect(_engine, _request, now(), src_port_path, dst_port_path));
@@ -157,7 +157,7 @@ ServerInterfaceImpl::connect(const Path& src_port_path,
void
ServerInterfaceImpl::disconnect(const URI& src,
- const URI& dst)
+ const URI& dst)
{
if (!Path::is_path(src) && !Path::is_path(dst)) {
std::cerr << "Bad disconnect request " << src << " => " << dst << std::endl;
@@ -170,15 +170,15 @@ ServerInterfaceImpl::disconnect(const URI& src,
void
ServerInterfaceImpl::disconnect_all(const Path& patch_path,
- const Path& path)
+ const Path& path)
{
push_queued(new Events::DisconnectAll(_engine, _request, now(), patch_path, path));
}
void
ServerInterfaceImpl::set_property(const URI& uri,
- const URI& predicate,
- const Atom& value)
+ const URI& predicate,
+ const Atom& value)
{
if (uri == "ingen:engine" && predicate == "ingen:enabled"
&& value.type() == Atom::BOOL) {