summaryrefslogtreecommitdiffstats
path: root/src/ingen
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-05-24 23:29:42 +0000
committerDavid Robillard <d@drobilla.net>2011-05-24 23:29:42 +0000
commitacaab5ca7ce6869b8192de4f98c9f075fd17690e (patch)
tree731f14aa5cfb03e7f8837fe0c573b2b12ce7a8b4 /src/ingen
parent881eac58c2f9bf1fcb18ef7dcda7ab025e327871 (diff)
downloadingen-acaab5ca7ce6869b8192de4f98c9f075fd17690e.tar.gz
ingen-acaab5ca7ce6869b8192de4f98c9f075fd17690e.tar.bz2
ingen-acaab5ca7ce6869b8192de4f98c9f075fd17690e.zip
Remove dependence on protocol-specific client headers in GUI code.
In other words, remove need for protocol-specific (and library dependent) headers to be in public headers... git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3318 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/ingen')
-rw-r--r--src/ingen/main.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/ingen/main.cpp b/src/ingen/main.cpp
index 997fb66e..8df67e92 100644
--- a/src/ingen/main.cpp
+++ b/src/ingen/main.cpp
@@ -45,6 +45,7 @@
#include "shared/Configuration.hpp"
#include "shared/World.hpp"
#include "shared/runtime_paths.hpp"
+#include "client/ThreadedSigClientInterface.hpp"
#ifdef WITH_BINDINGS
#include "bindings/ingen_bindings.hpp"
#endif
@@ -105,17 +106,15 @@ main(int argc, char** argv)
SharedPtr<ServerInterface> engine_interface;
Glib::thread_init();
-#if HAVE_SOUP
+#ifdef HAVE_SOUP
g_type_init();
#endif
Ingen::Shared::World* world = new Ingen::Shared::World(&conf, argc, argv);
-#if INGEN_JACK_SESSION
if (conf.option("uuid").get_string()) {
world->set_jack_uuid(conf.option("uuid").get_string());
}
-#endif
// Run engine
if (conf.option("engine").get_bool()) {
@@ -145,7 +144,7 @@ main(int argc, char** argv)
ingen_try(world->load_module("client"),
"Unable to load client module");
const char* const uri = conf.option("connect").get_string();
- ingen_try((engine_interface = world->interface(uri)),
+ ingen_try((engine_interface = world->interface(uri, SharedPtr<ClientInterface>())),
(string("Unable to create interface to `") + uri + "'").c_str());
}