From dfad81a3c8aee40a515f0ecefb0180a86368b54a Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sat, 23 Feb 2013 20:07:09 +0000 Subject: 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 --- src/server/BlockFactory.cpp | 6 +++--- src/server/ControlBindings.cpp | 2 +- src/server/Engine.cpp | 4 ++-- src/server/GraphImpl.cpp | 4 ++-- src/server/JackDriver.cpp | 8 ++++---- src/server/LV2Block.cpp | 12 ++++++------ src/server/ingen_lv2.cpp | 7 +++---- 7 files changed, 21 insertions(+), 22 deletions(-) (limited to 'src/server') diff --git a/src/server/BlockFactory.cpp b/src/server/BlockFactory.cpp index a174c270..56fefd3f 100644 --- a/src/server/BlockFactory.cpp +++ b/src/server/BlockFactory.cpp @@ -142,7 +142,7 @@ BlockFactory::load_lv2_plugins() if (!_world->lv2_features().is_supported(feature)) { supported = false; _world->log().warn( - Raul::fmt("Ignoring <%1%>; required feature <%2%>\n") + fmt("Ignoring <%1%>; required feature <%2%>\n") % uri % feature); break; } @@ -154,7 +154,7 @@ BlockFactory::load_lv2_plugins() // Ignore plugins that are missing ports if (!lilv_plugin_get_port_by_index(lv2_plug, 0)) { _world->log().warn( - Raul::fmt("Ignoring <%1%>; missing or corrupt ports\n") % uri); + fmt("Ignoring <%1%>; missing or corrupt ports\n") % uri); continue; } @@ -170,7 +170,7 @@ BlockFactory::load_lv2_plugins() } if (!supported) { _world->log().warn( - Raul::fmt("Ignoring <%1%>; unsupported port <%2%>\n") + fmt("Ignoring <%1%>; unsupported port <%2%>\n") % uri % lilv_node_as_string( lilv_port_get_symbol(lv2_plug, port))); break; diff --git a/src/server/ControlBindings.cpp b/src/server/ControlBindings.cpp index 60e5c4e0..5a633afc 100644 --- a/src/server/ControlBindings.cpp +++ b/src/server/ControlBindings.cpp @@ -97,7 +97,7 @@ ControlBindings::binding_key(const Atom& binding) const } } } else if (binding.type()) { - _engine.log().error(Raul::fmt("Unknown binding type %1%\n") % binding.type()); + _engine.log().error(fmt("Unknown binding type %1%\n") % binding.type()); } return key; } diff --git a/src/server/Engine.cpp b/src/server/Engine.cpp index ce253b75..2e7a942a 100644 --- a/src/server/Engine.cpp +++ b/src/server/Engine.cpp @@ -340,14 +340,14 @@ Engine::process_events() void Engine::register_client(const Raul::URI& uri, SPtr client) { - log().info(Raul::fmt("Registering client <%1%>\n") % uri.c_str()); + log().info(fmt("Registering client <%1%>\n") % uri.c_str()); _broadcaster->register_client(uri, client); } bool Engine::unregister_client(const Raul::URI& uri) { - log().info(Raul::fmt("Unregistering client <%1%>\n") % uri.c_str()); + log().info(fmt("Unregistering client <%1%>\n") % uri.c_str()); return _broadcaster->unregister_client(uri); } diff --git a/src/server/GraphImpl.cpp b/src/server/GraphImpl.cpp index 8621106f..f25dcc81 100644 --- a/src/server/GraphImpl.cpp +++ b/src/server/GraphImpl.cpp @@ -240,7 +240,7 @@ GraphImpl::create_port(BufferFactory& bufs, bool polyphonic) { if (type == PortType::UNKNOWN) { - bufs.engine().log().error(Raul::fmt("Unknown port type %1%\n") + bufs.engine().log().error(fmt("Unknown port type %1%\n") % type.uri()); return NULL; } @@ -333,7 +333,7 @@ GraphImpl::compile() } if (compiled_graph->size() != _blocks.size()) { - _engine.log().error(Raul::fmt("Failed to compile graph %1%\n") % _path); + _engine.log().error(fmt("Failed to compile graph %1%\n") % _path); delete compiled_graph; return NULL; } diff --git a/src/server/JackDriver.cpp b/src/server/JackDriver.cpp index 6a7d7ae9..ad68b64d 100644 --- a/src/server/JackDriver.cpp +++ b/src/server/JackDriver.cpp @@ -92,7 +92,7 @@ JackDriver::attach(const std::string& server_name, _client = jack_client_open(client_name.c_str(), JackSessionID, NULL, uuid.c_str()); - _engine.log().info(Raul::fmt("Connected to JACK as `%1%' (UUID `%2%')\n") + _engine.log().info(fmt("Connected to JACK as `%1%' (UUID `%2%')\n") % client_name.c_str() % uuid); } #endif @@ -102,7 +102,7 @@ JackDriver::attach(const std::string& server_name, if ((_client = jack_client_open(client_name.c_str(), JackServerName, NULL, server_name.c_str()))) { - _engine.log().info(Raul::fmt("Connected to JACK server `%1%'\n") + _engine.log().info(fmt("Connected to JACK server `%1%'\n") % server_name); } } @@ -163,7 +163,7 @@ JackDriver::activate() _engine.log().error("Could not activate Jack client, aborting\n"); exit(EXIT_FAILURE); } else { - _engine.log().info(Raul::fmt("Activated Jack client `%1%'\n") % + _engine.log().info(fmt("Activated Jack client `%1%'\n") % world->conf().option("jack-name").ptr()); } } @@ -467,7 +467,7 @@ JackDriver::_block_length_cb(jack_nframes_t nframes) void JackDriver::_session_cb(jack_session_event_t* event) { - _engine.log().info(Raul::fmt("Jack session save to %1%\n") % event->session_dir); + _engine.log().info(fmt("Jack session save to %1%\n") % event->session_dir); const string cmd = (boost::format("ingen -eg -n %1% -u %2% -l ${SESSION_DIR}") % jack_get_client_name(_client) diff --git a/src/server/LV2Block.cpp b/src/server/LV2Block.cpp index 66ac0d70..797cc81f 100644 --- a/src/server/LV2Block.cpp +++ b/src/server/LV2Block.cpp @@ -80,7 +80,7 @@ LV2Block::make_instance(URIs& uris, if (!inst) { parent_graph()->engine().log().error( - Raul::fmt("Failed to instantiate <%1%>\n") + fmt("Failed to instantiate <%1%>\n") % _lv2_plugin->uri().c_str()); return SPtr(); } @@ -132,13 +132,13 @@ LV2Block::make_instance(URIs& uris, port->set_type(PortType::CV, 0); } else { parent_graph()->engine().log().error( - Raul::fmt("%1% auto-morphed to unknown type %2%\n") + fmt("%1% auto-morphed to unknown type %2%\n") % port->path().c_str() % type); return SPtr(); } } else { parent_graph()->engine().log().error( - Raul::fmt("Failed to get auto-morphed type of %1%\n") + fmt("Failed to get auto-morphed type of %1%\n") % port->path().c_str()); } } @@ -284,7 +284,7 @@ LV2Block::instantiate(BufferFactory& bufs) uint32_t port_buffer_size = bufs.default_size(buffer_type); if (port_buffer_size == 0) { parent_graph()->engine().log().error( - Raul::fmt("<%1%> port `%2%' has unknown buffer type\n") + fmt("<%1%> port `%2%' has unknown buffer type\n") % _lv2_plugin->uri().c_str() % port_sym.c_str()); ret = false; break; @@ -333,7 +333,7 @@ LV2Block::instantiate(BufferFactory& bufs) if (port_type == PortType::UNKNOWN || direction == UNKNOWN) { parent_graph()->engine().log().error( - Raul::fmt("<%1%> port `%2%' has unknown type or direction\n") + fmt("<%1%> port `%2%' has unknown type or direction\n") % _lv2_plugin->uri().c_str() % port_sym.c_str()); ret = false; break; @@ -455,7 +455,7 @@ LV2Block::work(uint32_t size, const void* data) LV2_Handle inst = lilv_instance_get_handle(instance(0)); if (_worker_iface->work(inst, work_respond, this, size, data)) { parent_graph()->engine().log().error( - Raul::fmt("Error calling %1% work method\n") % _path); + fmt("Error calling %1% work method\n") % _path); } } } diff --git a/src/server/ingen_lv2.cpp b/src/server/ingen_lv2.cpp index 29d6d8c6..0f3c2092 100644 --- a/src/server/ingen_lv2.cpp +++ b/src/server/ingen_lv2.cpp @@ -505,7 +505,7 @@ ingen_instantiate(const LV2_Descriptor* descriptor, } if (!graph) { - const std::string msg((Raul::fmt("Could not find graph %1%\n") + const std::string msg((fmt("Could not find graph %1%\n") % descriptor->URI).str()); if (log) { log->vprintf(log->handle, @@ -551,7 +551,7 @@ ingen_instantiate(const LV2_Descriptor* descriptor, } plugin->world->log().info( - Raul::fmt("Block: %1% frames, Sequence: %2% bytes\n") + fmt("Block: %1% frames, Sequence: %2% bytes\n") % block_length % seq_size); plugin->world->conf().set( "queue-size", @@ -609,8 +609,7 @@ ingen_connect_port(LV2_Handle instance, uint32_t port, void* data) if (port < driver->ports().size()) { driver->ports().at(port)->set_buffer(data); } else { - engine->log().error(Raul::fmt("Connect to non-existent port %1%\n") - % port); + engine->log().error(fmt("Connect to non-existent port %1%\n") % port); } } -- cgit v1.2.1