summaryrefslogtreecommitdiffstats
path: root/src/server
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2015-09-04 22:28:28 +0000
committerDavid Robillard <d@drobilla.net>2015-09-04 22:28:28 +0000
commit183195508e8f45bc571fac8955789e70570b8a1b (patch)
treeec9eb4ff7060b3b0beec0bebac2b26073e4189fd /src/server
parent9cfc41a86b30d4b10cffd5404c91ce852ab6a1a8 (diff)
downloadingen-183195508e8f45bc571fac8955789e70570b8a1b.tar.gz
ingen-183195508e8f45bc571fac8955789e70570b8a1b.tar.bz2
ingen-183195508e8f45bc571fac8955789e70570b8a1b.zip
Fix various atom conversion issues.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@5719 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/server')
-rw-r--r--src/server/events/CreateBlock.cpp4
-rw-r--r--src/server/events/CreateGraph.cpp7
-rw-r--r--src/server/events/CreatePort.cpp5
-rw-r--r--src/server/events/Delta.cpp30
4 files changed, 26 insertions, 20 deletions
diff --git a/src/server/events/CreateBlock.cpp b/src/server/events/CreateBlock.cpp
index 8e1ebfe4..22c8731f 100644
--- a/src/server/events/CreateBlock.cpp
+++ b/src/server/events/CreateBlock.cpp
@@ -81,12 +81,12 @@ CreateBlock::pre_process()
// Get prototype
iterator t = _properties.find(uris.lv2_prototype);
- if (t == _properties.end() || t->second.type() != uris.forge.URI) {
+ if (t == _properties.end() || !uris.forge.is_uri(t->second)) {
// Missing/invalid prototype
return Event::pre_process_done(Status::BAD_REQUEST);
}
- const Raul::URI prototype(t->second.ptr<char>());
+ const Raul::URI prototype(uris.forge.str(t->second, false));
// Find polyphony
const iterator p = _properties.find(uris.ingen_polyphonic);
diff --git a/src/server/events/CreateGraph.cpp b/src/server/events/CreateGraph.cpp
index d0115a4d..7c4b1940 100644
--- a/src/server/events/CreateGraph.cpp
+++ b/src/server/events/CreateGraph.cpp
@@ -83,10 +83,11 @@ CreateGraph::pre_process()
}
if (t != _properties.end() &&
- Raul::URI::is_valid(t->second.ptr<char>()) &&
- Node::uri_is_path(Raul::URI(t->second.ptr<char>()))) {
+ uris.forge.is_uri(t->second) &&
+ Raul::URI::is_valid(uris.forge.str(t->second, false)) &&
+ Node::uri_is_path(Raul::URI(uris.forge.str(t->second, false)))) {
// Create a duplicate of an existing graph
- const Raul::URI prototype(t->second.ptr<char>());
+ const Raul::URI prototype(uris.forge.str(t->second, false));
GraphImpl* ancestor = dynamic_cast<GraphImpl*>(
_engine.store()->get(Node::uri_to_path(prototype)));
if (!ancestor) {
diff --git a/src/server/events/CreatePort.cpp b/src/server/events/CreatePort.cpp
index 9dce0ad0..173b8a73 100644
--- a/src/server/events/CreatePort.cpp
+++ b/src/server/events/CreatePort.cpp
@@ -76,8 +76,9 @@ CreatePort::CreatePort(Engine& engine,
const Range buffer_types = properties.equal_range(uris.atom_bufferType);
for (Iterator i = buffer_types.first; i != buffer_types.second; ++i) {
- if (i->second.type() == _engine.world()->forge().URI) {
- _buf_type = _engine.world()->uri_map().map_uri(i->second.ptr<char>());
+ if (uris.forge.is_uri(i->second)) {
+ _buf_type = _engine.world()->uri_map().map_uri(
+ uris.forge.str(i->second, false));
}
}
}
diff --git a/src/server/events/Delta.cpp b/src/server/events/Delta.cpp
index a768beb0..a85c8253 100644
--- a/src/server/events/Delta.cpp
+++ b/src/server/events/Delta.cpp
@@ -17,6 +17,8 @@
#include <vector>
#include <thread>
+#include <glibmm/convert.h>
+
#include "ingen/Log.hpp"
#include "ingen/Store.hpp"
#include "ingen/URIs.hpp"
@@ -290,22 +292,24 @@ Delta::pre_process()
_status = Status::BAD_VALUE_TYPE;
}
} else if (key == uris.pset_preset) {
- if (value.type() == uris.forge.URI) {
- const char* str = value.ptr<char>();
- if (Raul::URI::is_valid(str)) {
- op = SpecialType::PRESET;
- const Raul::URI uri(str);
- if ((_state = block->load_preset(Raul::URI(str)))) {
- lilv_state_emit_port_values(
- _state, s_add_set_event, this);
- } else {
- _engine.log().warn(fmt("Failed to load preset <%1%>\n") % str);
- }
+ std::string uri_str;
+ if (uris.forge.is_uri(value)) {
+ uri_str = uris.forge.str(value, false);
+ } else if (value.type() == uris.forge.Path) {
+ uri_str = Glib::filename_to_uri(value.ptr<char>());
+ }
+
+ if (Raul::URI::is_valid(uri_str)) {
+ const Raul::URI uri(uri_str);
+ op = SpecialType::PRESET;
+ if ((_state = block->load_preset(uri))) {
+ lilv_state_emit_port_values(
+ _state, s_add_set_event, this);
} else {
- _status = Status::BAD_VALUE;
+ _engine.log().warn(fmt("Failed to load preset <%1%>\n") % uri);
}
} else {
- _status = Status::BAD_VALUE_TYPE;
+ _status = Status::BAD_VALUE;
}
}
}