From 79b85408556762cd6e850d4d5bbd3d959aaa7956 Mon Sep 17 00:00:00 2001
From: Holger Wirtz <dcoredump@googlemail.com>
Date: Fri, 9 Dec 2016 14:30:36 +0000
Subject: [PATCH] Hopefully fixed the engine loading problem on Raspi.

---
 src/Dexed.ttl          | 2 +-
 src/EngineMkI.cpp      | 3 +++
 src/dexed.cpp          | 4 ++--
 src/msfa/controllers.h | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/Dexed.ttl b/src/Dexed.ttl
index c263c78..e01fb5a 100644
--- a/src/Dexed.ttl
+++ b/src/Dexed.ttl
@@ -65,7 +65,7 @@
         lv2:index 5 ;
         lv2:symbol "engine" ;
         lv2:name "ENGINE" ;
-        lv2:default 2 ;
+        lv2:default 1 ;
         lv2:minimum 1 ;
         lv2:maximum 3 ;
 	lv2:portProperty lv2:enumeration, lv2:integer ;
diff --git a/src/EngineMkI.cpp b/src/EngineMkI.cpp
index 8aac5e8..8d9d233 100644
--- a/src/EngineMkI.cpp
+++ b/src/EngineMkI.cpp
@@ -76,6 +76,7 @@ static inline uint16_t sinLog(uint16_t phi) {
 }
 
 EngineMkI::EngineMkI() {
+    TRACE("Hi");
     float bitReso = SINLOG_TABLESIZE;
     
     for(int i=0;i<SINLOG_TABLESIZE;i++) {
@@ -117,6 +118,8 @@ EngineMkI::EngineMkI() {
     TRACE("SINEXTTABLE: %s", buffer);
     TRACE("****************************************");
 #endif
+
+    TRACE("Bye");
 }
 
 inline int32_t mkiSin(int32_t phase, uint16_t env) {
diff --git a/src/dexed.cpp b/src/dexed.cpp
index 4402c87..82af3b1 100644
--- a/src/dexed.cpp
+++ b/src/dexed.cpp
@@ -76,7 +76,7 @@ void Dexed::set_params(void)
     setMonoMode(bool(*p(p_unisono)));
 
   // Dexed-Engine
-  if(getEngineType()!=uint8_t(*p(p_engine))-1)
+  if(controllers.core==NULL || getEngineType()!=uint8_t(*p(p_engine))-1)
   {
     setEngineType(uint8_t(*p(p_engine))-1);
     refreshVoice=true;
@@ -665,7 +665,7 @@ void Dexed::init(double rate)
   controllers.breath_cc = 0;
   controllers.aftertouch_cc = 0;
 
-  setEngineType(DEXED_ENGINE_MARKI);
+  //setEngineType(DEXED_ENGINE_MARKI);
   setMonoMode(false);
 
   sustain = false;
diff --git a/src/msfa/controllers.h b/src/msfa/controllers.h
index 5c5f6b5..f5583fc 100755
--- a/src/msfa/controllers.h
+++ b/src/msfa/controllers.h
@@ -119,7 +119,7 @@ public:
         TRACE("amp_mod %d pitch_mod %d", amp_mod, pitch_mod);
     }
     
-    FmCore *core;
+    FmCore *core=NULL;
 };
 
 #endif  // __CONTROLLERS_H