diff options
| author | David Robillard <d@drobilla.net> | 2012-11-21 08:44:24 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2012-11-21 08:44:24 +0000 |
| commit | 75bec507b3815f8a101de265bd353cfdb289bc6d (patch) | |
| tree | 9226a74b1144dd404fb4eae3066642f425a77f0c /src/server | |
| parent | 480c0e362aec524d992ed7adaccf3c13b71e6f93 (diff) | |
| download | ingen-75bec507b3815f8a101de265bd353cfdb289bc6d.tar.gz ingen-75bec507b3815f8a101de265bd353cfdb289bc6d.tar.bz2 ingen-75bec507b3815f8a101de265bd353cfdb289bc6d.zip | |
Configuration file support.
Change "jack-client" option to "jack-name".
Print more informative info log messages.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4841 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/JackDriver.cpp | 5 | ||||
| -rw-r--r-- | src/server/ingen_jack.cpp | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/server/JackDriver.cpp b/src/server/JackDriver.cpp index eb1c0894..ac3393a2 100644 --- a/src/server/JackDriver.cpp +++ b/src/server/JackDriver.cpp @@ -148,7 +148,7 @@ JackDriver::activate() if (!_client) attach(world->conf().option("jack-server").get_string(), - world->conf().option("jack-client").get_string(), NULL); + world->conf().option("jack-name").get_string(), NULL); jack_set_process_callback(_client, process_cb, this); @@ -158,7 +158,8 @@ JackDriver::activate() _engine.log().error("Could not activate Jack client, aborting\n"); exit(EXIT_FAILURE); } else { - _engine.log().info("Activated Jack client\n"); + _engine.log().info(Raul::fmt("Activated Jack client `%1%'\n") % + world->conf().option("jack-name").get_string()); } } diff --git a/src/server/ingen_jack.cpp b/src/server/ingen_jack.cpp index dd713385..c6c5e005 100644 --- a/src/server/ingen_jack.cpp +++ b/src/server/ingen_jack.cpp @@ -40,7 +40,7 @@ struct IngenJackModule : public Ingen::Module { const Configuration::Value& s = world->conf().option("jack-server"); const std::string server_name = s.is_valid() ? s.get_string() : ""; driver->attach(server_name, - world->conf().option("jack-client").get_string(), + world->conf().option("jack-name").get_string(), NULL); ((Server::Engine*)world->engine().get())->set_driver( SharedPtr<Server::Driver>(driver)); |