merged with trunk and adapted new functions

3 files changed, 10 insertions, 6 deletions

diff --git a/muse2/synti/deicsonze/deicsonzegui.h b/muse2/synti/deicsonze/deicsonzegui.h
index 50fb55f6..4c3d5e8e 100644
--- a/muse2/synti/deicsonze/deicsonzegui.h
+++ b/muse2/synti/deicsonze/deicsonzegui.h
@@ -120,6 +120,8 @@ class QTreePreset:public QTreeWidgetItem {
 //   DeicsOnzeGui
 //---------------------------------------------------------
 class DeicsOnzeGui : public QDialog, public Ui::DeicsOnzeGuiBase, public MessGui {
+    Q_OBJECT
+    
     bool _enabledPreset;
 
     QFramePitchEnvelope* pitchEnvelopeGraph;
@@ -134,7 +136,7 @@ class DeicsOnzeGui : public QDialog, public Ui::DeicsOnzeGuiBase, public MessGui
     std::vector<FloatEntry*> _reverbFloatEntryVector;
     std::vector<CheckBox*> _reverbCheckBoxVector;
 
-    Q_OBJECT
+    
     QString lastDir;
   private slots:
     void readMessage(int);
diff --git a/muse2/synti/deicsonze/deicsonzeplugin.cpp b/muse2/synti/deicsonze/deicsonzeplugin.cpp
index 36684f5f..54eee202 100644
--- a/muse2/synti/deicsonze/deicsonzeplugin.cpp
+++ b/muse2/synti/deicsonze/deicsonzeplugin.cpp
@@ -406,7 +406,7 @@ void DeicsOnzeGui::setChorusCheckBox(double v, int i) {
   else printf("setChorusCheckBox Error : cannot send controller upper than 225\n");
 }
 
-void DeicsOnzeGui::setReverbFloatEntry(double v, int i) {
+void DeicsOnzeGui::setReverbFloatEntry(double /*v*/, int /*i*/) {
   if(_deicsOnze->_pluginIReverb) {
     
 // FIXME FIXME Tim
@@ -420,7 +420,7 @@ void DeicsOnzeGui::setReverbFloatEntry(double v, int i) {
   }
   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
@@ -434,7 +434,7 @@ void DeicsOnzeGui::setReverbSlider(double v, int i) {
   }
   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
@@ -448,7 +448,7 @@ void DeicsOnzeGui::setChorusFloatEntry(double v, int i) {
   }
   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
diff --git a/muse2/synti/vam/vamgui.h b/muse2/synti/vam/vamgui.h
index 2271c8aa..b5906ae8 100644
--- a/muse2/synti/vam/vamgui.h
+++ b/muse2/synti/vam/vamgui.h
@@ -38,6 +38,8 @@ class QSignalMapper;
 //---------------------------------------------------------
 
 class VAMGui : public QWidget, public Ui::VAMGuiBase, public MessGui {
+      Q_OBJECT
+    
       QSignalMapper* map;
       int ctrlHi;
       int ctrlLo;
@@ -46,7 +48,7 @@ class VAMGui : public QWidget, public Ui::VAMGuiBase, public MessGui {
       SynthGuiCtrl dctrl[NUM_CONTROLLER];
       QString * presetFileName;
 
-      Q_OBJECT
+      
       void sendControllerChange(int ctrl, int val);
       void initParameter();
       void setParam(int, int);