summaryrefslogtreecommitdiffstats
path: root/src/World.cpp
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2012-11-21 08:44:24 +0000
committerDavid Robillard <d@drobilla.net>2012-11-21 08:44:24 +0000
commit75bec507b3815f8a101de265bd353cfdb289bc6d (patch)
tree9226a74b1144dd404fb4eae3066642f425a77f0c /src/World.cpp
parent480c0e362aec524d992ed7adaccf3c13b71e6f93 (diff)
downloadingen-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/World.cpp')
-rw-r--r--src/World.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/World.cpp b/src/World.cpp
index fa2ae1ed..f5421579 100644
--- a/src/World.cpp
+++ b/src/World.cpp
@@ -108,7 +108,17 @@ public:
, log(lv2_log, *uris)
, lilv_world(lilv_world_new())
{
+ // Parse default configuration files
+ std::list<std::string> files = conf.load_default("ingen", "options.ttl");
+ for (std::list<std::string>::const_iterator f = files.begin();
+ f != files.end();
+ ++f) {
+ log.info(Raul::fmt("Loaded configuration %1%\n") % *f);
+ }
+
+ // Parse command line options, overriding configuration file values
conf.parse(argc, argv);
+
lv2_features = new LV2Features();
lv2_features->add_feature(uri_map->urid_map_feature());
lv2_features->add_feature(uri_map->urid_unmap_feature());