summaryrefslogtreecommitdiffstats
path: root/src/JackDriver.cpp
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2020-11-27 18:56:29 +0100
committerDavid Robillard <d@drobilla.net>2020-11-27 21:52:17 +0100
commit320f988a5ee586235f785b15028c7ef777e981a0 (patch)
treee518cc231f1872091c3a808b93a1385957ec1214 /src/JackDriver.cpp
parentdbe6899651ac929f59af160dd07aaf6bda079b23 (diff)
downloadpatchage-320f988a5ee586235f785b15028c7ef777e981a0.tar.gz
patchage-320f988a5ee586235f785b15028c7ef777e981a0.tar.bz2
patchage-320f988a5ee586235f785b15028c7ef777e981a0.zip
Use prettier names for log methods
Diffstat (limited to 'src/JackDriver.cpp')
-rw-r--r--src/JackDriver.cpp44
1 files changed, 22 insertions, 22 deletions
diff --git a/src/JackDriver.cpp b/src/JackDriver.cpp
index 8a44d93..ecb868a 100644
--- a/src/JackDriver.cpp
+++ b/src/JackDriver.cpp
@@ -75,7 +75,7 @@ JackDriver::attach(bool launch_daemon)
(!launch_daemon) ? JackNoStartServer : JackNullOption;
_client = jack_client_open("Patchage", options, nullptr);
if (_client == nullptr) {
- _log.error_msg("Jack: Unable to create client.");
+ _log.error("Jack: Unable to create client.");
_is_activated = false;
} else {
jack_client_t* const client = _client;
@@ -94,9 +94,9 @@ JackDriver::attach(bool launch_daemon)
_is_activated = true;
signal_attached.emit();
std::stringstream ss;
- _log.info_msg("Jack: Attached.");
+ _log.info("Jack: Attached.");
} else {
- _log.error_msg("Jack: Client activation failed.");
+ _log.error("Jack: Client activation failed.");
_is_activated = false;
}
}
@@ -114,7 +114,7 @@ JackDriver::detach()
}
_is_activated = false;
signal_detached.emit();
- _log.info_msg("Jack: Detached.");
+ _log.info("Jack: Detached.");
}
static bool
@@ -143,8 +143,8 @@ JackDriver::create_port_view(Patchage* patchage, const PortID& id)
jack_port_t* jack_port = jack_port_by_id(_client, id.id.jack_id);
if (!jack_port) {
- _log.error_msg(fmt::format("Jack: Failed to find port with ID `{}'.",
- id.id.jack_id));
+ _log.error(fmt::format("Jack: Failed to find port with ID `{}'.",
+ id.id.jack_id));
return nullptr;
}
@@ -172,9 +172,9 @@ JackDriver::create_port_view(Patchage* patchage, const PortID& id)
}
if (parent->get_port(port_name)) {
- _log.error_msg(fmt::format("Jack: Module `{}' already has port `{}'.",
- module_name,
- port_name));
+ _log.error(fmt::format("Jack: Module `{}' already has port `{}'.",
+ module_name,
+ port_name));
return nullptr;
}
@@ -245,9 +245,9 @@ JackDriver::create_port(PatchageModule& parent,
}
#endif
} else {
- _log.warning_msg(fmt::format("Jack: Port `{}' has unknown type `{}'.",
- jack_port_name(port),
- type_str));
+ _log.warning(fmt::format("Jack: Port `{}' has unknown type `{}'.",
+ jack_port_name(port),
+ type_str));
return nullptr;
}
@@ -438,11 +438,11 @@ JackDriver::connect(PatchagePort* src_port, PatchagePort* dst_port)
_client, src_port->full_name().c_str(), dst_port->full_name().c_str());
if (result == 0) {
- _log.info_msg(std::string("Jack: Connected ") + src_port->full_name() +
- " => " + dst_port->full_name());
+ _log.info(std::string("Jack: Connected ") + src_port->full_name() +
+ " => " + dst_port->full_name());
} else {
- _log.error_msg(std::string("Jack: Unable to connect ") +
- src_port->full_name() + " => " + dst_port->full_name());
+ _log.error(std::string("Jack: Unable to connect ") +
+ src_port->full_name() + " => " + dst_port->full_name());
}
return (!result);
@@ -464,11 +464,11 @@ JackDriver::disconnect(PatchagePort* const src_port,
_client, src_port->full_name().c_str(), dst_port->full_name().c_str());
if (result == 0) {
- _log.info_msg(std::string("Jack: Disconnected ") +
- src_port->full_name() + " => " + dst_port->full_name());
+ _log.info(std::string("Jack: Disconnected ") + src_port->full_name() +
+ " => " + dst_port->full_name());
} else {
- _log.error_msg(std::string("Jack: Unable to disconnect ") +
- src_port->full_name() + " => " + dst_port->full_name());
+ _log.error(std::string("Jack: Unable to disconnect ") +
+ src_port->full_name() + " => " + dst_port->full_name());
}
return (!result);
@@ -545,7 +545,7 @@ JackDriver::jack_shutdown_cb(void* jack_driver)
{
assert(jack_driver);
auto* me = static_cast<JackDriver*>(jack_driver);
- me->_log.info_msg("Jack: Shutdown.");
+ me->_log.info("Jack: Shutdown.");
std::lock_guard<std::mutex> lock{me->_shutdown_mutex};
@@ -612,7 +612,7 @@ JackDriver::set_buffer_size(jack_nframes_t size)
}
if (jack_set_buffer_size(_client, size)) {
- _log.error_msg("[JACK] Unable to set buffer size");
+ _log.error("[JACK] Unable to set buffer size");
return false;
}