summaryrefslogtreecommitdiff
path: root/muse2/synti
diff options
context:
space:
mode:
Diffstat (limited to 'muse2/synti')
-rw-r--r--muse2/synti/deicsonze/deicsonze.cpp12
-rw-r--r--muse2/synti/organ/CMakeLists.txt2
2 files changed, 11 insertions, 3 deletions
diff --git a/muse2/synti/deicsonze/deicsonze.cpp b/muse2/synti/deicsonze/deicsonze.cpp
index 2b7162f7..3dc5fafd 100644
--- a/muse2/synti/deicsonze/deicsonze.cpp
+++ b/muse2/synti/deicsonze/deicsonze.cpp
@@ -32,6 +32,8 @@
#include <stdio.h>
+#include "config.h"
+
#include "libsynti/mess.h"
#include "muse/midictrl.h"
#include "deicsonze.h"
@@ -638,14 +640,20 @@ void DeicsOnze::loadSutulaPresets()
nBank=0;
nPreset=0;
- QString presetPath(INSTPREFIX);
- presetPath += "/share/muse/presets/deicsonze/ARCH_ALIN";
+ //QString presetPath(INSTPREFIX);
+ //presetPath += "/share/muse/presets/deicsonze/ARCH_ALIN";
+ //museGlobalShare
+ QString presetPath(QString(INSTPREFIX) + QString("/") +
+ QString(SHAREINSTPREFIX) + QString("/") + // This has no prefix. Default is "share", set in top cmake script.
+ QString(INSTALL_NAME));
+ presetPath += "/presets/deicsonze/ARCH_ALIN";
file = fopen (presetPath.latin1(), "rt");
if (file == NULL) {
printf("can't open ");
printf("%s",presetPath.latin1());
printf("\n");
+ return;
}
else
{
diff --git a/muse2/synti/organ/CMakeLists.txt b/muse2/synti/organ/CMakeLists.txt
index 5bae641e..8dd67aa8 100644
--- a/muse2/synti/organ/CMakeLists.txt
+++ b/muse2/synti/organ/CMakeLists.txt
@@ -24,7 +24,7 @@ QT4_WRAP_UI3 ( organ_uis organguibase.ui )
add_library ( organ SHARED
organ.cpp
- # organgui.cpp
+ organgui.cpp
# reverb.cpp
# routing.cpp
# organgui.h