summaryrefslogtreecommitdiffstats
path: root/src/ingen
diff options
context:
space:
mode:
Diffstat (limited to 'src/ingen')
-rw-r--r--src/ingen/main.cpp17
1 files changed, 13 insertions, 4 deletions
diff --git a/src/ingen/main.cpp b/src/ingen/main.cpp
index cb76f778..62c2b757 100644
--- a/src/ingen/main.cpp
+++ b/src/ingen/main.cpp
@@ -134,12 +134,12 @@ main(int argc, char** argv)
// Not loading a GUI, load network engine interfaces
if (!conf.option("gui").get_bool()) {
#ifdef HAVE_LIBLO
- ingen_try(world->load_module("osc"),
- "Unable to load OSC module");
+ ingen_try(world->load_module("osc_server"),
+ "Unable to load OSC server module");
#endif
#ifdef HAVE_SOUP
- ingen_try(world->load_module("http"),
- "Unable to load HTTP module");
+ ingen_try(world->load_module("http_server"),
+ "Unable to load HTTP server module");
#endif
}
}
@@ -148,6 +148,15 @@ main(int argc, char** argv)
if (!engine_interface) {
ingen_try(world->load_module("client"),
"Unable to load client module");
+ #ifdef HAVE_LIBLO
+ ingen_try(world->load_module("osc_client"),
+ "Unable to load OSC client module");
+ #endif
+ #ifdef HAVE_SOUP
+ ingen_try(world->load_module("http_client"),
+ "Unable to load HTTP client module");
+ #endif
+
const char* const uri = conf.option("connect").get_string();
ingen_try((engine_interface = world->interface(uri, SharedPtr<ClientInterface>())),
(string("Unable to create interface to `") + uri + "'").c_str());