Improved: Deicsonze soft synthesizer: Fixed crash, bugs, added ladspa plugins.

TODO: No plugin control automation. Log slider/entry ranges. Add delay wet/dry?

11 files changed, 683 insertions, 555 deletions

diff --git a/muse2/ChangeLog b/muse2/ChangeLog
index 30427798..a7806117 100644
--- a/muse2/ChangeLog
+++ b/muse2/ChangeLog
@@ -1,3 +1,6 @@
+17.11.2012:
+         * Improved: Deicsonze soft synthesizer: Fixed crash, bugs, added ladspa plugins. (Tim)
+           TODO: No plugin control automation. Some oddities with log slider/entry ranges. Maybe add delay wet/dry.
 15.11.2012:
          * Improved: Popup menus: Auto-breakup too-wide menus in class PopupMenu. (Tim)
            In some cases X/Qt was giving up if too wide AND/OR too many columns, menu would not appear.
diff --git a/muse2/awl/floatentry.cpp b/muse2/awl/floatentry.cpp
index 9b4b3e99..37b35152 100644
--- a/muse2/awl/floatentry.cpp
+++ b/muse2/awl/floatentry.cpp
@@ -26,6 +26,7 @@
 
 #include <QLineEdit>
 #include <QMouseEvent>
+#include <QContextMenuEvent>
 #include <QTimer>
 
 #define TIMER1    400
@@ -53,12 +54,43 @@ FloatEntry::FloatEntry(QWidget* parent)
       timer      = new QTimer(this);
       connect(timer, SIGNAL(timeout()), SLOT(repeat()));
       _value = 0.0f;
-      connect(this, SIGNAL(returnPressed()), SLOT(endEdit()));
+      //connect(this, SIGNAL(returnPressed()), SLOT(endEdit()));
+      connect(this, SIGNAL(editingFinished()), SLOT(endEdit()));
       setCursor(QCursor(Qt::ArrowCursor));
       updateValue();
       }
 
 //---------------------------------------------------------
+//   calcIncrement()
+//---------------------------------------------------------
+
+double FloatEntry::calcIncrement() const
+{
+  double dif;
+  if(_maxValue - _minValue > 0)
+    dif = _maxValue - _minValue;
+  else
+    dif = _minValue - _maxValue;
+
+  if(dif <= 10.0)
+    return 0.1;
+  else
+  if(dif <= 100.0)
+    return 1.0;
+  else
+    return 10.0;
+}
+
+//---------------------------------------------------------
+//   contextMenuEvent
+//---------------------------------------------------------
+
+void FloatEntry::contextMenuEvent(QContextMenuEvent * e)
+{
+  e->accept();
+}
+
+//---------------------------------------------------------
 //   setString
 //---------------------------------------------------------
 
@@ -114,11 +146,16 @@ void FloatEntry::valueChange()
 
 void FloatEntry::incValue(double)
       {
-      if (_value + 1.0 < _maxValue) {
-            _value = _value + 1.0;
-            updateValue();
-            valueChange();
-            }
+      if(_value >= _maxValue)
+        return;
+      double inc = calcIncrement();
+      if(_value + inc >= _maxValue)
+        //setValue(_maxValue);
+        _value = _maxValue;
+      else
+        //setValue(_value + inc);
+        _value += inc;
+      valueChange();
       }
 
 //---------------------------------------------------------
@@ -127,11 +164,16 @@ void FloatEntry::incValue(double)
 
 void FloatEntry::decValue(double)
       {
-      if (_value - 1.0 > _minValue) {
-            _value = _value - 1.0;
-            updateValue();
-            valueChange();
-            }
+      if(_value <= _minValue)
+        return;
+      double inc = calcIncrement();
+      if(_value - inc <= _minValue)
+        //setValue(_minValue);
+        _value = _minValue;
+      else
+        //setValue(_value - inc);
+        _value -= inc;
+      valueChange();
       }
 
 //---------------------------------------------------------
@@ -188,8 +230,8 @@ void FloatEntry::mousePressEvent(QMouseEvent* event)
 
 void FloatEntry::wheelEvent(QWheelEvent* event)
       {
+      event->accept();
       int delta = event->delta();
-
       if (delta < 0)
             decValue(-1.0);
       else if (delta > 0)
@@ -322,5 +364,45 @@ double FloatEntry::value() const
             rv = _value;
       return rv;
       }
+
+//---------------------------------------------------------
+//   minLogValue
+//---------------------------------------------------------
+
+//double FloatEntry::minValue() const {
+//  return _log ? pow(10.0, _minValue*0.05f) : _minValue;
+//}
+
+//---------------------------------------------------------
+//   setMinLogValue
+//---------------------------------------------------------
+
+void FloatEntry::setMinLogValue(double val) {
+  if (_log) {
+    if (val == 0.0f) _minValue = -100;
+    else _minValue = fast_log10(val) * 20.0f;
+  }
+  else _minValue = val;
+}
+
+//---------------------------------------------------------
+//   maxLogValue
+//---------------------------------------------------------
+
+//double FloatEntry::maxValue() const {
+//  return _log ? pow(10.0, _maxValue*0.05f) : _maxValue;
+//}
+
+//---------------------------------------------------------
+//   setMaxLogValue
+//---------------------------------------------------------
+
+void FloatEntry::setMaxLogValue(double val) {
+  if (_log) {
+    _maxValue = fast_log10(val) * 20.0f;
+  }
+  else _maxValue = val;
+}
+      
 }
 
diff --git a/muse2/awl/floatentry.h b/muse2/awl/floatentry.h
index 53d53bff..7d31498f 100644
--- a/muse2/awl/floatentry.h
+++ b/muse2/awl/floatentry.h
@@ -58,6 +58,8 @@ class FloatEntry : public QLineEdit {
       int _precision;
       bool _log;
 
+      double calcIncrement() const;
+      
       virtual void wheelEvent(QWheelEvent*);
       virtual void mousePressEvent(QMouseEvent*);
       virtual void mouseMoveEvent(QMouseEvent*);
@@ -67,6 +69,7 @@ class FloatEntry : public QLineEdit {
       virtual bool setString(double);
       virtual void incValue(double);
       virtual void decValue(double);
+      void contextMenuEvent(QContextMenuEvent*);
 
       void updateValue();
 
@@ -96,11 +99,17 @@ class FloatEntry : public QLineEdit {
       double minValue() const               { return _minValue; }
       double maxValue() const               { return _maxValue; }
       void setMinValue(double v)            { _minValue = v; }
+      void setMinLogValue(double v);
       void setMaxValue(double v)            { _maxValue = v; }
+      void setMaxLogValue(double v);
       void setRange(double a, double b) {
             _minValue = a;
             _maxValue = b;
             }
+      void setLogRange(double a, double b) {
+            setMinLogValue(a);
+            setMaxLogValue(b);
+            }
       int precision() const                 { return _precision; }
       void setPrecision(int val);
       QString specialText() const           { return _specialText; }
diff --git a/muse2/muse/plugin.cpp b/muse2/muse/plugin.cpp
index f1d817c9..9dc2005e 100644
--- a/muse2/muse/plugin.cpp
+++ b/muse2/muse/plugin.cpp
@@ -719,7 +719,8 @@ Plugin::Plugin(QFileInfo* f, const LADSPA_Descriptor* d, bool isDssi, bool isDss
 Plugin::~Plugin()
 {
   if(plugin)
-    delete plugin;
+  //  delete plugin;
+    printf("Plugin::~Plugin Error: plugin is not NULL\n");
 }
   
 //---------------------------------------------------------
diff --git a/muse2/muse/plugin.h b/muse2/muse/plugin.h
index 4de0de11..25d434ca 100644
--- a/muse2/muse/plugin.h
+++ b/muse2/muse/plugin.h
@@ -391,6 +391,7 @@ class PluginI : public PluginIBase {
       unsigned long parameters() const           { return controlPorts; }    
       unsigned long parametersOut() const           { return controlOutPorts; }
       void setParam(unsigned long i, float val);  
+      void putParam(unsigned long i, float val) { controls[i].val = controls[i].tmpVal = val; }
       float param(unsigned long i) const        { return controls[i].val; }       
       float paramOut(unsigned long i) const        { return controlsOut[i].val; }
       float defaultValue(unsigned long param) const;
diff --git a/muse2/muse/synth.cpp b/muse2/muse/synth.cpp
index 781cab3f..840365ee 100644
--- a/muse2/muse/synth.cpp
+++ b/muse2/muse/synth.cpp
@@ -880,22 +880,37 @@ const char* MessSynthIF::getPatchName(int channel, int prog, bool drum)
 
 void MessSynthIF::populatePatchPopup(MusEGui::PopupMenu* menu, int ch, bool)
       {
+      MusEGui::PopupMenu* hbank_menu = 0;
+      MusEGui::PopupMenu* lbank_menu = 0;
       menu->clear();
       const MidiPatch* mp = _mess->getPatchInfo(ch, 0);
       while (mp) {
-            int id = ((mp->hbank & 0xff) << 16)
-                      + ((mp->lbank & 0xff) << 8) + mp->prog;
-            /* DELETETHIS 9
-            int pgid = ((mp->hbank & 0xff) << 8) | (mp->lbank & 0xff) | 0x40000000;          
-            int itemnum = menu->indexOf(pgid);
-            if(itemnum == -1)
+            if(mp->typ == MP_TYPE_HBANK)
             {
-              QPopupMenu* submenu = new QPopupMenu(menu);
-              itemnum = 
+              lbank_menu = 0;
+              hbank_menu = new MusEGui::PopupMenu(QString(mp->name),  menu, true);
+              menu->addMenu(hbank_menu);
+            }
+            else
+            if(mp->typ == MP_TYPE_LBANK)
+            {
+              lbank_menu = new MusEGui::PopupMenu(QString(mp->name),  menu, true);
+              hbank_menu->addMenu(lbank_menu);
+            }
+            else
+            {
+              int id = ((mp->hbank & 0xff) << 16)
+                        + ((mp->lbank & 0xff) << 8) + mp->prog;
+              MusEGui::PopupMenu* m;
+              if(lbank_menu)
+                m = lbank_menu;
+              else if(hbank_menu)
+                m = hbank_menu;
+              else
+                m = menu;
+              QAction *act = m->addAction(QString(mp->name));
+              act->setData(id);
             }
-            */  
-            QAction *act = menu->addAction(QString(mp->name));
-            act->setData(id);
             mp = _mess->getPatchInfo(ch, mp);
             }
       }
diff --git a/muse2/synti/deicsonze/deicsonze.cpp b/muse2/synti/deicsonze/deicsonze.cpp
index 7ca0deed..61e9b1f3 100644
--- a/muse2/synti/deicsonze/deicsonze.cpp
+++ b/muse2/synti/deicsonze/deicsonze.cpp
@@ -241,7 +241,14 @@ DeicsOnze::DeicsOnze() : Mess(2) {
 DeicsOnze::~DeicsOnze()
 {
   if(_gui)        
-    delete _gui;  // p4.0.27
+    delete _gui;  
+
+  if(_pluginIReverb)
+    delete _pluginIReverb;
+  if(_pluginIChorus)
+    delete _pluginIChorus;
+  if(_pluginIDelay)
+    delete _pluginIDelay;
     
   //if (--useCount == 0)
   //delete[] sine_table;
@@ -2298,7 +2305,6 @@ void DeicsOnze::setupInitBuffer(int len)
 //---------------------------------------------------------
 // getInitData
 //---------------------------------------------------------
-//void DeicsOnze::getInitData(int* length, const unsigned char** data) const {
 void DeicsOnze::getInitData(int* length, const unsigned char** data) {
   //write the set in a temporary file and in a QByteArray
   QTemporaryFile file;
@@ -2313,25 +2319,23 @@ void DeicsOnze::getInitData(int* length, const unsigned char** data) {
   //compress the QByteArray at default rate
   QByteArray baComp = qCompress(ba);
 
+  int version = SYSEX_INIT_DATA_VERSION; //SYSEX_INIT_DATA_VERSION_2; // Not quite ready for ver 2 yet. Need delay wet/dry gui control.
+  
   //save the set
-  *length = NUM_CONFIGLENGTH                       
-  //*length = 2 + NUM_CONFIGLENGTH     // 2 for Header                  
-    ///+ (_pluginIReverb?sizeof(float)*_pluginIReverb->plugin()->parameter():0) 
+  //*length = (version == SYSEX_INIT_DATA_VERSION_2 ? NUM_CONFIGLENGTH : NUM_DELAY_WET_DRY_MIX)  // HACK
+  *length = NUM_CONFIGLENGTH
     + (_pluginIReverb?sizeof(float)*_pluginIReverb->plugin()->controlInPorts():0) 
-    ///+ (_pluginIChorus?sizeof(float)*_pluginIChorus->plugin()->parameter():0)
     + (_pluginIChorus?sizeof(float)*_pluginIChorus->plugin()->controlInPorts():0)
     + baComp.size();
 
-  ///unsigned char* buffer = new unsigned char[*length];
   setupInitBuffer(*length);  
   
   //save init data
   
-  ///buffer[0]=SYSEX_INIT_DATA;
   initBuffer[0]=MUSE_SYNTH_SYSEX_MFG_ID;
   initBuffer[1]=DEICSONZE_UNIQUE_ID;
   initBuffer[2]=SYSEX_INIT_DATA;
-  initBuffer[3]=SYSEX_INIT_DATA_VERSION;
+  initBuffer[3]=version;
   //save global data
   initBuffer[NUM_MASTERVOL] = (unsigned char) getMasterVol();
   for(int c = 0; c < NBRCHANNELS; c++) {
@@ -2389,7 +2393,6 @@ void DeicsOnze::getInitData(int* length, const unsigned char** data) {
   initBuffer[NUM_IS_REVERB_ON]=(unsigned char)_global.isReverbActivated;
   initBuffer[NUM_REVERB_RETURN]=(unsigned char)getReverbReturn();
   initBuffer[NUM_REVERB_PARAM_NBR]=                                         
-    ///(_pluginIReverb?(unsigned char)_pluginIReverb->plugin()->parameter() : 0);
     (_pluginIReverb?(unsigned char)_pluginIReverb->plugin()->controlInPorts() : 0);
   strncpy((char*)&initBuffer[NUM_REVERB_LIB],
 	  (_pluginIReverb?
@@ -2403,7 +2406,6 @@ void DeicsOnze::getInitData(int* length, const unsigned char** data) {
   initBuffer[NUM_IS_CHORUS_ON]=(unsigned char)_global.isChorusActivated;
   initBuffer[NUM_CHORUS_RETURN]=(unsigned char)getChorusReturn();
   initBuffer[NUM_CHORUS_PARAM_NBR]=                                         
-    ///(_pluginIChorus?(unsigned char)_pluginIChorus->plugin()->parameter() : 0);
     (_pluginIChorus?(unsigned char)_pluginIChorus->plugin()->controlInPorts() : 0);
   strncpy((char*)&initBuffer[NUM_CHORUS_LIB],
 	  (_pluginIChorus?
@@ -2419,12 +2421,15 @@ void DeicsOnze::getInitData(int* length, const unsigned char** data) {
   //save FX parameters
   //reverb
   for(int i = 0; i < (int)initBuffer[NUM_REVERB_PARAM_NBR]; i++) {
-    float val = (float)getReverbParam(i);
-    memcpy(&initBuffer[NUM_CONFIGLENGTH + sizeof(float)*i], &val, sizeof(float));
+    float val = getReverbParam(i);
+    //memcpy(&initBuffer[(version == SYSEX_INIT_DATA_VERSION_2 ? NUM_CONFIGLENGTH : NUM_DELAY_WET_DRY_MIX) // HACK
+    memcpy(&initBuffer[NUM_CONFIGLENGTH
+                       + sizeof(float)*i], &val, sizeof(float));
   }
   //chorus
   for(int i = 0; i < (int)initBuffer[NUM_CHORUS_PARAM_NBR]; i++) {
-    float val = (float)getChorusParam(i);
+    float val = getChorusParam(i);
+    //memcpy(&initBuffer[(version == SYSEX_INIT_DATA_VERSION_2 ? NUM_CONFIGLENGTH : NUM_DELAY_WET_DRY_MIX) // HACK
     memcpy(&initBuffer[NUM_CONFIGLENGTH
 		   + sizeof(float)*(int)initBuffer[NUM_REVERB_PARAM_NBR]
 		   + sizeof(float)*i], &val, sizeof(float));
@@ -2441,384 +2446,414 @@ void DeicsOnze::getInitData(int* length, const unsigned char** data) {
   memcpy(&initBuffer[NUM_DELAY_LFO_FREQ], &delayfloat, sizeof(float));
   delayfloat = getDelayLFODepth();
   memcpy(&initBuffer[NUM_DELAY_LFO_DEPTH], &delayfloat, sizeof(float));
+  //if(version == SYSEX_INIT_DATA_VERSION_2)
+  //{
+  //  delayfloat = getDelayDryWet();
+  //  memcpy(&initBuffer[NUM_DELAY_WET_DRY_MIX], &delayfloat, sizeof(float));
+  //}
 
   //save set data
   int offset =
+    //(version == SYSEX_INIT_DATA_VERSION_2 ? NUM_CONFIGLENGTH : NUM_DELAY_WET_DRY_MIX) // HACK
     NUM_CONFIGLENGTH
     + sizeof(float)*(int)initBuffer[NUM_REVERB_PARAM_NBR]
     + sizeof(float)*(int)initBuffer[NUM_CHORUS_PARAM_NBR];
   for(int i = offset; i < *length; i++)
     initBuffer[i]=(unsigned char)baComp.at(i - offset);
 
-  ///*data=buffer;
   *data=initBuffer;
 }
 //---------------------------------------------------------
 // parseInitData
 //---------------------------------------------------------
 void DeicsOnze::parseInitData(int length, const unsigned char* data) {
-  ///if(data[1]==SYSEX_INIT_DATA_VERSION) {
-  if(data[3]==SYSEX_INIT_DATA_VERSION) {
-    //load global parameters
-    //master volume
-    setMasterVol(data[NUM_MASTERVOL]);
-    unsigned char *dataMasterVol = new unsigned char[2];
-    dataMasterVol[0]=SYSEX_MASTERVOL;
-    dataMasterVol[1]=(unsigned char) getMasterVol();
-    MusECore::MidiPlayEvent 
-      evMasterVol(0, 0, MusECore::ME_SYSEX, (const unsigned char*)dataMasterVol, 2);
-    _gui->writeEvent(evMasterVol);
-    //channel configuration
-    for(int c = 0; c < NBRCHANNELS; c++) {
-      //isEnable
-      setChannelEnable(c, data[NUM_CHANNEL_ENABLE + c]);
-      MusECore::MidiPlayEvent 
-	evChEnable(0, 0, c, MusECore::ME_CONTROLLER,
-		   CTRL_CHANNELENABLE, data[NUM_CHANNEL_ENABLE + c]);
-      _gui->writeEvent(evChEnable);
-      //nbrVoices
-      setNbrVoices(c, data[NUM_NBRVOICES + c]);
-      MusECore::MidiPlayEvent 
-	evNbrVoices(0, 0, c,MusECore::ME_CONTROLLER,CTRL_NBRVOICES, data[NUM_NBRVOICES + c]);
-      _gui->writeEvent(evNbrVoices);
-      //channel volume
-      setChannelVol(c, data[NUM_CHANNEL_VOL + c]);
-      MusECore::MidiPlayEvent
-	evChVol(0, 0, c, MusECore::ME_CONTROLLER,
-		CTRL_CHANNELVOLUME, data[NUM_CHANNEL_VOL + c]);
-      _gui->writeEvent(evChVol);
-      //channel pan
-      setChannelPan(c, data[NUM_CHANNEL_PAN + c]);
-      MusECore::MidiPlayEvent
-	evChPan(0, 0, c, MusECore::ME_CONTROLLER, CTRL_CHANNELPAN,
-		data[NUM_CHANNEL_PAN + c]);
-      _gui->writeEvent(evChPan);
-      if(getChannelEnable(c)) applyChannelAmp(c);
-      //channel detune
-      setChannelDetune(c, data[NUM_CHANNEL_DETUNE + c]-MAXCHANNELDETUNE);
-      MusECore::MidiPlayEvent
-	evChDetune(0, 0, c, MusECore::ME_CONTROLLER, CTRL_CHANNELDETUNE,
-		   data[NUM_CHANNEL_DETUNE + c]-MAXCHANNELDETUNE);
-      _gui->writeEvent(evChDetune);
-      //channel brightness
-      setChannelBrightness(c,
-			   data[NUM_CHANNEL_BRIGHTNESS + 2*c]
-			   + data[NUM_CHANNEL_BRIGHTNESS + 2*c + 1] * 256);
-      MusECore::MidiPlayEvent
-	evChBrightness(0, 0, c, MusECore::ME_CONTROLLER,
-		       CTRL_FINEBRIGHTNESS, getChannelBrightness(c));
-      _gui->writeEvent(evChBrightness);
-      //channel modulation
-      setChannelModulation(c, data[NUM_CHANNEL_MODULATION + c]);
-      MusECore::MidiPlayEvent 
-	evChMod(0, 0, c, MusECore::ME_CONTROLLER,
-		MusECore::CTRL_MODULATION, data[NUM_CHANNEL_MODULATION + c]);
-      _gui->writeEvent(evChMod);
-      //channel attack
-      setChannelAttack(c, data[NUM_CHANNEL_ATTACK + c]);
-      MusECore::MidiPlayEvent 
-	evChAttack(0, 0, c, MusECore::ME_CONTROLLER,
-		   MusECore::CTRL_ATTACK_TIME, data[NUM_CHANNEL_ATTACK + c]);
-      _gui->writeEvent(evChAttack);
-      //channel release
-      setChannelRelease(c, data[NUM_CHANNEL_RELEASE + c]);
-      MusECore::MidiPlayEvent 
-	evChRelease(0, 0, c, MusECore::ME_CONTROLLER,
-		    MusECore::CTRL_RELEASE_TIME, data[NUM_CHANNEL_RELEASE + c]);
-      _gui->writeEvent(evChRelease);      
-      //channel reverb
-      setChannelReverb(c, data[NUM_CHANNEL_REVERB + c]);
-      MusECore::MidiPlayEvent 
-	evChReverb(0, 0, c, MusECore::ME_CONTROLLER,
-		   MusECore::CTRL_REVERB_SEND, data[NUM_CHANNEL_REVERB + c]);
-      _gui->writeEvent(evChReverb);      
-      //channel chorus
-      setChannelChorus(c, data[NUM_CHANNEL_CHORUS + c]);
-      MusECore::MidiPlayEvent 
-	evChChorus(0, 0, c, MusECore::ME_CONTROLLER,
-		   MusECore::CTRL_CHORUS_SEND, data[NUM_CHANNEL_CHORUS + c]);
-      _gui->writeEvent(evChChorus);      
-      //channel delay
-      setChannelDelay(c, data[NUM_CHANNEL_DELAY + c]);
-      MusECore::MidiPlayEvent 
-	evChDelay(0, 0, c, MusECore::ME_CONTROLLER,
-		  MusECore::CTRL_VARIATION_SEND, data[NUM_CHANNEL_DELAY + c]);
-      _gui->writeEvent(evChDelay);
-    }
-    //load configuration
-    _saveConfig = (bool)data[NUM_SAVECONFIG];
-    unsigned char *dataSaveConfig = new unsigned char[2];
-    dataSaveConfig[0]=SYSEX_SAVECONFIG;
-    dataSaveConfig[1]=(unsigned char)_saveConfig;
-    MusECore::MidiPlayEvent 
-      evSaveConfig(0, 0, MusECore::ME_SYSEX, (const unsigned char*)dataSaveConfig, 2);
-    _gui->writeEvent(evSaveConfig);    
-    if(_saveConfig) {
-      //saveOnlyUsed
-      _saveOnlyUsed = (bool)data[NUM_SAVEONLYUSED];
-      unsigned char *dataSaveOnlyUsed = new unsigned char[2];
-      dataSaveOnlyUsed[0]=SYSEX_SAVEONLYUSED;
-      dataSaveOnlyUsed[1]=(unsigned char)_saveOnlyUsed;
-      MusECore::MidiPlayEvent 
-	evSaveOnlyUsed(0, 0, MusECore::ME_SYSEX, (const unsigned char*)dataSaveOnlyUsed, 2);
-      _gui->writeEvent(evSaveOnlyUsed);    
-      //colors
-      unsigned char dataColorGui[COLORSYSEXLENGTH+1];
-      dataColorGui[0]=SYSEX_COLORGUI;
-      for (int i=0; i<COLORSYSEXLENGTH; i++)
-	dataColorGui[i+1]=data[NUM_RED_TEXT+i];
-      MusECore::MidiPlayEvent evSysexColor(0, 0, MusECore::ME_SYSEX, (const unsigned char*)dataColorGui,
-			     COLORSYSEXLENGTH+1);
-      _gui->writeEvent(evSysexColor);
-      //quality
-      unsigned char dataQuality[2];
-      dataQuality[0]=SYSEX_QUALITY;
-      dataQuality[1]=data[NUM_QUALITY];
-      setQuality((Quality)data[NUM_QUALITY]);
-      MusECore::MidiPlayEvent evQuality(0, 0, MusECore::ME_SYSEX, (const unsigned char*)dataQuality, 2);
-      _gui->writeEvent(evQuality);
-      //filter
-      unsigned char dataFilter[2];
-      dataFilter[0]=SYSEX_FILTER;
-      dataFilter[1]=data[NUM_FILTER];
-      setFilter((bool)data[NUM_FILTER]);
-      MusECore::MidiPlayEvent evFilter(0, 0, MusECore::ME_SYSEX, (const unsigned char*)dataFilter, 2);
-      _gui->writeEvent(evFilter);
-      //font size
-      unsigned char dataFontSize[2];
-      dataFontSize[0]=SYSEX_FONTSIZE;
-      dataFontSize[1]=data[NUM_FONTSIZE];
-      MusECore::MidiPlayEvent evFontSize(0, 0, MusECore::ME_SYSEX, (const unsigned char*)dataFontSize, 2);
-      _gui->writeEvent(evFontSize);
-      //load init set
-      unsigned char dataIsInitSet[2];
-      dataIsInitSet[0]=SYSEX_ISINITSET;
-      dataIsInitSet[1]=data[NUM_ISINITSET];
-      MusECore::MidiPlayEvent evIsInitSet(0, 0, MusECore::ME_SYSEX,
-			    (const unsigned char*)dataIsInitSet, 2);
-      _gui->writeEvent(evIsInitSet);
-      unsigned char dataInitSetPath[1+MAXSTRLENGTHINITSETPATH];
-      dataInitSetPath[0]=SYSEX_INITSETPATH;
-      for(int a = 0; a < MAXSTRLENGTHINITSETPATH; a++)
-	dataInitSetPath[a+1] = data[a+NUM_INITSETPATH];
-      MusECore::MidiPlayEvent evInitSetPath(0, 0, MusECore::ME_SYSEX,(const unsigned char*)dataInitSetPath,
-			      1+MAXSTRLENGTHINITSETPATH);
-      _gui->writeEvent(evInitSetPath);      
-      //load background pix
-      unsigned char dataIsBackgroundPix[2];
-      dataIsBackgroundPix[0]=SYSEX_ISBACKGROUNDPIX;
-      dataIsBackgroundPix[1]=data[NUM_ISBACKGROUNDPIX];
-      MusECore::MidiPlayEvent evIsBackgroundPix(0, 0, MusECore::ME_SYSEX,
-			    (const unsigned char*)dataIsBackgroundPix, 2);
-      _gui->writeEvent(evIsBackgroundPix);
-      unsigned char dataBackgroundPixPath[1+MAXSTRLENGTHBACKGROUNDPIXPATH];
-      dataBackgroundPixPath[0]=SYSEX_BACKGROUNDPIXPATH;
-      for(int a = 0; a < MAXSTRLENGTHBACKGROUNDPIXPATH; a++)
-	dataBackgroundPixPath[a+1] = data[a+NUM_BACKGROUNDPIXPATH];
-      MusECore::MidiPlayEvent evBackgroundPixPath(0, 0, MusECore::ME_SYSEX,
-			      (const unsigned char*)dataBackgroundPixPath,
-			      1+MAXSTRLENGTHBACKGROUNDPIXPATH);
-      _gui->writeEvent(evBackgroundPixPath);      
-    }
-    else _gui->saveConfigCheckBox->setChecked(false);
-    //load FX
-    //reverb
-    _global.isReverbActivated = (bool)data[NUM_IS_REVERB_ON];
-    unsigned char *dataReverbAct = new unsigned char[2];
-    dataReverbAct[0]=SYSEX_REVERBACTIV;
-    dataReverbAct[1]=(unsigned char)_global.isReverbActivated;
-    MusECore::MidiPlayEvent evReverbAct(0, 0, MusECore::ME_SYSEX,(const unsigned char*)dataReverbAct, 2);
-    _gui->writeEvent(evReverbAct);    
-    setReverbReturn((int)data[NUM_REVERB_RETURN]);
-    unsigned char *dataReverbRet = new unsigned char[2];
-    dataReverbRet[0]=SYSEX_REVERBRETURN;
-    dataReverbRet[1]=(unsigned char)getReverbReturn();
-    MusECore::MidiPlayEvent evReverbRet(0, 0, MusECore::ME_SYSEX,(const unsigned char*)dataReverbRet, 2);
-    _gui->writeEvent(evReverbRet);
-    MusECore::Plugin* p;
-    p = MusEGlobal::plugins.find((const char*)&data[NUM_REVERB_LIB], 
-		     (const char*)&data[NUM_REVERB_LABEL]);
-    if(p) { 
-      initPluginReverb(p);
-      ///for(int i = 0; i < _pluginIReverb->plugin()->parameter(); i++) {
-      for(int i = 0; i < (int)_pluginIReverb->plugin()->controlInPorts(); i++) {
-	float val;
-	memcpy(&val, &data[NUM_CONFIGLENGTH + sizeof(float)*i], sizeof(float));
-	setReverbParam(i, (double)val);
-      }
-      char dataBuildRev;
-      dataBuildRev = SYSEX_BUILDGUIREVERB;
-      MusECore::MidiPlayEvent evSysexBuildRev(0, 0, MusECore::ME_SYSEX,
-				(const unsigned char*)&dataBuildRev, 1);
-      _gui->writeEvent(evSysexBuildRev);
+  //if(data[3]!=SYSEX_INIT_DATA_VERSION || data[3]!=SYSEX_INIT_DATA_VERSION_2)
+  if(data[3]!=SYSEX_INIT_DATA_VERSION)
+  {
+    printf("Error: DeicsOnze::parseInitData: unknown sysex init data version:%d\n", data[3]);
+    return;
+  }
+  
+  //load global parameters
+  //master volume
+  setMasterVol(data[NUM_MASTERVOL]);
+  unsigned char *dataMasterVol = new unsigned char[2];
+  dataMasterVol[0]=SYSEX_MASTERVOL;
+  dataMasterVol[1]=(unsigned char) getMasterVol();
+  MusECore::MidiPlayEvent
+    evMasterVol(0, 0, MusECore::ME_SYSEX, (const unsigned char*)dataMasterVol, 2);
+  _gui->writeEvent(evMasterVol);
+  //channel configuration
+  for(int c = 0; c < NBRCHANNELS; c++) {
+    //isEnable
+    setChannelEnable(c, data[NUM_CHANNEL_ENABLE + c]);
+    MusECore::MidiPlayEvent
+      evChEnable(0, 0, c, MusECore::ME_CONTROLLER,
+                  CTRL_CHANNELENABLE, data[NUM_CHANNEL_ENABLE + c]);
+    _gui->writeEvent(evChEnable);
+    //nbrVoices
+    setNbrVoices(c, data[NUM_NBRVOICES + c]);
+    MusECore::MidiPlayEvent
+      evNbrVoices(0, 0, c,MusECore::ME_CONTROLLER,CTRL_NBRVOICES, data[NUM_NBRVOICES + c]);
+    _gui->writeEvent(evNbrVoices);
+    //channel volume
+    setChannelVol(c, data[NUM_CHANNEL_VOL + c]);
+    MusECore::MidiPlayEvent
+      evChVol(0, 0, c, MusECore::ME_CONTROLLER,
+              CTRL_CHANNELVOLUME, data[NUM_CHANNEL_VOL + c]);
+    _gui->writeEvent(evChVol);
+    //channel pan
+    setChannelPan(c, data[NUM_CHANNEL_PAN + c]);
+    MusECore::MidiPlayEvent
+      evChPan(0, 0, c, MusECore::ME_CONTROLLER, CTRL_CHANNELPAN,
+              data[NUM_CHANNEL_PAN + c]);
+    _gui->writeEvent(evChPan);
+    if(getChannelEnable(c)) applyChannelAmp(c);
+    //channel detune
+    setChannelDetune(c, data[NUM_CHANNEL_DETUNE + c]-MAXCHANNELDETUNE);
+    MusECore::MidiPlayEvent
+      evChDetune(0, 0, c, MusECore::ME_CONTROLLER, CTRL_CHANNELDETUNE,
+                  data[NUM_CHANNEL_DETUNE + c]-MAXCHANNELDETUNE);
+    _gui->writeEvent(evChDetune);
+    //channel brightness
+    setChannelBrightness(c,
+                          data[NUM_CHANNEL_BRIGHTNESS + 2*c]
+                          + data[NUM_CHANNEL_BRIGHTNESS + 2*c + 1] * 256);
+    MusECore::MidiPlayEvent
+      evChBrightness(0, 0, c, MusECore::ME_CONTROLLER,
+                      CTRL_FINEBRIGHTNESS, getChannelBrightness(c));
+    _gui->writeEvent(evChBrightness);
+    //channel modulation
+    setChannelModulation(c, data[NUM_CHANNEL_MODULATION + c]);
+    MusECore::MidiPlayEvent
+      evChMod(0, 0, c, MusECore::ME_CONTROLLER,
+              MusECore::CTRL_MODULATION, data[NUM_CHANNEL_MODULATION + c]);
+    _gui->writeEvent(evChMod);
+    //channel attack
+    setChannelAttack(c, data[NUM_CHANNEL_ATTACK + c]);
+    MusECore::MidiPlayEvent
+      evChAttack(0, 0, c, MusECore::ME_CONTROLLER,
+                  MusECore::CTRL_ATTACK_TIME, data[NUM_CHANNEL_ATTACK + c]);
+    _gui->writeEvent(evChAttack);
+    //channel release
+    setChannelRelease(c, data[NUM_CHANNEL_RELEASE + c]);
+    MusECore::MidiPlayEvent
+      evChRelease(0, 0, c, MusECore::ME_CONTROLLER,
+                  MusECore::CTRL_RELEASE_TIME, data[NUM_CHANNEL_RELEASE + c]);
+    _gui->writeEvent(evChRelease);
+    //channel reverb
+    setChannelReverb(c, data[NUM_CHANNEL_REVERB + c]);
+    MusECore::MidiPlayEvent
+      evChReverb(0, 0, c, MusECore::ME_CONTROLLER,
+                  MusECore::CTRL_REVERB_SEND, data[NUM_CHANNEL_REVERB + c]);
+    _gui->writeEvent(evChReverb);
+    //channel chorus
+    setChannelChorus(c, data[NUM_CHANNEL_CHORUS + c]);
+    MusECore::MidiPlayEvent
+      evChChorus(0, 0, c, MusECore::ME_CONTROLLER,
+                  MusECore::CTRL_CHORUS_SEND, data[NUM_CHANNEL_CHORUS + c]);
+    _gui->writeEvent(evChChorus);
+    //channel delay
+    setChannelDelay(c, data[NUM_CHANNEL_DELAY + c]);
+    MusECore::MidiPlayEvent
+      evChDelay(0, 0, c, MusECore::ME_CONTROLLER,
+                MusECore::CTRL_VARIATION_SEND, data[NUM_CHANNEL_DELAY + c]);
+    _gui->writeEvent(evChDelay);
+  }
+  //load configuration
+  _saveConfig = (bool)data[NUM_SAVECONFIG];
+  unsigned char *dataSaveConfig = new unsigned char[2];
+  dataSaveConfig[0]=SYSEX_SAVECONFIG;
+  dataSaveConfig[1]=(unsigned char)_saveConfig;
+  MusECore::MidiPlayEvent
+    evSaveConfig(0, 0, MusECore::ME_SYSEX, (const unsigned char*)dataSaveConfig, 2);
+  _gui->writeEvent(evSaveConfig);
+  if(_saveConfig) {
+    //saveOnlyUsed
+    _saveOnlyUsed = (bool)data[NUM_SAVEONLYUSED];
+    unsigned char *dataSaveOnlyUsed = new unsigned char[2];
+    dataSaveOnlyUsed[0]=SYSEX_SAVEONLYUSED;
+    dataSaveOnlyUsed[1]=(unsigned char)_saveOnlyUsed;
+    MusECore::MidiPlayEvent
+      evSaveOnlyUsed(0, 0, MusECore::ME_SYSEX, (const unsigned char*)dataSaveOnlyUsed, 2);
+    _gui->writeEvent(evSaveOnlyUsed);
+    //colors
+    unsigned char dataColorGui[COLORSYSEXLENGTH+1];
+    dataColorGui[0]=SYSEX_COLORGUI;
+    for (int i=0; i<COLORSYSEXLENGTH; i++)
+      dataColorGui[i+1]=data[NUM_RED_TEXT+i];
+    MusECore::MidiPlayEvent evSysexColor(0, 0, MusECore::ME_SYSEX, (const unsigned char*)dataColorGui,
+                            COLORSYSEXLENGTH+1);
+    _gui->writeEvent(evSysexColor);
+    //quality
+    unsigned char dataQuality[2];
+    dataQuality[0]=SYSEX_QUALITY;
+    dataQuality[1]=data[NUM_QUALITY];
+    setQuality((Quality)data[NUM_QUALITY]);
+    MusECore::MidiPlayEvent evQuality(0, 0, MusECore::ME_SYSEX, (const unsigned char*)dataQuality, 2);
+    _gui->writeEvent(evQuality);
+    //filter
+    unsigned char dataFilter[2];
+    dataFilter[0]=SYSEX_FILTER;
+    dataFilter[1]=data[NUM_FILTER];
+    setFilter((bool)data[NUM_FILTER]);
+    MusECore::MidiPlayEvent evFilter(0, 0, MusECore::ME_SYSEX, (const unsigned char*)dataFilter, 2);
+    _gui->writeEvent(evFilter);
+    //font size
+    unsigned char dataFontSize[2];
+    dataFontSize[0]=SYSEX_FONTSIZE;
+    dataFontSize[1]=data[NUM_FONTSIZE];
+    MusECore::MidiPlayEvent evFontSize(0, 0, MusECore::ME_SYSEX, (const unsigned char*)dataFontSize, 2);
+    _gui->writeEvent(evFontSize);
+    //load init set
+    unsigned char dataIsInitSet[2];
+    dataIsInitSet[0]=SYSEX_ISINITSET;
+    dataIsInitSet[1]=data[NUM_ISINITSET];
+    MusECore::MidiPlayEvent evIsInitSet(0, 0, MusECore::ME_SYSEX,
+                          (const unsigned char*)dataIsInitSet, 2);
+    _gui->writeEvent(evIsInitSet);
+    unsigned char dataInitSetPath[1+MAXSTRLENGTHINITSETPATH];
+    dataInitSetPath[0]=SYSEX_INITSETPATH;
+    for(int a = 0; a < MAXSTRLENGTHINITSETPATH; a++)
+      dataInitSetPath[a+1] = data[a+NUM_INITSETPATH];
+    MusECore::MidiPlayEvent evInitSetPath(0, 0, MusECore::ME_SYSEX,(const unsigned char*)dataInitSetPath,
+                            1+MAXSTRLENGTHINITSETPATH);
+    _gui->writeEvent(evInitSetPath);
+    //load background pix
+    unsigned char dataIsBackgroundPix[2];
+    dataIsBackgroundPix[0]=SYSEX_ISBACKGROUNDPIX;
+    dataIsBackgroundPix[1]=data[NUM_ISBACKGROUNDPIX];
+    MusECore::MidiPlayEvent evIsBackgroundPix(0, 0, MusECore::ME_SYSEX,
+                          (const unsigned char*)dataIsBackgroundPix, 2);
+    _gui->writeEvent(evIsBackgroundPix);
+    unsigned char dataBackgroundPixPath[1+MAXSTRLENGTHBACKGROUNDPIXPATH];
+    dataBackgroundPixPath[0]=SYSEX_BACKGROUNDPIXPATH;
+    for(int a = 0; a < MAXSTRLENGTHBACKGROUNDPIXPATH; a++)
+      dataBackgroundPixPath[a+1] = data[a+NUM_BACKGROUNDPIXPATH];
+    MusECore::MidiPlayEvent evBackgroundPixPath(0, 0, MusECore::ME_SYSEX,
+                            (const unsigned char*)dataBackgroundPixPath,
+                            1+MAXSTRLENGTHBACKGROUNDPIXPATH);
+    _gui->writeEvent(evBackgroundPixPath);
+  }
+  else _gui->saveConfigCheckBox->setChecked(false);
+  //load FX
+  //reverb
+  _global.isReverbActivated = (bool)data[NUM_IS_REVERB_ON];
+  unsigned char *dataReverbAct = new unsigned char[2];
+  dataReverbAct[0]=SYSEX_REVERBACTIV;
+  dataReverbAct[1]=(unsigned char)_global.isReverbActivated;
+  MusECore::MidiPlayEvent evReverbAct(0, 0, MusECore::ME_SYSEX,(const unsigned char*)dataReverbAct, 2);
+  _gui->writeEvent(evReverbAct);
+  setReverbReturn((int)data[NUM_REVERB_RETURN]);
+  unsigned char *dataReverbRet = new unsigned char[2];
+  dataReverbRet[0]=SYSEX_REVERBRETURN;
+  dataReverbRet[1]=(unsigned char)getReverbReturn();
+  MusECore::MidiPlayEvent evReverbRet(0, 0, MusECore::ME_SYSEX,(const unsigned char*)dataReverbRet, 2);
+  _gui->writeEvent(evReverbRet);
+  MusECore::Plugin* p;
+  p = MusEGlobal::plugins.find((const char*)&data[NUM_REVERB_LIB],
+                    (const char*)&data[NUM_REVERB_LABEL]);
+  if(p) {
+    initPluginReverb(p);
+    for(int i = 0; i < (int)_pluginIReverb->plugin()->controlInPorts(); i++) {
+      float val;
+      //memcpy(&val, &data[(data[3] == SYSEX_INIT_DATA_VERSION_2 ? NUM_CONFIGLENGTH : NUM_DELAY_WET_DRY_MIX)  // HACK
+      memcpy(&val, &data[NUM_CONFIGLENGTH
+                         + sizeof(float)*i], sizeof(float));
+      _pluginIReverb->putParam(i, val);
     }
-    else _pluginIReverb = NULL;
-    //chorus
-    _global.isChorusActivated = (bool)data[NUM_IS_CHORUS_ON];
-    unsigned char *dataChorusAct = new unsigned char[2];
-    dataChorusAct[0]=SYSEX_CHORUSACTIV;
-    dataChorusAct[1]=(unsigned char)_global.isChorusActivated;
-    MusECore::MidiPlayEvent evChorusAct(0, 0, MusECore::ME_SYSEX,(const unsigned char*)dataChorusAct, 2);
-    _gui->writeEvent(evChorusAct);    
-    setChorusReturn((int)data[NUM_CHORUS_RETURN]);
-    unsigned char *dataChorusRet = new unsigned char[2];
-    dataChorusRet[0]=SYSEX_CHORUSRETURN;
-    dataChorusRet[1]=(unsigned char)getChorusReturn();
-    MusECore::MidiPlayEvent evChorusRet(0, 0, MusECore::ME_SYSEX,(const unsigned char*)dataChorusRet, 2);
-    _gui->writeEvent(evChorusRet);
-    p = MusEGlobal::plugins.find((const char*)&data[NUM_CHORUS_LIB], 
-		     (const char*)&data[NUM_CHORUS_LABEL]);
-    if(p) {
-      initPluginChorus(p);
-      ///for(int i = 0; i < _pluginIChorus->plugin()->parameter(); i++) {
-      for(int i = 0; i < (int)_pluginIChorus->plugin()->controlInPorts(); i++) {
-	float val;
-	memcpy(&val, &data[NUM_CONFIGLENGTH
-			   + sizeof(float)*(int)data[NUM_REVERB_PARAM_NBR]
-			   + sizeof(float)*i],
-	       sizeof(float));
-	setChorusParam(i, (double)val);
-      }
-      char dataBuildCho;
-      dataBuildCho = SYSEX_BUILDGUICHORUS;
-      MusECore::MidiPlayEvent evSysexBuildCho(0, 0, MusECore::ME_SYSEX,
-				(const unsigned char*)&dataBuildCho, 1);
-      _gui->writeEvent(evSysexBuildCho);
+    char dataBuildRev;
+    dataBuildRev = SYSEX_BUILDGUIREVERB;
+    MusECore::MidiPlayEvent evSysexBuildRev(0, 0, MusECore::ME_SYSEX,
+                              (const unsigned char*)&dataBuildRev, 1);
+    _gui->writeEvent(evSysexBuildRev);
+  }
+  else _pluginIReverb = NULL;
+  //chorus
+  _global.isChorusActivated = (bool)data[NUM_IS_CHORUS_ON];
+  unsigned char *dataChorusAct = new unsigned char[2];
+  dataChorusAct[0]=SYSEX_CHORUSACTIV;
+  dataChorusAct[1]=(unsigned char)_global.isChorusActivated;
+  MusECore::MidiPlayEvent evChorusAct(0, 0, MusECore::ME_SYSEX,(const unsigned char*)dataChorusAct, 2);
+  _gui->writeEvent(evChorusAct);
+  setChorusReturn((int)data[NUM_CHORUS_RETURN]);
+  unsigned char *dataChorusRet = new unsigned char[2];
+  dataChorusRet[0]=SYSEX_CHORUSRETURN;
+  dataChorusRet[1]=(unsigned char)getChorusReturn();
+  MusECore::MidiPlayEvent evChorusRet(0, 0, MusECore::ME_SYSEX,(const unsigned char*)dataChorusRet, 2);
+  _gui->writeEvent(evChorusRet);
+  p = MusEGlobal::plugins.find((const char*)&data[NUM_CHORUS_LIB],
+                    (const char*)&data[NUM_CHORUS_LABEL]);
+  if(p) {
+    initPluginChorus(p);
+    for(int i = 0; i < (int)_pluginIChorus->plugin()->controlInPorts(); i++) {
+      float val;
+      //memcpy(&val, &data[(data[3] == SYSEX_INIT_DATA_VERSION_2 ? NUM_CONFIGLENGTH : NUM_DELAY_WET_DRY_MIX)  // HACK
+      memcpy(&val, &data[NUM_CONFIGLENGTH
+                          + sizeof(float)*(int)data[NUM_REVERB_PARAM_NBR]
+                          + sizeof(float)*i],
+              sizeof(float));
+      _pluginIChorus->putParam(i, val);
     }
-    else _pluginIChorus = NULL;
-    //delay
-    _global.isDelayActivated = (bool)data[NUM_IS_DELAY_ON];
-    unsigned char *dataDelayAct = new unsigned char[2];
-    dataDelayAct[0]=SYSEX_DELAYACTIV;
-    dataDelayAct[1]=(unsigned char)_global.isDelayActivated;
-    MusECore::MidiPlayEvent evDelayAct(0, 0, MusECore::ME_SYSEX,(const unsigned char*)dataDelayAct, 2);
-    _gui->writeEvent(evDelayAct);    
-    setDelayReturn((int)data[NUM_DELAY_RETURN]);
-    unsigned char *dataDelayRet = new unsigned char[2];
-    dataDelayRet[0]=SYSEX_DELAYRETURN;
-    dataDelayRet[1]=(unsigned char)getDelayReturn();
-    MusECore::MidiPlayEvent evDelayRet(0, 0, MusECore::ME_SYSEX,(const unsigned char*)dataDelayRet, 2);
-    _gui->writeEvent(evDelayRet);    
-    //initPluginDelay(MusEGlobal::plugins.find("pandelay", "pandelay"));
-    float delayfloat;
-    memcpy(&delayfloat, &data[NUM_DELAY_BPM], sizeof(float));
-    setDelayBPM(delayfloat);
-    char dataDelayBPM[sizeof(float)+1];
-    dataDelayBPM[0] = SYSEX_DELAYBPM;
-    memcpy(&dataDelayBPM[1], &delayfloat, sizeof(float));
-    MusECore::MidiPlayEvent evSysexDelayBPM(0, 0, MusECore::ME_SYSEX,
-			      (const unsigned char*)dataDelayBPM,
-			      sizeof(float)+1);
-    _gui->writeEvent(evSysexDelayBPM);
-    memcpy(&delayfloat, &data[NUM_DELAY_BEATRATIO], sizeof(float));
-    setDelayBeatRatio(delayfloat);
-    char dataDelayBeatRatio[sizeof(float)+1];
-    dataDelayBeatRatio[0] = SYSEX_DELAYBEATRATIO;
-    memcpy(&dataDelayBeatRatio[1], &delayfloat, sizeof(float));
-    MusECore::MidiPlayEvent evSysexDelayBeatRatio(0, 0, MusECore::ME_SYSEX,
-				    (const unsigned char*)dataDelayBeatRatio,
-				    sizeof(float)+1);
-    _gui->writeEvent(evSysexDelayBeatRatio);
-    memcpy(&delayfloat, &data[NUM_DELAY_FEEDBACK], sizeof(float));
-    setDelayFeedback(delayfloat);
-    char dataDelayFeedback[sizeof(float)+1];
-    dataDelayFeedback[0] = SYSEX_DELAYFEEDBACK;
-    memcpy(&dataDelayFeedback[1], &delayfloat, sizeof(float));
-    MusECore::MidiPlayEvent evSysexDelayFeedback(0, 0, MusECore::ME_SYSEX,
-				   (const unsigned char*)dataDelayFeedback,
-				   sizeof(float)+1);
-    _gui->writeEvent(evSysexDelayFeedback);
-    memcpy(&delayfloat, &data[NUM_DELAY_LFO_FREQ], sizeof(float));
-    setDelayLFOFreq(delayfloat);
-    char dataDelayLFOFreq[sizeof(float)+1];
-    dataDelayLFOFreq[0] = SYSEX_DELAYLFOFREQ;
-    memcpy(&dataDelayLFOFreq[1], &delayfloat, sizeof(float));
-    MusECore::MidiPlayEvent evSysexDelayLFOFreq(0, 0, MusECore::ME_SYSEX,
-				  (const unsigned char*)dataDelayLFOFreq,
-				  sizeof(float)+1);
-    _gui->writeEvent(evSysexDelayLFOFreq);
-    memcpy(&delayfloat, &data[NUM_DELAY_LFO_DEPTH], sizeof(float));
-    setDelayLFODepth(delayfloat);
-    char dataDelayLFODepth[sizeof(float)+1];
-    dataDelayLFODepth[0] = SYSEX_DELAYLFODEPTH;
-    memcpy(&dataDelayLFODepth[1], &delayfloat, sizeof(float));
-    MusECore::MidiPlayEvent evSysexDelayLFODepth(0, 0, MusECore::ME_SYSEX,
-				   (const unsigned char*)dataDelayLFODepth,
-				   sizeof(float)+1);
-    _gui->writeEvent(evSysexDelayLFODepth);
-
-    //load the set compressed
-    int offset =
-      NUM_CONFIGLENGTH 
-      + sizeof(float)*(int)data[NUM_REVERB_PARAM_NBR]
-      + sizeof(float)*(int)data[NUM_CHORUS_PARAM_NBR];
-    QByteArray baComp = QByteArray((const char*)&data[offset], length-offset);
-    
-    //uncompress the set
-    QByteArray baUncomp = qUncompress(baComp);
-
-    //save the set in a temporary file and
-    // read the XML file and create DOM tree
-    QTemporaryFile file;
-    file.open();
-    file.write(baUncomp);
-    QDomDocument domTree;
-    file.reset(); //seek the start of the file
-    domTree.setContent(&file);
-    file.close();
-    QDomNode node = domTree.documentElement();
-    
-    while (!node.isNull()) {
-      QDomElement e = node.toElement();
-      if (e.isNull())
-	continue;
-      if (e.tagName() == "deicsOnzeSet") {
-	QString version = e.attribute(QString("version"));
-	if (version == "1.0") {
-	  for(int c = 0; c < NBRCHANNELS; c++) _preset[c]=_initialPreset;
-	  //read the set
-	  if((bool)data[NUM_SAVEONLYUSED]) {
-	    //printf("Mini\n");
-	    //updateSaveOnlyUsed(true);
-	  }
-	  else {
-	    //printf("Huge\n");
-	    while(!_set->_categoryVector.empty())
-	      delete(*_set->_categoryVector.begin());
-	    //updateSaveOnlyUsed(false);
-	  }
-	  _set->readSet(node.firstChild());
-	  //display load preset
-	  //setSet();
-	}
-	else printf("Wrong set version : %s\n",
-		    version.toLatin1().constData());
+    char dataBuildCho;
+    dataBuildCho = SYSEX_BUILDGUICHORUS;
+    MusECore::MidiPlayEvent evSysexBuildCho(0, 0, MusECore::ME_SYSEX,
+                              (const unsigned char*)&dataBuildCho, 1);
+    _gui->writeEvent(evSysexBuildCho);
+  }
+  else _pluginIChorus = NULL;
+  //delay
+  _global.isDelayActivated = (bool)data[NUM_IS_DELAY_ON];
+  unsigned char *dataDelayAct = new unsigned char[2];
+  dataDelayAct[0]=SYSEX_DELAYACTIV;
+  dataDelayAct[1]=(unsigned char)_global.isDelayActivated;
+  MusECore::MidiPlayEvent evDelayAct(0, 0, MusECore::ME_SYSEX,(const unsigned char*)dataDelayAct, 2);
+  _gui->writeEvent(evDelayAct);
+  setDelayReturn((int)data[NUM_DELAY_RETURN]);
+  unsigned char *dataDelayRet = new unsigned char[2];
+  dataDelayRet[0]=SYSEX_DELAYRETURN;
+  dataDelayRet[1]=(unsigned char)getDelayReturn();
+  MusECore::MidiPlayEvent evDelayRet(0, 0, MusECore::ME_SYSEX,(const unsigned char*)dataDelayRet, 2);
+  _gui->writeEvent(evDelayRet);
+  //initPluginDelay(MusEGlobal::plugins.find("pandelay", "pandelay"));
+  float delayfloat;
+  memcpy(&delayfloat, &data[NUM_DELAY_BPM], sizeof(float));
+  //setDelayBPM(delayfloat);
+  if(_pluginIDelay) _pluginIDelay->putParam(0, delayfloat);
+  char dataDelayBPM[sizeof(float)+1];
+  dataDelayBPM[0] = SYSEX_DELAYBPM;
+  memcpy(&dataDelayBPM[1], &delayfloat, sizeof(float));
+  MusECore::MidiPlayEvent evSysexDelayBPM(0, 0, MusECore::ME_SYSEX,
+                            (const unsigned char*)dataDelayBPM,
+                            sizeof(float)+1);
+  _gui->writeEvent(evSysexDelayBPM);
+  memcpy(&delayfloat, &data[NUM_DELAY_BEATRATIO], sizeof(float));
+  //setDelayBeatRatio(delayfloat);
+  if(_pluginIDelay) _pluginIDelay->putParam(1, delayfloat);
+  char dataDelayBeatRatio[sizeof(float)+1];
+  dataDelayBeatRatio[0] = SYSEX_DELAYBEATRATIO;
+  memcpy(&dataDelayBeatRatio[1], &delayfloat, sizeof(float));
+  MusECore::MidiPlayEvent evSysexDelayBeatRatio(0, 0, MusECore::ME_SYSEX,
+                                  (const unsigned char*)dataDelayBeatRatio,
+                                  sizeof(float)+1);
+  _gui->writeEvent(evSysexDelayBeatRatio);
+  memcpy(&delayfloat, &data[NUM_DELAY_FEEDBACK], sizeof(float));
+  //setDelayFeedback(delayfloat);
+  if(_pluginIDelay) _pluginIDelay->putParam(2, delayfloat);
+  char dataDelayFeedback[sizeof(float)+1];
+  dataDelayFeedback[0] = SYSEX_DELAYFEEDBACK;
+  memcpy(&dataDelayFeedback[1], &delayfloat, sizeof(float));
+  MusECore::MidiPlayEvent evSysexDelayFeedback(0, 0, MusECore::ME_SYSEX,
+                                  (const unsigned char*)dataDelayFeedback,
+                                  sizeof(float)+1);
+  _gui->writeEvent(evSysexDelayFeedback);
+  memcpy(&delayfloat, &data[NUM_DELAY_LFO_FREQ], sizeof(float));
+  //setDelayLFOFreq(delayfloat);
+  if(_pluginIDelay) _pluginIDelay->putParam(3, delayfloat);
+  char dataDelayLFOFreq[sizeof(float)+1];
+  dataDelayLFOFreq[0] = SYSEX_DELAYLFOFREQ;
+  memcpy(&dataDelayLFOFreq[1], &delayfloat, sizeof(float));
+  MusECore::MidiPlayEvent evSysexDelayLFOFreq(0, 0, MusECore::ME_SYSEX,
+                                (const unsigned char*)dataDelayLFOFreq,
+                                sizeof(float)+1);
+  _gui->writeEvent(evSysexDelayLFOFreq);
+  memcpy(&delayfloat, &data[NUM_DELAY_LFO_DEPTH], sizeof(float));
+  //setDelayLFODepth(delayfloat);
+  if(_pluginIDelay) _pluginIDelay->putParam(4, delayfloat);
+  char dataDelayLFODepth[sizeof(float)+1];
+  dataDelayLFODepth[0] = SYSEX_DELAYLFODEPTH;
+  memcpy(&dataDelayLFODepth[1], &delayfloat, sizeof(float));
+  MusECore::MidiPlayEvent evSysexDelayLFODepth(0, 0, MusECore::ME_SYSEX,
+                                  (const unsigned char*)dataDelayLFODepth,
+                                  sizeof(float)+1);
+  _gui->writeEvent(evSysexDelayLFODepth);
+
+//   if(data[3] == SYSEX_INIT_DATA_VERSION_2)
+//   {
+//     memcpy(&delayfloat, &data[NUM_DELAY_WET_DRY_MIX], sizeof(float));
+//     //setDelayLFODepth(delayfloat);
+//     if(_pluginIDelay) _pluginIDelay->putParam(5, delayfloat);
+//     char dataDelayWetDryMix[sizeof(float)+1];
+//     dataDelayWetDryMix[0] = SYSEX_DELAYWETDRYMIX;
+//     memcpy(&dataDelayWetDryMix[1], &delayfloat, sizeof(float));
+//     MusECore::MidiPlayEvent evSysexDelayWetDryMix(0, 0, MusECore::ME_SYSEX,
+//                                     (const unsigned char*)dataDelayWetDryMix,
+//                                     sizeof(float)+1);
+//     _gui->writeEvent(evSysexDelayWetDryMix);
+//   }
+  
+  //load the set compressed
+  int offset =
+    //(data[3] == SYSEX_INIT_DATA_VERSION_2 ? NUM_CONFIGLENGTH : NUM_DELAY_WET_DRY_MIX)  // HACK
+    NUM_CONFIGLENGTH
+    + sizeof(float)*(int)data[NUM_REVERB_PARAM_NBR]
+    + sizeof(float)*(int)data[NUM_CHORUS_PARAM_NBR];
+  QByteArray baComp = QByteArray((const char*)&data[offset], length-offset);
+
+  //uncompress the set
+  QByteArray baUncomp = qUncompress(baComp);
+
+  //save the set in a temporary file and
+  // read the XML file and create DOM tree
+  QTemporaryFile file;
+  file.open();
+  file.write(baUncomp);
+  QDomDocument domTree;
+  file.reset(); //seek the start of the file
+  domTree.setContent(&file);
+  file.close();
+  QDomNode node = domTree.documentElement();
+
+  while (!node.isNull()) {
+    QDomElement e = node.toElement();
+    if (e.isNull())
+      continue;
+    if (e.tagName() == "deicsOnzeSet") {
+      QString version = e.attribute(QString("version"));
+      if (version == "1.0") {
+        for(int c = 0; c < NBRCHANNELS; c++) _preset[c]=_initialPreset;
+        //read the set
+        if((bool)data[NUM_SAVEONLYUSED]) {
+          //printf("Mini\n");
+          //updateSaveOnlyUsed(true);
+        }
+        else {
+          //printf("Huge\n");
+          while(!_set->_categoryVector.empty())
+            delete(*_set->_categoryVector.begin());
+          //updateSaveOnlyUsed(false);
+        }
+        _set->readSet(node.firstChild());
+        //display load preset
+        //setSet();
       }
-      node = node.nextSibling();
+      else printf("Wrong set version : %s\n",
+                  version.toLatin1().constData());
     }
-    //send sysex to the gui to load the set (actually not because it doesn't
-    //work -the code is just zapped in the middle???-, so it is done above
-    //int dL=2+baUncomp.size();
-    int dL = 2;
-    char dataSend[dL];
-    dataSend[0]=SYSEX_LOADSET;
-    dataSend[1]=data[NUM_SAVEONLYUSED];
-    //for(int i=2; i<dL; i++) dataSend[i]=baUncop.at(i-2);
-    MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX,(const unsigned char*)dataSend, dL);
-    _gui->writeEvent(evSysex);
-
-    //select programs per channel
-    for(int c = 0; c < NBRCHANNELS; c++) {
-      int hbank=(int)data[NUM_CURRENTHBANK+c];
-      int lbank=(int)data[NUM_CURRENTLBANK+c];
-      int prog=(int)data[NUM_CURRENTPROG+c];
-      programSelect(c, hbank, lbank, prog);
-      int val=prog+(lbank<<8)+(hbank<<16);
-      MusECore::MidiPlayEvent evProgSel(0, 0, c, MusECore::ME_CONTROLLER, MusECore::CTRL_PROGRAM, val);
-      _gui->writeEvent(evProgSel);
-    }
-
+    node = node.nextSibling();
+  }
+  //send sysex to the gui to load the set (actually not because it doesn't
+  //work -the code is just zapped in the middle???-, so it is done above
+  //int dL=2+baUncomp.size();
+  int dL = 2;
+  char dataSend[dL];
+  dataSend[0]=SYSEX_LOADSET;
+  dataSend[1]=data[NUM_SAVEONLYUSED];
+  //for(int i=2; i<dL; i++) dataSend[i]=baUncop.at(i-2);
+  MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX,(const unsigned char*)dataSend, dL);
+  _gui->writeEvent(evSysex);
+
+  //select programs per channel
+  for(int c = 0; c < NBRCHANNELS; c++) {
+    int hbank=(int)data[NUM_CURRENTHBANK+c];
+    int lbank=(int)data[NUM_CURRENTLBANK+c];
+    int prog=(int)data[NUM_CURRENTPROG+c];
+    programSelect(c, hbank, lbank, prog);
+    int val=prog+(lbank<<8)+(hbank<<16);
+    MusECore::MidiPlayEvent evProgSel(0, 0, c, MusECore::ME_CONTROLLER, MusECore::CTRL_PROGRAM, val);
+    _gui->writeEvent(evProgSel);
   }
+
 }
 //---------------------------------------------------------
 // sysex
@@ -2840,7 +2875,6 @@ bool DeicsOnze::sysex(int length, const unsigned char* data, bool fromGui) {
   
   int l = length - 2;
   const unsigned char* d = data + 2;
-  ///int cmd=data[0];
   int cmd=d[0];
   int index;
   float f;
@@ -2850,100 +2884,78 @@ bool DeicsOnze::sysex(int length, const unsigned char* data, bool fromGui) {
     //parseInitData(l, d);
     break;
   case SYSEX_MASTERVOL:
-    ///setMasterVol((int)data[1]);
     setMasterVol((int)d[1]);
     if(!fromGui) {
-      ///MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, data, length);
       MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, d, l);
       _gui->writeEvent(evSysex);
     }
     break;
     //case SYSEX_CHANNELNUM:
-    ///_global.channelNum = (char)data[1];
     //_global.channelNum = (char)d[1];
     //if(!fromGui) {
-    ///  MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, data, length);
     //  MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, d, l);
     //  _gui->writeEvent(evSysex);
     //}
     //break;
   case SYSEX_QUALITY:
-    ///setQuality((Quality)data[1]);
     setQuality((Quality)d[1]);
     if(!fromGui) {
-      ///MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, data, length);
       MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, d, l);
       _gui->writeEvent(evSysex);
     }
     break;
   case SYSEX_FILTER:
-    ///setFilter((bool)data[1]);
     setFilter((bool)d[1]);
     if(!fromGui) {
-      ///MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, data, length);
       MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, d, l);
       _gui->writeEvent(evSysex);
     }
     break;
   case SYSEX_FONTSIZE:
-    ///_global.fontSize = (int)data[1];
     _global.fontSize = (int)d[1];
     if(!fromGui) {
-      ///MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, data, length);
       MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, d, l);
       _gui->writeEvent(evSysex);
     }
     break;
   case SYSEX_SAVECONFIG:
-    ///_saveConfig = (bool)data[1];
     _saveConfig = (bool)d[1];
     if(!fromGui) {
-      ///MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, data, length);
       MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, d, l);
       _gui->writeEvent(evSysex);
     }
     break;
   case SYSEX_SAVEONLYUSED:
-    ///_saveOnlyUsed = (bool)data[1];
     _saveOnlyUsed = (bool)d[1];
     if(!fromGui) {
-      ///MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, data, length);
       MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, d, l);
       _gui->writeEvent(evSysex);
     }
     break;
   case SYSEX_ISINITSET:
-    ///_isInitSet = (bool)data[1];
     _isInitSet = (bool)d[1];
     if(!fromGui) {
-      ///MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, data, length);
       MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, d, l);
       _gui->writeEvent(evSysex);
     }
     break;
   case SYSEX_INITSETPATH:
-    ///_initSetPath = (char*)&data[1];
     _initSetPath = (char*)&d[1];
     if(!fromGui) {
-      ///MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, data, length);
       MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, d, l);
       _gui->writeEvent(evSysex);
     }
     break;
   case SYSEX_ISBACKGROUNDPIX:
-    ///_isBackgroundPix = (bool)data[1];
     _isBackgroundPix = (bool)d[1];
     if(!fromGui) {
-      ///MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, data, length);
       MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, d, l);
       _gui->writeEvent(evSysex);
     }
     break;
   case SYSEX_BACKGROUNDPIXPATH:
-    ///_backgroundPixPath = (char*)&data[1];
     _backgroundPixPath = (char*)&d[1];
     if(!fromGui) {
-      ///MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, data, length);
       MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, d, l);
       _gui->writeEvent(evSysex);
     }
@@ -2952,145 +2964,123 @@ bool DeicsOnze::sysex(int length, const unsigned char* data, bool fromGui) {
     resetVoices();
     break;
   case SYSEX_CHORUSACTIV:
-    ///_global.isChorusActivated = (bool)data[1];
     _global.isChorusActivated = (bool)d[1];
     if(!fromGui) {
-      ///MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, data, length);
       MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, d, l);
       _gui->writeEvent(evSysex);
     }
     break;
   case SYSEX_CHORUSPARAM:
-    ///index = (int)data[1];
-    ///memcpy(&f, &data[2], sizeof(float));
     index = (int)d[1];
     memcpy(&f, &d[2], sizeof(float));
-    setChorusParam(index, (double)f);
+    setChorusParam(index, f);
     if(!fromGui) {
-      ///MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, data, length);
       MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, d, l);
       _gui->writeEvent(evSysex);
     }
     break;       
   case SYSEX_REVERBACTIV:
-    ///_global.isReverbActivated = (bool)data[1];
     _global.isReverbActivated = (bool)d[1];
     if(!fromGui) {
-      ///MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, data, length);
       MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, d, l);
       _gui->writeEvent(evSysex);
     }
     break;
   case SYSEX_REVERBPARAM:
-    ///index = (int)data[1];
-    ///memcpy(&f, &data[2], sizeof(float));
     index = (int)d[1];
     memcpy(&f, &d[2], sizeof(float));
-    setReverbParam(index, (double)f);
+    setReverbParam(index, f);
     if(!fromGui) {
-      ///MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, data, length);
       MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, d, l);
       _gui->writeEvent(evSysex);
     }
     break;       
   case SYSEX_DELAYACTIV:
-    ///_global.isDelayActivated = (bool)data[1];
     _global.isDelayActivated = (bool)d[1];
     if(!fromGui) {
-      ///MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, data, length);
       MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, d, l);
       _gui->writeEvent(evSysex);
     }
     break;
   case SYSEX_CHORUSRETURN:
-    ///setChorusReturn((int)data[1]);
     setChorusReturn((int)d[1]);
     if(!fromGui) {
-      ///MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, data, length);
       MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, d, l);
       _gui->writeEvent(evSysex);
     }
     break;
   case SYSEX_REVERBRETURN:
-    ///setReverbReturn((int)data[1]);
     setReverbReturn((int)d[1]);
     if(!fromGui) {
-      ///MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, data, length);
       MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, d, l);
       _gui->writeEvent(evSysex);
     }
     break;
   case SYSEX_DELAYRETURN:
-    ///setDelayReturn((int)data[1]);
     setDelayReturn((int)d[1]);
     if(!fromGui) {
-      ///MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, data, length);
       MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, d, l);
       _gui->writeEvent(evSysex);
     }
     break;
   case SYSEX_SELECTREVERB:
     MusECore::Plugin* pluginReverb;
-    ///memcpy(&pluginReverb, &data[1], sizeof(MusECore::Plugin*));
     memcpy(&pluginReverb, &d[1], sizeof(MusECore::Plugin*));
     initPluginReverb(pluginReverb);
     break;
   case SYSEX_SELECTCHORUS:
     MusECore::Plugin* pluginChorus;
-    ///memcpy(&pluginChorus, &data[1], sizeof(MusECore::Plugin*));
     memcpy(&pluginChorus, &d[1], sizeof(MusECore::Plugin*));
     initPluginChorus(pluginChorus);
     break;
   case SYSEX_DELAYBPM:
-    ///memcpy(&f, &data[1], sizeof(float));
     memcpy(&f, &d[1], sizeof(float));
     setDelayBPM(f);
     if(!fromGui) {
-      ///MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, data, length);
       MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, d, l);
       _gui->writeEvent(evSysex);
     }
     break;    
   case SYSEX_DELAYBEATRATIO:
-    ///memcpy(&f, &data[1], sizeof(float));
     memcpy(&f, &d[1], sizeof(float));
     setDelayBeatRatio(f);
     if(!fromGui) {
-      ///MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, data, length);
       MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, d, l);
       _gui->writeEvent(evSysex);
     }
     break;    
   case SYSEX_DELAYFEEDBACK:
-    ///memcpy(&f, &data[1], sizeof(float));
     memcpy(&f, &d[1], sizeof(float));
     setDelayFeedback(f);
     if(!fromGui) {
-      ///MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, data, length);
       MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, d, l);
       _gui->writeEvent(evSysex);
     }
     break;    
   case SYSEX_DELAYLFOFREQ:
-    ///memcpy(&f, &data[1], sizeof(float));
     memcpy(&f, &d[1], sizeof(float));
     setDelayLFOFreq(f);
     if(!fromGui) {
-      ///MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, data, length);
       MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, d, l);
       _gui->writeEvent(evSysex);
     }
     break;    
   case SYSEX_DELAYLFODEPTH:
-    ///memcpy(&f, &data[1], sizeof(float));
     memcpy(&f, &d[1], sizeof(float));
     setDelayLFODepth(f);
     if(!fromGui) {
-      ///MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, data, length);
       MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, d, l);
       _gui->writeEvent(evSysex);
     }
     break;    
+  case SYSEX_DELAYWETDRYMIX:
+    memcpy(&f, &d[1], sizeof(float));
+    setDelayDryWet(f);
+    if(!fromGui) {
+      MusECore::MidiPlayEvent evSysex(0, 0, MusECore::ME_SYSEX, d, l);
+      _gui->writeEvent(evSysex);
+    }
+    break;
   default:
     break;
   }
@@ -4492,7 +4482,6 @@ void DeicsOnze::process(float** buffer, int offset, int n) {
 
 class QWidget;
 
-///static Mess* instantiate(int sr, const char*)
 static Mess* instantiate(int sr, QWidget*, QString* /* projectPathPtr */, const char*)
 {
     DeicsOnze* deicsonze = new DeicsOnze();
diff --git a/muse2/synti/deicsonze/deicsonze.h b/muse2/synti/deicsonze/deicsonze.h
index 06e29fa7..e458b688 100644
--- a/muse2/synti/deicsonze/deicsonze.h
+++ b/muse2/synti/deicsonze/deicsonze.h
@@ -100,6 +100,7 @@
 
 #define SYSEX_INIT_DATA 1
 #define SYSEX_INIT_DATA_VERSION 1
+//#define SYSEX_INIT_DATA_VERSION_2 2
 ///#define SAVEINITLENGTH 2
 #define SAVEINITLENGTH 4    // MFG ID, synth ID, init data command, init data version
 
@@ -160,6 +161,7 @@
 #define SYSEX_DELAYFEEDBACK 95
 #define SYSEX_DELAYLFOFREQ 96
 #define SYSEX_DELAYLFODEPTH 97
+#define SYSEX_DELAYWETDRYMIX 98
 
 //REVERB PARAMETERS
 
@@ -221,6 +223,8 @@ enum {
   NUM_DELAY_LFO_FREQ = NUM_DELAY_FEEDBACK + sizeof(float),
   NUM_DELAY_LFO_DEPTH = NUM_DELAY_LFO_FREQ + sizeof(float),
   NUM_CONFIGLENGTH = NUM_DELAY_LFO_DEPTH + sizeof(float)
+  //NUM_DELAY_WET_DRY_MIX = NUM_DELAY_LFO_DEPTH + sizeof(float),
+  //NUM_CONFIGLENGTH = NUM_DELAY_WET_DRY_MIX + sizeof(float)
 };
 
 class DeicsOnzeGui;
@@ -478,16 +482,19 @@ class DeicsOnze : public Mess {
   void initPluginChorus(MusECore::Plugin*);
   void initPluginDelay(MusECore::Plugin*);
   
-  void setReverbParam(int i, double val);
-  double getReverbParam(int i) const;
-  void setChorusParam(int i, double val);
-  double getChorusParam(int i) const;
+  void setReverbParam(int i, float val);
+  float getReverbParam(int i) const;
+  void setChorusParam(int i, float val);
+  float getChorusParam(int i) const;
+  void setDelayParam(int i, float val);
+  float getDelayParam(int i) const;
   void setDelayBPM(float val);
   void setDelayBeatRatio(float val);
   void setDelayFeedback(float val);
   void setDelayLFOFreq(float val);
   void setDelayLFODepth(float val);
   void setDelayDryWet(float val);
+  float getDelayDryWet() const; 
   float getDelayBPM() const;
   float getDelayBeatRatio() const;
   float getDelayFeedback() const;
diff --git a/muse2/synti/deicsonze/deicsonzegui.cpp b/muse2/synti/deicsonze/deicsonzegui.cpp
index 52f53b86..b3c77c3a 100644
--- a/muse2/synti/deicsonze/deicsonzegui.cpp
+++ b/muse2/synti/deicsonze/deicsonzegui.cpp
@@ -1603,6 +1603,10 @@ void DeicsOnzeGui::processEvent(const MusECore::MidiPlayEvent& ev) {
       memcpy(&f, &data[1], sizeof(float));
       updateDelayPanLFODepth(f);
       break;
+    case SYSEX_DELAYWETDRYMIX :
+      memcpy(&f, &data[1], sizeof(float));
+      //updateDelayPanDryWet(f);
+      break;
     case SYSEX_QUALITY :
       updateQuality((int)data[1]);
       break;
@@ -3139,9 +3143,7 @@ void DeicsOnzeGui::setDelayBPM(double t) {
   message[1]=DEICSONZE_UNIQUE_ID;
   message[2]=SYSEX_DELAYBPM;
   float f = (float)t;
-  ///memcpy(&message[1], &f, sizeof(float));
   memcpy(&message[3], &f, sizeof(float));
-  ///message[1]=(unsigned char)f;
   message[3]=(unsigned char)f;
   sendSysex(message, sizeof(float)+3);
   //updateDelayTime(it);
@@ -3152,9 +3154,7 @@ void DeicsOnzeGui::setDelayBeatRatio(double t) {
   message[1]=DEICSONZE_UNIQUE_ID;
   message[2]=SYSEX_DELAYBEATRATIO;
   float f = (float)t;
-  ///memcpy(&message[1], &f, sizeof(float));
   memcpy(&message[3], &f, sizeof(float));
-  ///message[1]=(unsigned char)f;
   message[3]=(unsigned char)f;
   sendSysex(message, sizeof(float)+3);
 } 
diff --git a/muse2/synti/deicsonze/deicsonzegui.ui b/muse2/synti/deicsonze/deicsonzegui.ui
index 1e0d09d8..e0452eee 100644
--- a/muse2/synti/deicsonze/deicsonzegui.ui
+++ b/muse2/synti/deicsonze/deicsonzegui.ui
@@ -48,7 +48,7 @@
       <enum>QTabWidget::Rounded</enum>
      </property>
      <property name="currentIndex">
-      <number>9</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="PresetsTab">
       <attribute name="title">
diff --git a/muse2/synti/deicsonze/deicsonzeplugin.cpp b/muse2/synti/deicsonze/deicsonzeplugin.cpp
index fff03bc1..43ae5d73 100644
--- a/muse2/synti/deicsonze/deicsonzeplugin.cpp
+++ b/muse2/synti/deicsonze/deicsonzeplugin.cpp
@@ -27,6 +27,7 @@
 // 02111-1301, USA or point your web browser to http://www.gnu.org.
 //===========================================================================
 
+#include "deicsonze.h"
 #include "deicsonzeplugin.h"
 #include "plugin.h"
 ///#include "plugingui.h"
@@ -46,14 +47,21 @@ class PluginDialog;
 void DeicsOnze::initPluginReverb(MusECore::Plugin* pluginReverb) {
   //init plugin
   if(_pluginIReverb) delete(_pluginIReverb);
-  ///_pluginIReverb = new MusECore::PluginI(NULL);
   _pluginIReverb = new MusECore::PluginI();
 
   _pluginIReverb->initPluginInstance(pluginReverb, 2);
 
   //for(int i = 0; i < pluginReverb->parameter(); i++) {
-  for(int i = 0; i < (int)pluginReverb->controlInPorts(); i++) {
-    
+  //for(int i = 0; i < (int)pluginReverb->controlInPorts(); i++) {
+  for(int i = 0; i < (int)_pluginIReverb->parameters(); i++) {
+
+
+// From DSSI host. Maybe use this to add automation controllers. Problems with this method.
+//     // Support a special block for dssi synth ladspa controllers.
+//     // Put the ID at a special block after plugins (far after).
+//     //int id = MusECore::genACnum(MAX_PLUGINS, cip);
+//     int id = MusECore::genACnum(MAX_PLUGINS, i);
+
 // FIXME FIXME Tim
 /*    Ctrl* c = new Ctrl();
     c->setCurVal((float)pluginReverb->defaultValue(i));
@@ -61,6 +69,8 @@ void DeicsOnze::initPluginReverb(MusECore::Plugin* pluginReverb) {
 */
     
     //setReverbParam(i, pluginReverb->defaultValue(i));
+    //setReverbParam(i, _pluginIReverb->defaultValue(i));
+    _pluginIReverb->putParam(i, _pluginIReverb->defaultValue(i));
   }
 
   //send build gui to the gui
@@ -72,14 +82,13 @@ void DeicsOnze::initPluginReverb(MusECore::Plugin* pluginReverb) {
 
 void DeicsOnze::initPluginChorus(MusECore::Plugin* pluginChorus) {
   if(_pluginIChorus) delete(_pluginIChorus);
-  ///_pluginIChorus = new MusECore::PluginI(NULL);
   _pluginIChorus = new MusECore::PluginI();
 
   _pluginIChorus->initPluginInstance(pluginChorus, 2);
 
   //for(int i = 0; i < pluginChorus->parameter(); i++) {
-  for(int i = 0; i < (int)pluginChorus->controlInPorts(); i++) {
-
+  for(int i = 0; i < (int)_pluginIChorus->parameters(); i++) {
+  
 // FIXME FIXME Tim
 /*    
     Ctrl* c = new Ctrl();
@@ -88,7 +97,9 @@ void DeicsOnze::initPluginChorus(MusECore::Plugin* pluginChorus) {
 */    
     
     //setChorusParam(i, pluginChorus->defaultValue(i));
-}
+    //setChorusParam(i, _pluginIChorus->defaultValue(i));
+    _pluginIChorus->putParam(i, _pluginIChorus->defaultValue(i));
+  }
 
   //send build gui to the gui
   char data;
@@ -99,14 +110,13 @@ void DeicsOnze::initPluginChorus(MusECore::Plugin* pluginChorus) {
 
 void DeicsOnze::initPluginDelay(MusECore::Plugin* pluginDelay) {
   if(_pluginIDelay) delete(_pluginIDelay);
-  ///_pluginIDelay = new MusECore::PluginI(NULL);
   _pluginIDelay = new MusECore::PluginI();
 
   _pluginIDelay->initPluginInstance(pluginDelay, 2);
 
   //for(int i = 0; i < pluginDelay->parameter(); i++) { 
-  for(int i = 0; i < (int)pluginDelay->controlInPorts(); i++) { 
-
+  for(int i = 0; i < (int)_pluginIDelay->parameters(); i++) {
+   
 // FIXME FIXME Tim
 /*    
     Ctrl* c = new Ctrl();
@@ -115,8 +125,11 @@ void DeicsOnze::initPluginDelay(MusECore::Plugin* pluginDelay) {
 */    
 
     //setChorusParam(i, pluginDelay->defaultValue(i));
+    setDelayParam(i, _pluginIDelay->defaultValue(i));
   }
-  setDelayDryWet(1);
+
+  //setDelayDryWet(1);
+  _pluginIDelay->putParam(5, 1.0);
   
   float f;
   char dataDelayBPM[sizeof(float)+1];
@@ -159,20 +172,33 @@ void DeicsOnze::initPluginDelay(MusECore::Plugin* pluginDelay) {
 				 (const unsigned char*)dataDelayLFODepth,
 				 sizeof(float)+1);
   _gui->writeEvent(evSysexDelayLFODepth); 
+  char dataDelayWetDryMix[sizeof(float)+1];
+  dataDelayWetDryMix[0] = SYSEX_DELAYWETDRYMIX;
+  f = getDelayDryWet();
+  memcpy(&dataDelayWetDryMix, &f, sizeof(float)+1);
+  MusECore::MidiPlayEvent evSysexDelayWetDryMix(0, 0,MusECore::ME_SYSEX,
+                                 (const unsigned char*)dataDelayWetDryMix,
+                                 sizeof(float)+1);
+  _gui->writeEvent(evSysexDelayWetDryMix);
 }
 
-void DeicsOnze::setReverbParam(int index, double val) {
+void DeicsOnze::setReverbParam(int index, float val) {
   ///if(_pluginIReverb) _pluginIReverb->controller(index)->setCurVal((float)val);
   if(_pluginIReverb) _pluginIReverb->setParam(index, val);
   else printf("Warning : no DeicsOnze reverb loaded\n");
 }
-void DeicsOnze::setChorusParam(int index, double val) {
+void DeicsOnze::setChorusParam(int index, float val) {
   ///if(_pluginIChorus) _pluginIChorus->controller(index)->setCurVal((float)val);
   if(_pluginIChorus) _pluginIChorus->setParam(index, val);
   else printf("Warning : no DeicsOnze chorus loaded\n");
 }
+void DeicsOnze::setDelayParam(int index, float val) {
+  ///if(_pluginIDelay) _pluginIDelay->controller(index)->setCurVal((float)val);
+  if(_pluginIDelay) _pluginIDelay->setParam(index, val);
+  else printf("Warning : no DeicsOnze delay loaded\n");
+}
 
-double DeicsOnze::getReverbParam(int index) const {
+float DeicsOnze::getReverbParam(int index) const {
   ///if(_pluginIReverb) return _pluginIReverb->controller(index)->curVal().f; 
   if(_pluginIReverb) return _pluginIReverb->param(index); 
   else {
@@ -181,7 +207,7 @@ double DeicsOnze::getReverbParam(int index) const {
   }
 }
 
-double DeicsOnze::getChorusParam(int index) const {
+float DeicsOnze::getChorusParam(int index) const {
   ///if(_pluginIChorus) return _pluginIChorus->controller(index)->curVal().f;
   if(_pluginIChorus) return _pluginIChorus->param(index);
   else {
@@ -190,6 +216,15 @@ double DeicsOnze::getChorusParam(int index) const {
   }    
 }
 
+float DeicsOnze::getDelayParam(int index) const {
+  ///if(_pluginIDelay) return _pluginIDelay->controller(index)->curVal().f;
+  if(_pluginIDelay) return _pluginIDelay->param(index);
+  else {
+    return 0.0;
+    printf("Warning : no DeicsOnze delay loaded\n");
+  }
+}
+
 void DeicsOnzeGui::addPluginCheckBox(int index, QString text, bool toggled,
 				     QWidget* parent, QGridLayout* grid,
 				     bool isReverb) {
@@ -233,9 +268,10 @@ void DeicsOnzeGui::addPluginSlider(int index, QString text, bool isLog,
   QLabel* l = new QLabel(text, parent);
   grid->addWidget(l, index, 0);
   FloatEntry* f = new FloatEntry(parent);
+  f->setId(index);
+  f->setLog(isLog);
+  f->setLogRange(min, max);
   f->setValue(val);
-  f->setMinValue(min);
-  f->setMaxValue(max);
   f->setMaximumWidth(72);
   grid->addWidget(f, index, 1);
   Slider* s = new Slider(parent);
@@ -299,26 +335,19 @@ void DeicsOnzeGui::buildGuiReverb() {
   //build sliders                                         
   //for(int i = 0; i < plugI->plugin()->parameter(); i++) { 
   for(int i = 0; i < (int)plugI->plugin()->controlInPorts(); i++) { 
-    ///double min, max, val;
-    float min, max; //, val;
+    float min, max, val;
     plugI->range(i, &min, &max);
 
-// FIXME FIXME Tim
-/*     
     val = _deicsOnze->getReverbParam(i);
-     if(plugI->isBool(i))
-      addPluginCheckBox(i, plugI->getParameterName(i), val > 0.0,
-			_reverbSuperWidget, grid, true);
-    else if(plugI->isInt(i)) {
-      addPluginIntSlider(i, plugI->getParameterName(i), rint(min), rint(max),
-			 rint(val), _reverbSuperWidget, grid, true);
-    }
-    else {
-      addPluginSlider(i, plugI->getParameterName(i), plugI->isLog(i),
-		      min, max, val, _reverbSuperWidget, grid, true);
-    }
-*/    
-    
+     if(plugI->ctrlValueType(i) == MusECore::VAL_BOOL)
+      addPluginCheckBox(i, plugI->paramName(i), val > 0.0,
+                        _reverbSuperWidget, grid, true);
+    else if(plugI->ctrlValueType(i) == MusECore::VAL_INT) 
+      addPluginIntSlider(i, plugI->paramName(i), rint(min), rint(max),
+                         rint(val), _reverbSuperWidget, grid, true);
+    else 
+      addPluginSlider(i, plugI->paramName(i), plugI->ctrlValueType(i) == MusECore::VAL_LOG,
+                      min, max, val, _reverbSuperWidget, grid, true);
   }
   //update colors of the new sliders (and the whole gui actually)
   setEditTextColor(reinterpret_cast<const QColor &>(*etColor));
@@ -350,26 +379,19 @@ void DeicsOnzeGui::buildGuiChorus() {
   //build sliders                              
   //for(int i = 0; i < plugI->plugin()->parameter(); i++) {
   for(int i = 0; i < (int)plugI->plugin()->controlInPorts(); i++) {
-    ///double min, max, val;
-    float min, max; //, val;
+    float min, max, val;
     plugI->range(i, &min, &max);
     
-// FIXME FIXME Tim
-/*    
     val = _deicsOnze->getChorusParam(i);
-    if(plugI->isBool(i))
-      addPluginCheckBox(i, plugI->getParameterName(i), val > 0.0,
-			_chorusSuperWidget, grid, false);
-    else if(plugI->isInt(i)) {
-      addPluginIntSlider(i, plugI->getParameterName(i), rint(min), rint(max),
-			 rint(val), _chorusSuperWidget, grid, false);
-    }
-    else {
-      addPluginSlider(i, plugI->getParameterName(i), plugI->isLog(i),
-		      min, max, val, _chorusSuperWidget, grid, false);
-    }
-*/    
-    
+    if(plugI->ctrlValueType(i) == MusECore::VAL_BOOL)
+      addPluginCheckBox(i, plugI->paramName(i), val > 0.0,
+                        _chorusSuperWidget, grid, false);
+    else if(plugI->ctrlValueType(i) == MusECore::VAL_INT) 
+      addPluginIntSlider(i, plugI->paramName(i), rint(min), rint(max),
+                         rint(val), _chorusSuperWidget, grid, false);
+    else 
+      addPluginSlider(i, plugI->paramName(i), plugI->ctrlValueType(i) == MusECore::VAL_LOG,
+                      min, max, val, _chorusSuperWidget, grid, false);
   }
   //update colors of the new sliders (and the whole gui actually)
   setEditTextColor(reinterpret_cast<const QColor &>(*etColor));
@@ -380,85 +402,75 @@ void DeicsOnzeGui::buildGuiChorus() {
 //of the parameter because it sends a double and does not
 //change any thing
 void DeicsOnzeGui::setReverbCheckBox(double v, int i) {
-  float f = (float)v;
-  unsigned char* message = new unsigned char[2+sizeof(float)];
-  message[0]=SYSEX_REVERBPARAM;
-  if(i<256) {
-    message[1]=(unsigned char)i;
-    memcpy(&message[2], &f, sizeof(float));
-    sendSysex(message, 2+sizeof(float));
+  if(i>=256) {
+    printf("setReverbCheckBox Error : controller index >= 256\n");
+    return;    
   }
-  else printf("setReverbCheckBox Error : cannot send controller upper than 225\n");
+  float f = (float)v;
+  unsigned char message[sizeof(float)+4];
+  message[0]=MUSE_SYNTH_SYSEX_MFG_ID;
+  message[1]=DEICSONZE_UNIQUE_ID;
+  message[2]=SYSEX_REVERBPARAM;
+  message[3]=(unsigned char)i;
+  memcpy(&message[4], &f, sizeof(float));
+  sendSysex(message, sizeof(float)+4);
 }
 
 //setChorusCheckBox is used, by the way, to send the value
 //of the parameter because it sends a double and does not
 //change any thing
 void DeicsOnzeGui::setChorusCheckBox(double v, int i) {
-  float f = (float)v;
-  unsigned char* message = new unsigned char[2+sizeof(float)];
-  message[0]=SYSEX_CHORUSPARAM;
-  if(i<256) {
-    message[1]=(unsigned char)i;
-    memcpy(&message[2], &f, sizeof(float));
-    sendSysex(message, 2+sizeof(float));
+  if(i>=256) {
+    printf("setChorusCheckBox Error : controller index >= 256\n");
+    return;
   }
-  else printf("setChorusCheckBox Error : cannot send controller upper than 225\n");
+  float f = (float)v;
+  unsigned char message[sizeof(float)+4];
+  message[0]=MUSE_SYNTH_SYSEX_MFG_ID;
+  message[1]=DEICSONZE_UNIQUE_ID;
+  message[2]=SYSEX_CHORUSPARAM;
+  message[3]=(unsigned char)i;
+  memcpy(&message[4], &f, sizeof(float));
+  sendSysex(message, sizeof(float)+4);
 }
 
-void DeicsOnzeGui::setReverbFloatEntry(double /*v*/, int /*i*/) {
+void DeicsOnzeGui::setReverbFloatEntry(double v, int i) {
   if(_deicsOnze->_pluginIReverb) {
     
-// FIXME FIXME Tim
-/*    
-    if(_deicsOnze->_pluginIReverb->isInt(i)) v = rint(v);
-    updateReverbFloatEntry(v, i);  
+    if(_deicsOnze->_pluginIReverb->ctrlValueType(i) == MusECore::VAL_INT) v = rint(v);
+    updateReverbFloatEntry(v, i);
     updateReverbSlider(v, i);
     setReverbCheckBox(v, i); //because this send the SYSEX
-*/    
-    
   }
   else printf("Warning : no DeicsOnze reverb loaded\n");
 }
-void DeicsOnzeGui::setReverbSlider(double /*v*/, int /*i*/) {
+void DeicsOnzeGui::setReverbSlider(double v, int i) {
   if(_deicsOnze->_pluginIReverb) {
     
-// FIXME FIXME Tim
-/*
-    if(_deicsOnze->_pluginIReverb->isInt(i)) v = rint(v);
+    if(_deicsOnze->_pluginIReverb->ctrlValueType(i) == MusECore::VAL_INT) v = rint(v);
     updateReverbFloatEntry(v, i);
     updateReverbSlider(v, i);
     setReverbCheckBox(v, i); //because this send the SYSEX
-*/
-    
   }
   else printf("Warning : no DeicsOnze reverb loaded\n");
 }
-void DeicsOnzeGui::setChorusFloatEntry(double /*v*/, int /*i*/) {
+void DeicsOnzeGui::setChorusFloatEntry(double v, int i) {
   if(_deicsOnze->_pluginIReverb) {
-    
-// FIXME FIXME Tim
-/*
-    if(_deicsOnze->_pluginIChorus->isInt(i)) v = rint(v);
+
+    if(_deicsOnze->_pluginIChorus->ctrlValueType(i) == MusECore::VAL_INT) v = rint(v);
     updateChorusFloatEntry(v, i);
     updateChorusSlider(v, i);
     setChorusCheckBox(v, i); //because this send the SYSEX
-*/
-    
   }
   else printf("Warning : no DeicsOnze chorus loaded\n");
 }
-void DeicsOnzeGui::setChorusSlider(double /*v*/, int /*i*/) {
+void DeicsOnzeGui::setChorusSlider(double v, int i) {
   if(_deicsOnze->_pluginIReverb) {  
-    
-// FIXME FIXME Tim
-/*
-    if(_deicsOnze->_pluginIChorus->isInt(i)) v = rint(v);
+
+    if(_deicsOnze->_pluginIChorus->ctrlValueType(i) == MusECore::VAL_INT) v = rint(v);
     updateChorusSlider(v, i);
     updateChorusFloatEntry(v, i);
     setChorusCheckBox(v, i); //because this send the SYSEX
-*/    
-    
   }
   else printf("Warning : no DeicsOnze chorus loaded\n");
 }
@@ -566,3 +578,12 @@ void DeicsOnze::setDelayDryWet(float val) {
   if(_pluginIDelay) _pluginIDelay->setParam(5, val);
   else printf("Warning : no DeicsOnze delay loaded\n");
 }
+float DeicsOnze::getDelayDryWet() const {
+  ///if(_pluginIDelay) return _pluginIDelay->controller(5)->curVal().f;
+  if(_pluginIDelay) return _pluginIDelay->param(5);
+  else {
+    printf("Warning : no DeicsOnze delay loaded\n");
+    return 0.0;
+  }
+}
+