summaryrefslogtreecommitdiffstats
path: root/src/server/events
diff options
context:
space:
mode:
Diffstat (limited to 'src/server/events')
-rw-r--r--src/server/events/Copy.cpp20
-rw-r--r--src/server/events/CreateBlock.cpp2
-rw-r--r--src/server/events/CreateGraph.cpp4
-rw-r--r--src/server/events/CreatePort.cpp8
-rw-r--r--src/server/events/Delete.cpp4
-rw-r--r--src/server/events/Delta.cpp14
-rw-r--r--src/server/events/Get.cpp2
-rw-r--r--src/server/events/SetPortValue.cpp8
8 files changed, 31 insertions, 31 deletions
diff --git a/src/server/events/Copy.cpp b/src/server/events/Copy.cpp
index 960b6004..8c23568b 100644
--- a/src/server/events/Copy.cpp
+++ b/src/server/events/Copy.cpp
@@ -143,18 +143,18 @@ Copy::engine_to_filesystem(PreProcessContext& ctx)
return Event::pre_process_done(Status::BAD_OBJECT_TYPE, _msg.old_uri);
}
- if (!_engine.world()->serialiser()) {
+ if (!_engine.world().serialiser()) {
return Event::pre_process_done(Status::INTERNAL_ERROR);
}
- std::lock_guard<std::mutex> lock(_engine.world()->rdf_mutex());
+ std::lock_guard<std::mutex> lock(_engine.world().rdf_mutex());
if (ends_with(_msg.new_uri, ".ingen") || ends_with(_msg.new_uri, ".ingen/")) {
- _engine.world()->serialiser()->write_bundle(graph, URI(_msg.new_uri));
+ _engine.world().serialiser()->write_bundle(graph, URI(_msg.new_uri));
} else {
- _engine.world()->serialiser()->start_to_file(graph->path(), _msg.new_uri);
- _engine.world()->serialiser()->serialise(graph);
- _engine.world()->serialiser()->finish();
+ _engine.world().serialiser()->start_to_file(graph->path(), _msg.new_uri);
+ _engine.world().serialiser()->serialise(graph);
+ _engine.world().serialiser()->finish();
}
return Event::pre_process_done(Status::SUCCESS);
@@ -163,11 +163,11 @@ Copy::engine_to_filesystem(PreProcessContext& ctx)
bool
Copy::filesystem_to_engine(PreProcessContext& ctx)
{
- if (!_engine.world()->parser()) {
+ if (!_engine.world().parser()) {
return Event::pre_process_done(Status::INTERNAL_ERROR);
}
- std::lock_guard<std::mutex> lock(_engine.world()->rdf_mutex());
+ std::lock_guard<std::mutex> lock(_engine.world().rdf_mutex());
// Old URI is a filesystem path and new URI is a path within the engine
const std::string src_path(_msg.old_uri.path());
@@ -179,8 +179,8 @@ Copy::filesystem_to_engine(PreProcessContext& ctx)
dst_symbol = Raul::Symbol(dst_path.symbol());
}
- _engine.world()->parser()->parse_file(
- *_engine.world(), *_engine.world()->interface(), src_path,
+ _engine.world().parser()->parse_file(
+ _engine.world(), *_engine.world().interface(), src_path,
dst_parent, dst_symbol);
return Event::pre_process_done(Status::SUCCESS);
diff --git a/src/server/events/CreateBlock.cpp b/src/server/events/CreateBlock.cpp
index fabdbd85..c193a8b5 100644
--- a/src/server/events/CreateBlock.cpp
+++ b/src/server/events/CreateBlock.cpp
@@ -53,7 +53,7 @@ CreateBlock::pre_process(PreProcessContext& ctx)
{
typedef Properties::const_iterator iterator;
- const ingen::URIs& uris = _engine.world()->uris();
+ const ingen::URIs& uris = _engine.world().uris();
const SPtr<Store> store = _engine.store();
// Check sanity of target path
diff --git a/src/server/events/CreateGraph.cpp b/src/server/events/CreateGraph.cpp
index 27781cbc..bd7079d9 100644
--- a/src/server/events/CreateGraph.cpp
+++ b/src/server/events/CreateGraph.cpp
@@ -54,7 +54,7 @@ CreateGraph::~CreateGraph()
void
CreateGraph::build_child_events()
{
- const ingen::URIs& uris = _engine.world()->uris();
+ const ingen::URIs& uris = _engine.world().uris();
// Properties common to both ports
Properties control_properties;
@@ -111,7 +111,7 @@ CreateGraph::pre_process(PreProcessContext& ctx)
}
}
- const ingen::URIs& uris = _engine.world()->uris();
+ const ingen::URIs& uris = _engine.world().uris();
typedef Properties::const_iterator iterator;
diff --git a/src/server/events/CreatePort.cpp b/src/server/events/CreatePort.cpp
index a79c85ef..c27a8ac6 100644
--- a/src/server/events/CreatePort.cpp
+++ b/src/server/events/CreatePort.cpp
@@ -51,7 +51,7 @@ CreatePort::CreatePort(Engine& engine,
, _engine_port(nullptr)
, _properties(properties)
{
- const ingen::URIs& uris = _engine.world()->uris();
+ const ingen::URIs& uris = _engine.world().uris();
typedef Properties::const_iterator Iterator;
typedef std::pair<Iterator, Iterator> Range;
@@ -77,7 +77,7 @@ 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 (uris.forge.is_uri(i->second)) {
- _buf_type = _engine.world()->uri_map().map_uri(
+ _buf_type = _engine.world().uri_map().map_uri(
uris.forge.str(i->second, false));
}
}
@@ -107,7 +107,7 @@ CreatePort::pre_process(PreProcessContext& ctx)
return Event::pre_process_done(Status::CREATION_FAILED, _path);
}
- const URIs& uris = _engine.world()->uris();
+ const URIs& uris = _engine.world().uris();
BufferFactory& bufs = *_engine.buffer_factory();
const uint32_t buf_size = bufs.default_size(_buf_type);
const int32_t old_n_ports = _graph->num_ports_non_rt();
@@ -130,7 +130,7 @@ CreatePort::pre_process(PreProcessContext& ctx)
// No index given, append
index = old_n_ports;
index_i = _properties.emplace(uris.lv2_index,
- _engine.world()->forge().make(index));
+ _engine.world().forge().make(index));
}
const PropIter poly_i = _properties.find(uris.ingen_polyphonic);
diff --git a/src/server/events/Delete.cpp b/src/server/events/Delete.cpp
index ff9f32b4..4e1aa69b 100644
--- a/src/server/events/Delete.cpp
+++ b/src/server/events/Delete.cpp
@@ -60,7 +60,7 @@ Delete::~Delete()
bool
Delete::pre_process(PreProcessContext& ctx)
{
- const ingen::URIs& uris = _engine.world()->uris();
+ const ingen::URIs& uris = _engine.world().uris();
if (_path.is_root() || _path == "/control" || _path == "/notify") {
return Event::pre_process_done(Status::NOT_DELETABLE, _path);
}
@@ -187,7 +187,7 @@ Delete::post_process()
void
Delete::undo(Interface& target)
{
- const ingen::URIs& uris = _engine.world()->uris();
+ const ingen::URIs& uris = _engine.world().uris();
ingen::Forge& forge = _engine.buffer_factory()->forge();
auto i = _removed_objects.find(_path);
diff --git a/src/server/events/Delta.cpp b/src/server/events/Delta.cpp
index 7404aea6..da957fd3 100644
--- a/src/server/events/Delta.cpp
+++ b/src/server/events/Delta.cpp
@@ -117,7 +117,7 @@ Delta::init()
}
// Set atomic execution if polyphony is to be changed
- const ingen::URIs& uris = _engine.world()->uris();
+ const ingen::URIs& uris = _engine.world().uris();
if (_properties.count(uris.ingen_polyphonic) ||
_properties.count(uris.ingen_polyphony)) {
_block = true;
@@ -171,7 +171,7 @@ get_file_node(LilvWorld* lworld, const URIs& uris, const Atom& value)
bool
Delta::pre_process(PreProcessContext& ctx)
{
- const ingen::URIs& uris = _engine.world()->uris();
+ const ingen::URIs& uris = _engine.world().uris();
const bool is_graph_object = uri_is_path(_subject);
const bool is_client = (_subject == "ingen:/clients/this");
@@ -189,11 +189,11 @@ Delta::pre_process(PreProcessContext& ctx)
const auto p = _properties.find(uris.lv2_prototype);
if (p == _properties.end()) {
return Event::pre_process_done(Status::BAD_REQUEST, _subject);
- } else if (!_engine.world()->forge().is_uri(p->second)) {
+ } else if (!_engine.world().forge().is_uri(p->second)) {
return Event::pre_process_done(Status::BAD_REQUEST, _subject);
}
- const URI prot(_engine.world()->forge().str(p->second, false));
+ const URI prot(_engine.world().forge().str(p->second, false));
if (!uri_is_path(prot)) {
return Event::pre_process_done(Status::BAD_URI, _subject);
}
@@ -271,7 +271,7 @@ Delta::pre_process(PreProcessContext& ctx)
_removed.emplace(key, value);
_object->remove_property(key, value);
} else if (is_engine && key == uris.ingen_loadedBundle) {
- LilvWorld* lworld = _engine.world()->lilv_world();
+ LilvWorld* lworld = _engine.world().lilv_world();
LilvNode* bundle = get_file_node(lworld, uris, value);
if (bundle) {
for (const auto& p : _engine.block_factory()->plugins()) {
@@ -440,7 +440,7 @@ Delta::pre_process(PreProcessContext& ctx)
_engine.broadcaster()->set_broadcast(
_request_client, value.get<int32_t>());
} else if (is_engine && key == uris.ingen_loadedBundle) {
- LilvWorld* lworld = _engine.world()->lilv_world();
+ LilvWorld* lworld = _engine.world().lilv_world();
LilvNode* bundle = get_file_node(lworld, uris, value);
if (bundle) {
lilv_world_load_bundle(lworld, bundle);
@@ -481,7 +481,7 @@ Delta::execute(RunContext& context)
return;
}
- const ingen::URIs& uris = _engine.world()->uris();
+ const ingen::URIs& uris = _engine.world().uris();
if (_create_event) {
_create_event->set_time(_time);
diff --git a/src/server/events/Get.cpp b/src/server/events/Get.cpp
index ad412beb..6074ea27 100644
--- a/src/server/events/Get.cpp
+++ b/src/server/events/Get.cpp
@@ -88,7 +88,7 @@ Get::post_process()
_engine.broadcaster()->send_plugins_to(_request_client.get(), _plugins);
} else if (_msg.subject == "ingen:/engine") {
// TODO: Keep a proper RDF model of the engine
- URIs& uris = _engine.world()->uris();
+ URIs& uris = _engine.world().uris();
Properties props = {
{ uris.param_sampleRate,
uris.forge.make(int32_t(_engine.sample_rate())) },
diff --git a/src/server/events/SetPortValue.cpp b/src/server/events/SetPortValue.cpp
index fa36d739..4c879682 100644
--- a/src/server/events/SetPortValue.cpp
+++ b/src/server/events/SetPortValue.cpp
@@ -52,7 +52,7 @@ SetPortValue::SetPortValue(Engine& engine,
bool
SetPortValue::pre_process(PreProcessContext& ctx)
{
- ingen::URIs& uris = _engine.world()->uris();
+ ingen::URIs& uris = _engine.world().uris();
if (_port->is_output()) {
return Event::pre_process_done(Status::DIRECTION_MISMATCH, _port->path());
}
@@ -60,7 +60,7 @@ SetPortValue::pre_process(PreProcessContext& ctx)
if (!_activity) {
// Set value metadata (does not affect buffers)
_port->set_value(_value);
- _port->set_property(_engine.world()->uris().ingen_value, _value);
+ _port->set_property(_engine.world().uris().ingen_value, _value);
}
_binding = _engine.control_bindings()->port_binding(_port);
@@ -90,7 +90,7 @@ SetPortValue::apply(RunContext& context)
return;
}
- ingen::URIs& uris = _engine.world()->uris();
+ ingen::URIs& uris = _engine.world().uris();
Buffer* buf = _port->buffer(0).get();
if (_buffer) {
@@ -129,7 +129,7 @@ SetPortValue::post_process()
if (respond() == Status::SUCCESS && !_activity) {
_engine.broadcaster()->set_property(
_port->uri(),
- _engine.world()->uris().ingen_value,
+ _engine.world().uris().ingen_value,
_value);
}
}