diff options
| author | David Robillard <d@drobilla.net> | 2011-10-21 19:29:03 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2011-10-21 19:29:03 +0000 |
| commit | ee1ba36e564c4f0545e50ec91fa4b14d6dfca91b (patch) | |
| tree | 60935911f4f05642fc86c1e94052209a091b0156 /src/client | |
| parent | c65659729265b8795ea76390a3507023ff3164dd (diff) | |
| download | ingen-ee1ba36e564c4f0545e50ec91fa4b14d6dfca91b.tar.gz ingen-ee1ba36e564c4f0545e50ec91fa4b14d6dfca91b.tar.bz2 ingen-ee1ba36e564c4f0545e50ec91fa4b14d6dfca91b.zip | |
Separate URIs from LV2URIMap.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3564 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/ClientStore.cpp | 2 | ||||
| -rw-r--r-- | src/client/NodeModel.cpp | 4 | ||||
| -rw-r--r-- | src/client/ObjectModel.cpp | 2 | ||||
| -rw-r--r-- | src/client/PluginModel.cpp | 6 | ||||
| -rw-r--r-- | src/client/PluginUI.cpp | 5 |
5 files changed, 11 insertions, 8 deletions
diff --git a/src/client/ClientStore.cpp b/src/client/ClientStore.cpp index ed1fde66..90c23d15 100644 --- a/src/client/ClientStore.cpp +++ b/src/client/ClientStore.cpp @@ -42,7 +42,7 @@ using namespace Shared; namespace Client { -ClientStore::ClientStore(SharedPtr<Shared::LV2URIMap> uris, +ClientStore::ClientStore(SharedPtr<Shared::URIs> uris, SharedPtr<ServerInterface> engine, SharedPtr<SigClientInterface> emitter) : _uris(uris) diff --git a/src/client/NodeModel.cpp b/src/client/NodeModel.cpp index 62a562e8..007cd424 100644 --- a/src/client/NodeModel.cpp +++ b/src/client/NodeModel.cpp @@ -29,7 +29,7 @@ using namespace Raul; namespace Ingen { namespace Client { -NodeModel::NodeModel(Shared::LV2URIMap& uris, +NodeModel::NodeModel(Shared::URIs& uris, SharedPtr<PluginModel> plugin, const Path& path) : Node() @@ -42,7 +42,7 @@ NodeModel::NodeModel(Shared::LV2URIMap& uris, { } -NodeModel::NodeModel(Shared::LV2URIMap& uris, +NodeModel::NodeModel(Shared::URIs& uris, const URI& plugin_uri, const Path& path) : Node() diff --git a/src/client/ObjectModel.cpp b/src/client/ObjectModel.cpp index f09af326..240e2ca5 100644 --- a/src/client/ObjectModel.cpp +++ b/src/client/ObjectModel.cpp @@ -26,7 +26,7 @@ using namespace Raul; namespace Ingen { namespace Client { -ObjectModel::ObjectModel(Shared::LV2URIMap& uris, const Raul::Path& path) +ObjectModel::ObjectModel(Shared::URIs& uris, const Raul::Path& path) : ResourceImpl(uris, path) , _meta(uris, Raul::URI("http://example.org/FIXME")) , _path(path) diff --git a/src/client/PluginModel.cpp b/src/client/PluginModel.cpp index 1d13ee5b..a280a038 100644 --- a/src/client/PluginModel.cpp +++ b/src/client/PluginModel.cpp @@ -41,8 +41,10 @@ const LilvPlugins* PluginModel::_lilv_plugins = NULL; Sord::World* PluginModel::_rdf_world = NULL; -PluginModel::PluginModel(Shared::LV2URIMap& uris, - const URI& uri, const URI& type_uri, const Resource::Properties& properties) +PluginModel::PluginModel(Shared::URIs& uris, + const URI& uri, + const URI& type_uri, + const Resource::Properties& properties) : ResourceImpl(uris, uri) , _type(type_from_uri(type_uri.str())) { diff --git a/src/client/PluginUI.cpp b/src/client/PluginUI.cpp index cf93b8bb..0e0c3c51 100644 --- a/src/client/PluginUI.cpp +++ b/src/client/PluginUI.cpp @@ -54,7 +54,8 @@ lv2_ui_write(SuilController controller, SharedPtr<const PortModel> port = ports[port_index]; - const Shared::LV2URIMap& uris = *ui->world()->uris().get(); + const Shared::URIs& uris = *ui->world()->uris().get(); + const Shared::LV2URIMap& uri_map = *ui->world()->lv2_uri_map().get(); // float (special case, always 0) if (format == 0) { @@ -74,7 +75,7 @@ lv2_ui_write(SuilController controller, while (lv2_event_is_valid(&iter)) { LV2_Event* const ev = lv2_event_get(&iter, &data); std::pair<bool, uint16_t> midi_id = - uris.global_to_event(uris.midi_MidiEvent.id); + uri_map.global_to_event(uris.midi_MidiEvent.id); if (midi_id.first && ev->type == midi_id.second) { // FIXME: bundle multiple events by writing an entire buffer here ui->world()->engine()->set_property( |