summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/client/OSCEngineSender.hpp2
-rw-r--r--src/client/wscript2
-rw-r--r--src/gui/App.cpp2
-rw-r--r--src/gui/ConnectWindow.cpp9
-rw-r--r--src/gui/wscript2
-rw-r--r--src/serialisation/wscript2
-rw-r--r--src/server/HTTPClientSender.hpp2
-rw-r--r--src/server/OSCClientSender.hpp2
-rw-r--r--src/server/ingen_lv2.cpp26
-rw-r--r--src/server/wscript10
-rw-r--r--src/shared/wscript2
-rw-r--r--wscript2
12 files changed, 31 insertions, 32 deletions
diff --git a/src/client/OSCEngineSender.hpp b/src/client/OSCEngineSender.hpp
index a2e06de7..3aea974e 100644
--- a/src/client/OSCEngineSender.hpp
+++ b/src/client/OSCEngineSender.hpp
@@ -27,7 +27,7 @@
#include "raul/Deletable.hpp"
#include "ingen/ServerInterface.hpp"
-#include "shared/OSCSender.hpp"
+#include "../shared/OSCSender.hpp"
namespace Ingen {
diff --git a/src/client/wscript b/src/client/wscript
index 5238b4bf..9047859a 100644
--- a/src/client/wscript
+++ b/src/client/wscript
@@ -3,7 +3,7 @@ from waflib.extras import autowaf as autowaf
def build(bld):
obj = bld(features = 'cxx cxxshlib',
- includes = ['..', '../..', '../../include'],
+ includes = ['../..', '../../include'],
export_includes = ['../../include'],
name = 'libingen_client',
target = 'ingen_client',
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}',
diff --git a/src/serialisation/wscript b/src/serialisation/wscript
index dffe9ac0..9914327f 100644
--- a/src/serialisation/wscript
+++ b/src/serialisation/wscript
@@ -5,7 +5,7 @@ def build(bld):
obj = bld(features = 'cxx cxxshlib',
source = 'Parser.cpp Serialiser.cpp serialisation.cpp',
export_includes = ['../../include'],
- includes = ['..', '../../include'],
+ includes = ['../../include'],
name = 'libingen_serialisation',
target = 'ingen_serialisation',
install_path = '${LIBDIR}',
diff --git a/src/server/HTTPClientSender.hpp b/src/server/HTTPClientSender.hpp
index ae286af1..116f0601 100644
--- a/src/server/HTTPClientSender.hpp
+++ b/src/server/HTTPClientSender.hpp
@@ -24,7 +24,7 @@
#include "raul/Thread.hpp"
#include "ingen/ClientInterface.hpp"
-#include "shared/HTTPSender.hpp"
+#include "../shared/HTTPSender.hpp"
namespace Ingen {
diff --git a/src/server/OSCClientSender.hpp b/src/server/OSCClientSender.hpp
index 95f3ea4f..ffc3b202 100644
--- a/src/server/OSCClientSender.hpp
+++ b/src/server/OSCClientSender.hpp
@@ -25,7 +25,7 @@
#include "ingen/ClientInterface.hpp"
#include "ingen/GraphObject.hpp"
-#include "shared/OSCSender.hpp"
+#include "../shared/OSCSender.hpp"
namespace Ingen {
diff --git a/src/server/ingen_lv2.cpp b/src/server/ingen_lv2.cpp
index af13680d..9554d6d5 100644
--- a/src/server/ingen_lv2.cpp
+++ b/src/server/ingen_lv2.cpp
@@ -28,23 +28,23 @@
#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
-#include "raul/SharedPtr.hpp"
-#include "raul/Thread.hpp"
-#include "raul/log.hpp"
-
-#include "server/AudioBuffer.hpp"
-#include "server/Driver.hpp"
-#include "server/Engine.hpp"
-#include "server/PatchImpl.hpp"
-#include "server/PostProcessor.hpp"
-#include "server/ProcessContext.hpp"
-#include "server/QueuedEngineInterface.hpp"
-#include "server/ThreadManager.hpp"
#include "ingen/ServerInterface.hpp"
-#include "ingen/shared/World.hpp"
#include "ingen/serialisation/Parser.hpp"
#include "ingen/shared/Configuration.hpp"
+#include "ingen/shared/World.hpp"
#include "ingen/shared/runtime_paths.hpp"
+#include "raul/SharedPtr.hpp"
+#include "raul/Thread.hpp"
+#include "raul/log.hpp"
+
+#include "AudioBuffer.hpp"
+#include "Driver.hpp"
+#include "Engine.hpp"
+#include "PatchImpl.hpp"
+#include "PostProcessor.hpp"
+#include "ProcessContext.hpp"
+#include "QueuedEngineInterface.hpp"
+#include "ThreadManager.hpp"
/** Record of a patch in this Ingen LV2 bundle */
struct LV2Patch {
diff --git a/src/server/wscript b/src/server/wscript
index 9b486d25..92404c5c 100644
--- a/src/server/wscript
+++ b/src/server/wscript
@@ -58,7 +58,7 @@ def build(bld):
obj = bld(features = 'cxx cxxshlib',
source = core_source,
export_includes = ['../../include'],
- includes = ['.', '..', '../..', '../../include'],
+ includes = ['.', '../..', '../../include'],
name = 'libingen_server',
target = 'ingen_server',
install_path = '${LIBDIR}',
@@ -71,7 +71,7 @@ def build(bld):
source = '''HTTPClientSender.cpp
HTTPEngineReceiver.cpp
ingen_http.cpp''',
- includes = ['.', '..', '../..', '../../include'],
+ includes = ['.', '../..', '../../include'],
name = 'libingen_http',
target = 'ingen_http',
install_path = '${LIBDIR}',
@@ -83,7 +83,7 @@ def build(bld):
source = '''OSCClientSender.cpp
OSCEngineReceiver.cpp
ingen_osc.cpp''',
- includes = ['.', '..', '../..', '../../include'],
+ includes = ['.', '../..', '../../include'],
name = 'libingen_osc',
target = 'ingen_osc',
install_path = '${LIBDIR}',
@@ -93,7 +93,7 @@ def build(bld):
if bld.is_defined('HAVE_JACK'):
obj = bld(features = 'cxx cxxshlib',
source = 'JackDriver.cpp ingen_jack.cpp',
- includes = ['.', '..', '../..', '../../include'],
+ includes = ['.', '../..', '../../include'],
name = 'libingen_jack',
target = 'ingen_jack',
install_path = '${LIBDIR}',
@@ -103,7 +103,7 @@ def build(bld):
# Ingen LV2 wrapper
obj = bld(features = 'cxx cxxshlib',
source = ' ingen_lv2.cpp ',
- includes = ['.', '..', '../..', '../../include'],
+ includes = ['.', '../..', '../../include'],
name = 'libingen_lv2',
target = 'ingen_lv2',
#install_path = '${LIBDIR}',
diff --git a/src/shared/wscript b/src/shared/wscript
index 9ee7ba31..601f3286 100644
--- a/src/shared/wscript
+++ b/src/shared/wscript
@@ -4,7 +4,7 @@ from waflib.extras import autowaf as autowaf
def build(bld):
obj = bld(features = 'cxx cxxshlib',
export_includes = ['../../include'],
- includes = ['..', '../..', '../../include'],
+ includes = ['../..', '../../include'],
name = 'libingen_shared',
target = 'ingen_shared',
vnum = '0.0.0',
diff --git a/wscript b/wscript
index d314cd8d..b9d61244 100644
--- a/wscript
+++ b/wscript
@@ -148,7 +148,7 @@ def build(bld):
obj = bld(features = 'c cxx cxxprogram',
target = 'ingen',
source = 'src/ingen/main.cpp',
- includes = ['.', './src', '../../include'],
+ includes = ['.', '../../include'],
defines = 'VERSION="' + bld.env['INGEN_VERSION'] + '"',
use = 'libingen_shared',
install_path = '${BINDIR}')
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-28 15:40:32 +0000