summaryrefslogtreecommitdiffstats
path: root/src/client
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2021-01-02 18:17:04 +0100
committerDavid Robillard <d@drobilla.net>2021-01-02 18:17:04 +0100
commitf0e33dd09a390ca946e95a6f55fea397dca0ca1f (patch)
tree8d8befb3c7196ae119efc95ed6cdf2ba9cc00c32 /src/client
parentd2143bb3298d94ebef62ed50d377e89533a02b42 (diff)
downloadingen-f0e33dd09a390ca946e95a6f55fea397dca0ca1f.tar.gz
ingen-f0e33dd09a390ca946e95a6f55fea397dca0ca1f.tar.bz2
ingen-f0e33dd09a390ca946e95a6f55fea397dca0ca1f.zip
Update for latest raul
Diffstat (limited to 'src/client')
-rw-r--r--src/client/BlockModel.cpp8
-rw-r--r--src/client/ClientStore.cpp18
-rw-r--r--src/client/ObjectModel.cpp6
-rw-r--r--src/client/PluginModel.cpp8
4 files changed, 20 insertions, 20 deletions
diff --git a/src/client/BlockModel.cpp b/src/client/BlockModel.cpp
index a6e4a0a6..cdfb3fcd 100644
--- a/src/client/BlockModel.cpp
+++ b/src/client/BlockModel.cpp
@@ -40,7 +40,7 @@ namespace client {
BlockModel::BlockModel(URIs& uris,
const std::shared_ptr<PluginModel>& plugin,
- const Raul::Path& path)
+ const raul::Path& path)
: ObjectModel(uris, path)
, _plugin_uri(plugin->uri())
, _plugin(plugin)
@@ -50,7 +50,7 @@ BlockModel::BlockModel(URIs& uris,
{
}
-BlockModel::BlockModel(URIs& uris, URI plugin_uri, const Raul::Path& path)
+BlockModel::BlockModel(URIs& uris, URI plugin_uri, const raul::Path& path)
: ObjectModel(uris, path)
, _plugin_uri(std::move(plugin_uri))
, _num_values(0)
@@ -88,7 +88,7 @@ BlockModel::remove_port(const std::shared_ptr<PortModel>& port)
}
void
-BlockModel::remove_port(const Raul::Path& port_path)
+BlockModel::remove_port(const raul::Path& port_path)
{
for (auto i = _ports.begin(); i != _ports.end(); ++i) {
if ((*i)->path() == port_path) {
@@ -152,7 +152,7 @@ BlockModel::add_port(const std::shared_ptr<PortModel>& pm)
}
std::shared_ptr<const PortModel>
-BlockModel::get_port(const Raul::Symbol& symbol) const
+BlockModel::get_port(const raul::Symbol& symbol) const
{
for (auto p : _ports) {
if (p->symbol() == symbol) {
diff --git a/src/client/ClientStore.cpp b/src/client/ClientStore.cpp
index 9c577673..d8238c8a 100644
--- a/src/client/ClientStore.cpp
+++ b/src/client/ClientStore.cpp
@@ -100,7 +100,7 @@ ClientStore::add_object(const std::shared_ptr<ObjectModel>& object)
}
std::shared_ptr<ObjectModel>
-ClientStore::remove_object(const Raul::Path& path)
+ClientStore::remove_object(const raul::Path& path)
{
// Find the object, the "top" of the tree to remove
const iterator top = find(path);
@@ -163,7 +163,7 @@ ClientStore::plugin(const URI& uri) const
}
std::shared_ptr<ObjectModel>
-ClientStore::_object(const Raul::Path& path)
+ClientStore::_object(const raul::Path& path)
{
const iterator i = find(path);
if (i == end()) {
@@ -177,7 +177,7 @@ ClientStore::_object(const Raul::Path& path)
}
std::shared_ptr<const ObjectModel>
-ClientStore::object(const Raul::Path& path) const
+ClientStore::object(const raul::Path& path) const
{
return const_cast<ClientStore*>(this)->_object(path);
}
@@ -297,7 +297,7 @@ ClientStore::operator()(const Put& msg)
return;
}
- const Raul::Path path(uri_to_path(uri));
+ const raul::Path path(uri_to_path(uri));
auto obj = std::dynamic_pointer_cast<ObjectModel>(_object(path));
if (obj) {
@@ -369,7 +369,7 @@ ClientStore::operator()(const Delta& msg)
return;
}
- const Raul::Path path(uri_to_path(uri));
+ const raul::Path path(uri_to_path(uri));
std::shared_ptr<ObjectModel> obj = _object(path);
if (obj) {
@@ -413,8 +413,8 @@ ClientStore::operator()(const SetProperty& msg)
}
std::shared_ptr<GraphModel>
-ClientStore::connection_graph(const Raul::Path& tail_path,
- const Raul::Path& head_path)
+ClientStore::connection_graph(const raul::Path& tail_path,
+ const raul::Path& head_path)
{
std::shared_ptr<GraphModel> graph;
@@ -443,8 +443,8 @@ ClientStore::connection_graph(const Raul::Path& tail_path,
}
bool
-ClientStore::attempt_connection(const Raul::Path& tail_path,
- const Raul::Path& head_path)
+ClientStore::attempt_connection(const raul::Path& tail_path,
+ const raul::Path& head_path)
{
auto tail = std::dynamic_pointer_cast<PortModel>(_object(tail_path));
auto head = std::dynamic_pointer_cast<PortModel>(_object(head_path));
diff --git a/src/client/ObjectModel.cpp b/src/client/ObjectModel.cpp
index b769d5f1..c172c445 100644
--- a/src/client/ObjectModel.cpp
+++ b/src/client/ObjectModel.cpp
@@ -32,7 +32,7 @@
namespace ingen {
namespace client {
-ObjectModel::ObjectModel(URIs& uris, const Raul::Path& path)
+ObjectModel::ObjectModel(URIs& uris, const raul::Path& path)
: Node(uris, path)
, _path(path)
, _symbol((path == "/") ? "root" : path.symbol())
@@ -100,10 +100,10 @@ ObjectModel::set(const std::shared_ptr<ObjectModel>& o)
}
void
-ObjectModel::set_path(const Raul::Path& p)
+ObjectModel::set_path(const raul::Path& p)
{
_path = p;
- _symbol = Raul::Symbol(p.is_root() ? "root" : p.symbol());
+ _symbol = raul::Symbol(p.is_root() ? "root" : p.symbol());
set_uri(path_to_uri(p));
_signal_moved.emit();
}
diff --git a/src/client/PluginModel.cpp b/src/client/PluginModel.cpp
index ca044114..4dddd147 100644
--- a/src/client/PluginModel.cpp
+++ b/src/client/PluginModel.cpp
@@ -111,7 +111,7 @@ PluginModel::get_property(const URI& key) const
}
str = str.substr(last_delim + 1);
- std::string symbol = Raul::Symbol::symbolify(str);
+ std::string symbol = raul::Symbol::symbolify(str);
set_property(_uris.lv2_symbol, _uris.forge.alloc(symbol));
return get_property(key);
}
@@ -175,14 +175,14 @@ PluginModel::add_preset(const URI& uri, const std::string& label)
_signal_preset.emit(uri, label);
}
-Raul::Symbol
+raul::Symbol
PluginModel::default_block_symbol() const
{
const Atom& name_atom = get_property(_uris.lv2_symbol);
if (name_atom.is_valid() && name_atom.type() == _uris.forge.String) {
- return Raul::Symbol::symbolify(name_atom.ptr<char>());
+ return raul::Symbol::symbolify(name_atom.ptr<char>());
} else {
- return Raul::Symbol("_");
+ return raul::Symbol("_");
}
}