diff options
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/App.cpp | 2 | ||||
| -rw-r--r-- | src/gui/ConnectWindow.cpp | 9 | ||||
| -rw-r--r-- | src/gui/wscript | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/src/gui/App.cpp b/src/gui/App.cpp index 4ed01931..fc8ca916 100644 --- a/src/gui/App.cpp +++ b/src/gui/App.cpp @@ -26,6 +26,7 @@ #include "flowcanvas/Connection.hpp" #include "ingen/ServerInterface.hpp" +#include "ingen/EngineBase.hpp" #include "ingen/client/ClientStore.hpp" #include "ingen/client/ObjectModel.hpp" #include "ingen/client/PatchModel.hpp" @@ -35,7 +36,6 @@ #include "raul/Path.hpp" #include "raul/log.hpp" -#include "server/Engine.hpp" #include "ingen/shared/LV2URIMap.hpp" #include "ingen/shared/World.hpp" 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(); diff --git a/src/gui/wscript b/src/gui/wscript index bac2127d..a44b0b66 100644 --- a/src/gui/wscript +++ b/src/gui/wscript @@ -5,7 +5,7 @@ import waflib.Utils as Utils def build(bld): obj = bld(features = 'cxx cxxshlib', export_includes = ['../../include'], - includes = ['..', '../..', '../../include'], + includes = ['../..', '../../include'], name = 'libingen_gui', target = 'ingen_gui', install_path = '${LIBDIR}', |