Hopefully fixed the engine loading problem on Raspi.

pull/1/head
Holger Wirtz 8 years ago
parent 54b7bb74e3
commit 79b8540855
  1. 2
      src/Dexed.ttl
  2. 3
      src/EngineMkI.cpp
  3. 4
      src/dexed.cpp
  4. 2
      src/msfa/controllers.h

@ -65,7 +65,7 @@
lv2:index 5 ; lv2:index 5 ;
lv2:symbol "engine" ; lv2:symbol "engine" ;
lv2:name "ENGINE" ; lv2:name "ENGINE" ;
lv2:default 2 ; lv2:default 1 ;
lv2:minimum 1 ; lv2:minimum 1 ;
lv2:maximum 3 ; lv2:maximum 3 ;
lv2:portProperty lv2:enumeration, lv2:integer ; lv2:portProperty lv2:enumeration, lv2:integer ;

@ -76,6 +76,7 @@ static inline uint16_t sinLog(uint16_t phi) {
} }
EngineMkI::EngineMkI() { EngineMkI::EngineMkI() {
TRACE("Hi");
float bitReso = SINLOG_TABLESIZE; float bitReso = SINLOG_TABLESIZE;
for(int i=0;i<SINLOG_TABLESIZE;i++) { for(int i=0;i<SINLOG_TABLESIZE;i++) {
@ -117,6 +118,8 @@ EngineMkI::EngineMkI() {
TRACE("SINEXTTABLE: %s", buffer); TRACE("SINEXTTABLE: %s", buffer);
TRACE("****************************************"); TRACE("****************************************");
#endif #endif
TRACE("Bye");
} }
inline int32_t mkiSin(int32_t phase, uint16_t env) { inline int32_t mkiSin(int32_t phase, uint16_t env) {

@ -76,7 +76,7 @@ void Dexed::set_params(void)
setMonoMode(bool(*p(p_unisono))); setMonoMode(bool(*p(p_unisono)));
// Dexed-Engine // 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); setEngineType(uint8_t(*p(p_engine))-1);
refreshVoice=true; refreshVoice=true;
@ -665,7 +665,7 @@ void Dexed::init(double rate)
controllers.breath_cc = 0; controllers.breath_cc = 0;
controllers.aftertouch_cc = 0; controllers.aftertouch_cc = 0;
setEngineType(DEXED_ENGINE_MARKI); //setEngineType(DEXED_ENGINE_MARKI);
setMonoMode(false); setMonoMode(false);
sustain = false; sustain = false;

@ -119,7 +119,7 @@ public:
TRACE("amp_mod %d pitch_mod %d", amp_mod, pitch_mod); TRACE("amp_mod %d pitch_mod %d", amp_mod, pitch_mod);
} }
FmCore *core; FmCore *core=NULL;
}; };
#endif // __CONTROLLERS_H #endif // __CONTROLLERS_H

Loading…
Cancel
Save