diff options
| author | David Robillard <d@drobilla.net> | 2017-02-15 23:18:59 +0100 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2017-02-15 23:26:03 +0100 |
| commit | fa6bb9afe8fcf2b0b8348495b9c4e1d6425136f0 (patch) | |
| tree | e69cd957486b3fe8a82c0b56f26aec0a23b8235c /src/client | |
| parent | 2ba09e4b41b01cbd8f8756eb0e3b7e33136e06b3 (diff) | |
| download | ingen-fa6bb9afe8fcf2b0b8348495b9c4e1d6425136f0.tar.gz ingen-fa6bb9afe8fcf2b0b8348495b9c4e1d6425136f0.tar.bz2 ingen-fa6bb9afe8fcf2b0b8348495b9c4e1d6425136f0.zip | |
Move Properties out of Resource
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/ClientStore.cpp | 19 | ||||
| -rw-r--r-- | src/client/ObjectModel.cpp | 2 | ||||
| -rw-r--r-- | src/client/PluginModel.cpp | 8 |
3 files changed, 13 insertions, 16 deletions
diff --git a/src/client/ClientStore.cpp b/src/client/ClientStore.cpp index 9948fd7b..4ff04957 100644 --- a/src/client/ClientStore.cpp +++ b/src/client/ClientStore.cpp @@ -237,11 +237,11 @@ ClientStore::move(const Raul::Path& old_path, const Raul::Path& new_path) } void -ClientStore::put(const Raul::URI& uri, - const Resource::Properties& properties, - Resource::Graph ctx) +ClientStore::put(const Raul::URI& uri, + const Properties& properties, + Resource::Graph ctx) { - typedef Resource::Properties::const_iterator Iterator; + typedef Properties::const_iterator Iterator; bool is_graph, is_block, is_port, is_output; Resource::type(uris(), properties, @@ -311,10 +311,7 @@ ClientStore::put(const Raul::URI& uri, const Raul::URI uri(_uris.forge.str(p->second, false)); if (!(plug = _plugin(uri))) { plug = SPtr<PluginModel>( - new PluginModel(uris(), - uri, - Atom(), - Resource::Properties())); + new PluginModel(uris(), uri, Atom(), Properties())); add_plugin(plug); } @@ -343,9 +340,9 @@ ClientStore::put(const Raul::URI& uri, } void -ClientStore::delta(const Raul::URI& uri, - const Resource::Properties& remove, - const Resource::Properties& add) +ClientStore::delta(const Raul::URI& uri, + const Properties& remove, + const Properties& add) { if (uri == Raul::URI("ingen:/clients/this")) { // Client property, which we don't store (yet?) diff --git a/src/client/ObjectModel.cpp b/src/client/ObjectModel.cpp index 79c6c67b..94106027 100644 --- a/src/client/ObjectModel.cpp +++ b/src/client/ObjectModel.cpp @@ -62,7 +62,7 @@ const Atom& ObjectModel::get_property(const Raul::URI& key) const { static const Atom null_atom; - Resource::Properties::const_iterator i = properties().find(key); + Properties::const_iterator i = properties().find(key); return (i != properties().end()) ? i->second : null_atom; } diff --git a/src/client/PluginModel.cpp b/src/client/PluginModel.cpp index 3c4d13de..353b0f5c 100644 --- a/src/client/PluginModel.cpp +++ b/src/client/PluginModel.cpp @@ -40,10 +40,10 @@ const LilvPlugins* PluginModel::_lilv_plugins = NULL; Sord::World* PluginModel::_rdf_world = NULL; -PluginModel::PluginModel(URIs& uris, - const Raul::URI& uri, - const Atom& type, - const Resource::Properties& properties) +PluginModel::PluginModel(URIs& uris, + const Raul::URI& uri, + const Atom& type, + const Properties& properties) : Resource(uris, uri) , _type(type) , _fetched(false) |