summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/ConnectWindow.cpp9
-rw-r--r--src/gui/GladeFactory.cpp1
-rw-r--r--src/gui/wscript5
3 files changed, 8 insertions, 7 deletions
diff --git a/src/gui/ConnectWindow.cpp b/src/gui/ConnectWindow.cpp
index 41d26f5b..e52e83ac 100644
--- a/src/gui/ConnectWindow.cpp
+++ b/src/gui/ConnectWindow.cpp
@@ -229,16 +229,17 @@ ConnectWindow::connect(bool existing)
SharedPtr<SigClientInterface> client(new SigClientInterface());
Ingen::Driver* (*new_driver)(
- Ingen::Engine& engine,
- std::string server_name,
- jack_client_t* jack_client) = NULL;
+ Ingen::Engine& engine,
+ const std::string server_name,
+ const std::string client_name,
+ void* jack_client) = NULL;
if (!world->local_engine->audio_driver()) {
bool found = _engine_jack_module->get_symbol(
"new_jack_audio_driver", (void*&)(new_driver));
if (found) {
world->local_engine->set_driver(DataType::AUDIO,
- SharedPtr<Driver>(new_driver(*world->local_engine, "default", 0)));
+ SharedPtr<Driver>(new_driver(*world->local_engine, "default", "", 0)));
}
}
diff --git a/src/gui/GladeFactory.cpp b/src/gui/GladeFactory.cpp
index 2b4d3ec9..81640d57 100644
--- a/src/gui/GladeFactory.cpp
+++ b/src/gui/GladeFactory.cpp
@@ -18,6 +18,7 @@
#include "GladeFactory.hpp"
#include <iostream>
#include <fstream>
+#include "config.h"
using namespace std;
diff --git a/src/gui/wscript b/src/gui/wscript
index 860a21a0..c8615198 100644
--- a/src/gui/wscript
+++ b/src/gui/wscript
@@ -43,7 +43,6 @@ def build(bld):
obj.source += 'UploadPatchWindow.cpp'
obj.includes = ['.', '..', '../common']
- obj.defines = 'INGEN_DATA_DIR=\\\"' + Params.g_options.datadir + '\\\"'
obj.name = 'libingen_gui'
obj.target = 'ingen_gui'
obj.inst_dir = 'lib/ingen'
@@ -65,7 +64,7 @@ def build(bld):
''')
# GUI runtime files
- install_files(Params.g_options.datadir, '', 'ingen_gui.glade')
- install_files(Params.g_options.datadir, '', 'ingen.svg')
+ install_files(bld.env()['DATADIR'], 'ingen', 'ingen_gui.glade')
+ install_files(bld.env()['DATADIR'], 'ingen', 'ingen.svg')