diff options
| author | David Robillard <d@drobilla.net> | 2012-03-16 04:13:23 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2012-03-16 04:13:23 +0000 |
| commit | 9da093217352daa1fb61a6f2daf5195640e286a7 (patch) | |
| tree | fb3489c04451dc14a61170ba2418123727414340 /src/client | |
| parent | 119468f621a59d86da10bedf75c4427b70f9d370 (diff) | |
| download | ingen-9da093217352daa1fb61a6f2daf5195640e286a7.tar.gz ingen-9da093217352daa1fb61a6f2daf5195640e286a7.tar.bz2 ingen-9da093217352daa1fb61a6f2daf5195640e286a7.zip | |
Merge ClientInterface and ServerInterface.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4067 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/ClientStore.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/client/ClientStore.cpp b/src/client/ClientStore.cpp index c7d5b9a2..83815187 100644 --- a/src/client/ClientStore.cpp +++ b/src/client/ClientStore.cpp @@ -43,7 +43,7 @@ using namespace Shared; namespace Client { ClientStore::ClientStore(SharedPtr<Shared::URIs> uris, - SharedPtr<ServerInterface> engine, + SharedPtr<Interface> engine, SharedPtr<SigClientInterface> emitter) : _uris(uris) , _engine(engine) @@ -238,7 +238,7 @@ ClientStore::move(const Path& old_path_str, const Path& new_path_str) iterator parent = find(old_path); if (parent == end()) { - LOG(error) << "Failed to find object " << old_path << " to move." << endl; + LOG(Raul::error) << "Failed to find object " << old_path << " to move." << endl; return; } @@ -301,7 +301,7 @@ ClientStore::put(const URI& uri, } if (!Path::is_valid(uri.str())) { - LOG(error) << "Bad path `" << uri.str() << "'" << endl; + LOG(Raul::error) << "Bad path `" << uri.str() << "'" << endl; return; } @@ -351,7 +351,7 @@ ClientStore::put(const URI& uri, p->set_properties(properties); add_object(p); } else { - LOG(error) << "Port " << path << " has no index" << endl; + LOG(Raul::error) << "Port " << path << " has no index" << endl; } } else { LOG(warn) << "Ignoring object " << path << " with unknown type " @@ -377,7 +377,7 @@ ClientStore::delta(const URI& uri, #endif if (!Path::is_valid(uri.str())) { - LOG(error) << "Bad path `" << uri.str() << "'" << endl; + LOG(Raul::error) << "Bad path `" << uri.str() << "'" << endl; return; } @@ -430,7 +430,7 @@ ClientStore::connection_patch(const Path& src_port_path, const Path& dst_port_pa patch = PtrCast<PatchModel>(_object(src_port_path.parent().parent())); if (!patch) - LOG(error) << "Unable to find connection patch " << src_port_path + LOG(Raul::error) << "Unable to find connection patch " << src_port_path << " -> " << dst_port_path << endl; return patch; |