diff options
author | David Robillard <d@drobilla.net> | 2013-02-23 20:07:09 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2013-02-23 20:07:09 +0000 |
commit | dfad81a3c8aee40a515f0ecefb0180a86368b54a (patch) | |
tree | 0ddf00406358c4febaf18fed32e97cdd9c2f956c /src/client | |
parent | 6b6cb56b2ceab509569bfca247f108f2be5e25c0 (diff) | |
download | ingen-dfad81a3c8aee40a515f0ecefb0180a86368b54a.tar.gz ingen-dfad81a3c8aee40a515f0ecefb0180a86368b54a.tar.bz2 ingen-dfad81a3c8aee40a515f0ecefb0180a86368b54a.zip |
Remove Raul::fmt wrapper, the last vestige of boost dependency for Raul.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@5077 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/client')
-rw-r--r-- | src/client/ClientStore.cpp | 22 | ||||
-rw-r--r-- | src/client/PluginUI.cpp | 6 |
2 files changed, 14 insertions, 14 deletions
diff --git a/src/client/ClientStore.cpp b/src/client/ClientStore.cpp index b7b38df3..aabe41b0 100644 --- a/src/client/ClientStore.cpp +++ b/src/client/ClientStore.cpp @@ -243,7 +243,7 @@ ClientStore::put(const Raul::URI& uri, } if (!Node::uri_is_path(uri)) { - _log.error(Raul::fmt("Put for unknown subject <%1%>\n") + _log.error(fmt("Put for unknown subject <%1%>\n") % uri.c_str()); return; } @@ -281,7 +281,7 @@ ClientStore::put(const Raul::URI& uri, bm->set_properties(properties); add_object(bm); } else { - _log.warn(Raul::fmt("Block %1% has no plugin\n") + _log.warn(fmt("Block %1% has no plugin\n") % path.c_str()); } } else if (is_port) { @@ -296,10 +296,10 @@ ClientStore::put(const Raul::URI& uri, p->set_properties(properties); add_object(p); } else { - _log.error(Raul::fmt("Port %1% has no index\n") % path); + _log.error(fmt("Port %1% has no index\n") % path); } } else { - _log.warn(Raul::fmt("Ignoring object %1% with unknown type\n") + _log.warn(fmt("Ignoring object %1% with unknown type\n") % path.c_str()); } } @@ -329,7 +329,7 @@ ClientStore::delta(const Raul::URI& uri, } if (!Node::uri_is_path(uri)) { - _log.error(Raul::fmt("Delta for unknown subject <%1%>\n") + _log.error(fmt("Delta for unknown subject <%1%>\n") % uri.c_str()); return; } @@ -341,7 +341,7 @@ ClientStore::delta(const Raul::URI& uri, obj->remove_properties(remove); obj->add_properties(add); } else { - _log.warn(Raul::fmt("Failed to find object `%1%'\n") + _log.warn(fmt("Failed to find object `%1%'\n") % path.c_str()); } } @@ -352,7 +352,7 @@ ClientStore::set_property(const Raul::URI& subject_uri, const Atom& value) { if (subject_uri == _uris.ingen_engine) { - _log.info(Raul::fmt("Engine property <%1%> = %2%\n") + _log.info(fmt("Engine property <%1%> = %2%\n") % predicate.c_str() % _uris.forge.str(value)); return; } @@ -370,7 +370,7 @@ ClientStore::set_property(const Raul::URI& subject_uri, if (plugin) { plugin->set_property(predicate, value); } else if (predicate != _uris.ingen_activity) { - _log.warn(Raul::fmt("Property <%1%> for unknown object %2%\n") + _log.warn(fmt("Property <%1%> for unknown object %2%\n") % predicate.c_str() % subject_uri.c_str()); } } @@ -395,7 +395,7 @@ ClientStore::connection_graph(const Raul::Path& tail_path, graph = dynamic_ptr_cast<GraphModel>(_object(tail_path.parent().parent())); if (!graph) - _log.error(Raul::fmt("Unable to find graph for arc %1% => %2%\n") + _log.error(fmt("Unable to find graph for arc %1% => %2%\n") % tail_path % head_path); return graph; @@ -418,7 +418,7 @@ ClientStore::attempt_connection(const Raul::Path& tail_path, graph->add_arc(arc); return true; } else { - _log.warn(Raul::fmt("Failed to connect %1% => %2%\n") + _log.warn(fmt("Failed to connect %1% => %2%\n") % tail_path % head_path); return false; } @@ -457,7 +457,7 @@ ClientStore::disconnect_all(const Raul::Path& parent_graph, SPtr<ObjectModel> object = _object(path); if (!graph || !object) { - _log.error(Raul::fmt("Bad disconnect all notification %1% in %2%\n") + _log.error(fmt("Bad disconnect all notification %1% in %2%\n") % path % parent_graph); return; } diff --git a/src/client/PluginUI.cpp b/src/client/PluginUI.cpp index 2bee4249..b9212174 100644 --- a/src/client/PluginUI.cpp +++ b/src/client/PluginUI.cpp @@ -42,7 +42,7 @@ lv2_ui_write(SuilController controller, const BlockModel::Ports& ports = ui->block()->ports(); if (port_index >= ports.size()) { ui->world()->log().error( - Raul::fmt("%1% UI tried to write to invalid port %2%\n") + fmt("%1% UI tried to write to invalid port %2%\n") % ui->block()->plugin()->uri().c_str() % port_index); return; } @@ -55,7 +55,7 @@ lv2_ui_write(SuilController controller, if (format == 0) { if (buffer_size != 4) { ui->world()->log().error( - Raul::fmt("%1% UI wrote corrupt float with bad size\n") + fmt("%1% UI wrote corrupt float with bad size\n") % ui->block()->plugin()->uri().c_str()); return; } @@ -79,7 +79,7 @@ lv2_ui_write(SuilController controller, } else { ui->world()->log().warn( - Raul::fmt("Unknown value format %1% from LV2 UI\n") + fmt("Unknown value format %1% from LV2 UI\n") % format % ui->block()->plugin()->uri().c_str()); } } |