summaryrefslogtreecommitdiffstats
path: root/src/client/ClientStore.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/client/ClientStore.cpp')
-rw-r--r--src/client/ClientStore.cpp43
1 files changed, 20 insertions, 23 deletions
diff --git a/src/client/ClientStore.cpp b/src/client/ClientStore.cpp
index ad3b3c0d..1f71bf61 100644
--- a/src/client/ClientStore.cpp
+++ b/src/client/ClientStore.cpp
@@ -70,7 +70,7 @@ ClientStore::add_object(SPtr<ObjectModel> object)
(*this)[object->path()] = object;
_signal_new_object.emit(object);
} else {
- _log.error(fmt("Object %1% with no parent\n") % object->path());
+ _log.error("Object %1% with no parent\n", object->path());
}
} else {
(*this)[object->path()] = object;
@@ -252,14 +252,14 @@ ClientStore::operator()(const Put& msg)
const Iterator l = properties.find(_uris.rdfs_label);
SPtr<PluginModel> plug;
if (p == properties.end()) {
- _log.error(fmt("Preset <%1%> with no plugin\n") % uri.c_str());
+ _log.error("Preset <%1%> with no plugin\n", uri.c_str());
} else if (l == properties.end()) {
- _log.error(fmt("Preset <%1%> with no label\n") % uri.c_str());
+ _log.error("Preset <%1%> with no label\n", uri.c_str());
} else if (l->second.type() != _uris.forge.String) {
- _log.error(fmt("Preset <%1%> label is not a string\n") % uri.c_str());
+ _log.error("Preset <%1%> label is not a string\n", uri.c_str());
} else if (!(plug = _plugin(p->second))) {
- _log.error(fmt("Preset <%1%> for unknown plugin %2%\n")
- % uri.c_str() % _uris.forge.str(p->second, true));
+ _log.error("Preset <%1%> for unknown plugin %2%\n",
+ uri.c_str(), _uris.forge.str(p->second, true));
} else {
plug->add_preset(uri, l->second.ptr<char>());
}
@@ -274,8 +274,7 @@ ClientStore::operator()(const Put& msg)
}
if (!uri_is_path(uri)) {
- _log.error(fmt("Put for unknown subject <%1%>\n")
- % uri.c_str());
+ _log.error("Put for unknown subject <%1%>\n", uri.c_str());
return;
}
@@ -315,7 +314,7 @@ ClientStore::operator()(const Put& msg)
bm->set_properties(properties);
add_object(bm);
} else {
- _log.warn(fmt("Block %1% has no prototype\n") % path.c_str());
+ _log.warn("Block %1% has no prototype\n", path.c_str());
}
} else if (is_port) {
PortModel::Direction pdir = (is_output)
@@ -331,7 +330,7 @@ ClientStore::operator()(const Put& msg)
p->set_properties(properties);
add_object(p);
} else {
- _log.warn(fmt("Ignoring %1% of unknown type\n") % path.c_str());
+ _log.warn("Ignoring %1% of unknown type\n", path.c_str());
}
}
@@ -345,8 +344,7 @@ ClientStore::operator()(const Delta& msg)
}
if (!uri_is_path(uri)) {
- _log.error(fmt("Delta for unknown subject <%1%>\n")
- % uri.c_str());
+ _log.error("Delta for unknown subject <%1%>\n", uri.c_str());
return;
}
@@ -357,7 +355,7 @@ ClientStore::operator()(const Delta& msg)
obj->remove_properties(msg.remove);
obj->add_properties(msg.add);
} else {
- _log.warn(fmt("Failed to find object `%1%'\n") % path.c_str());
+ _log.warn("Failed to find object `%1%'\n", path.c_str());
}
}
@@ -369,8 +367,8 @@ ClientStore::operator()(const SetProperty& msg)
const auto& value = msg.value;
if (subject_uri == URI("ingen:/engine")) {
- _log.info(fmt("Engine property <%1%> = %2%\n")
- % predicate.c_str() % _uris.forge.str(value, false));
+ _log.info("Engine property <%1%> = %2%\n",
+ predicate.c_str(), _uris.forge.str(value, false));
return;
}
SPtr<Resource> subject = _resource(subject_uri);
@@ -387,8 +385,8 @@ ClientStore::operator()(const SetProperty& msg)
if (plugin) {
plugin->set_property(predicate, value);
} else if (predicate != _uris.ingen_activity) {
- _log.warn(fmt("Property <%1%> for unknown object %2%\n")
- % predicate.c_str() % subject_uri.c_str());
+ _log.warn("Property <%1%> for unknown object %2%\n",
+ predicate.c_str(), subject_uri.c_str());
}
}
}
@@ -416,8 +414,8 @@ ClientStore::connection_graph(const Raul::Path& tail_path,
}
if (!graph) {
- _log.error(fmt("Unable to find graph for arc %1% => %2%\n")
- % tail_path % head_path);
+ _log.error("Unable to find graph for arc %1% => %2%\n",
+ tail_path, head_path);
}
return graph;
@@ -436,8 +434,7 @@ ClientStore::attempt_connection(const Raul::Path& tail_path,
graph->add_arc(arc);
return true;
} else {
- _log.warn(fmt("Failed to connect %1% => %2%\n")
- % tail_path % head_path);
+ _log.warn("Failed to connect %1% => %2%\n", tail_path, head_path);
return false;
}
}
@@ -466,8 +463,8 @@ ClientStore::operator()(const DisconnectAll& msg)
SPtr<ObjectModel> object = _object(msg.path);
if (!graph || !object) {
- _log.error(fmt("Bad disconnect all notification %1% in %2%\n")
- % msg.path % msg.graph);
+ _log.error("Bad disconnect all notification %1% in %2%\n",
+ msg.path, msg.graph);
return;
}