diff options
author | David Robillard <d@drobilla.net> | 2011-10-21 20:21:31 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2011-10-21 20:21:31 +0000 |
commit | 4e5e040e8d3e0819c14cdc917fa79d926759f212 (patch) | |
tree | a1b4b521f5c6300f9c79096b8ac66fcceb4a8aca /src/gui/ConnectWindow.cpp | |
parent | 3500ef73d4f668897df248a11bd631e11180045c (diff) | |
download | ingen-4e5e040e8d3e0819c14cdc917fa79d926759f212.tar.gz ingen-4e5e040e8d3e0819c14cdc917fa79d926759f212.tar.bz2 ingen-4e5e040e8d3e0819c14cdc917fa79d926759f212.zip |
Clean up include paths.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3567 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/gui/ConnectWindow.cpp')
-rw-r--r-- | src/gui/ConnectWindow.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/gui/ConnectWindow.cpp b/src/gui/ConnectWindow.cpp index 760869d2..f3987779 100644 --- a/src/gui/ConnectWindow.cpp +++ b/src/gui/ConnectWindow.cpp @@ -25,13 +25,13 @@ #include "raul/log.hpp" #include "ingen-config.h" +#include "ingen/EngineBase.hpp" #include "ingen/ServerInterface.hpp" -#include "ingen/shared/Module.hpp" -#include "ingen/shared/World.hpp" -#include "server/Engine.hpp" #include "ingen/client/ClientStore.hpp" #include "ingen/client/PatchModel.hpp" #include "ingen/client/ThreadedSigClientInterface.hpp" +#include "ingen/shared/Module.hpp" +#include "ingen/shared/World.hpp" #include "App.hpp" #include "ConnectWindow.hpp" @@ -212,8 +212,7 @@ ConnectWindow::connect(bool existing) SharedPtr<SigClientInterface> client(new SigClientInterface()); - if (!((Server::Engine*)world->local_engine().get())->driver()) - world->load_module("jack"); + world->load_module("jack"); world->local_engine()->activate(); |