final merge

2 files changed, 6 insertions, 6 deletions

diff --git a/muse2/synti/deicsonze/deicsonzegui.cpp b/muse2/synti/deicsonze/deicsonzegui.cpp
index b4965e7b..52f53b86 100644
--- a/muse2/synti/deicsonze/deicsonzegui.cpp
+++ b/muse2/synti/deicsonze/deicsonzegui.cpp
@@ -4558,7 +4558,7 @@ void DeicsOnzeGui::updatePreset() {
 void DeicsOnzeGui::updateSelectPreset(int hbank, int lbank, int prog) {
   //QTreeWidgetItem* cat = categoryListView->currentItem();
   //QTreeWidgetItem* sub = subcategoryListView->currentItem();
-  QTreeWidgetItem* pre = presetListView->currentItem();
+  //QTreeWidgetItem* pre = presetListView->currentItem();
   //select category, subcategory, preset
   //category
   QList<QTreeWidgetItem *> qlcat =
@@ -4621,7 +4621,7 @@ void DeicsOnzeGui::updateSelectPreset(int hbank, int lbank, int prog) {
     presetListView->scrollToItem(qpre);
     updatePresetName(qpre->text(1), true);
     updateProg(prog, true);
-    pre=(QTreePreset*) qpre;
+    //pre=(QTreePreset*) qpre;
     setEnabledPreset(true);
   }
   else {
diff --git a/muse2/synti/deicsonze/deicsonzeplugin.cpp b/muse2/synti/deicsonze/deicsonzeplugin.cpp
index 442a61c5..fff03bc1 100644
--- a/muse2/synti/deicsonze/deicsonzeplugin.cpp
+++ b/muse2/synti/deicsonze/deicsonzeplugin.cpp
@@ -300,12 +300,12 @@ void DeicsOnzeGui::buildGuiReverb() {
   //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);
-    val = _deicsOnze->getReverbParam(i);
 
 // FIXME FIXME Tim
 /*     
+    val = _deicsOnze->getReverbParam(i);
      if(plugI->isBool(i))
       addPluginCheckBox(i, plugI->getParameterName(i), val > 0.0,
 			_reverbSuperWidget, grid, true);
@@ -351,12 +351,12 @@ void DeicsOnzeGui::buildGuiChorus() {
   //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);
-    val = _deicsOnze->getChorusParam(i);
     
 // FIXME FIXME Tim
 /*    
+    val = _deicsOnze->getChorusParam(i);
     if(plugI->isBool(i))
       addPluginCheckBox(i, plugI->getParameterName(i), val > 0.0,
 			_chorusSuperWidget, grid, false);