From 9c4664d162c537ba4dd4fd8220971c0fb727103a Mon Sep 17 00:00:00 2001
From: Florian Jung <flo@windfisch.org>
Date: Sun, 1 Jul 2012 16:42:16 +0000
Subject: final merge

---
 muse2/synti/deicsonze/deicsonzegui.cpp    | 4 ++--
 muse2/synti/deicsonze/deicsonzeplugin.cpp | 8 ++++----
 muse2/synti/simpledrums2/simpledrums.cpp  | 8 +++++---
 3 files changed, 11 insertions(+), 9 deletions(-)

(limited to 'muse2/synti')

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);
diff --git a/muse2/synti/simpledrums2/simpledrums.cpp b/muse2/synti/simpledrums2/simpledrums.cpp
index 12e4fd18..4265c33c 100644
--- a/muse2/synti/simpledrums2/simpledrums.cpp
+++ b/muse2/synti/simpledrums2/simpledrums.cpp
@@ -664,10 +664,10 @@ const char* SimpleSynth::getPatchName(int /*index*/, int, int) const
     \return MidiPatch with patch info for host
  */
 //---------------------------------------------------------
-const MidiPatch* SimpleSynth::getPatchInfo(int index, const MidiPatch* patch) const
+const MidiPatch* SimpleSynth::getPatchInfo(int /*index*/, const MidiPatch* /*patch*/) const
       {
       SS_TRACE_IN
-      index = 0; patch = 0;
+      //index = 0; patch = 0;
       SS_TRACE_OUT
       return 0;
       }
@@ -1433,7 +1433,9 @@ static void* loadSampleThread(void* p)
                   // arg2 :sfi.frames is of type sf_count_t (== 64 bit)  (long long)  
                   // this requires format %lld (twice 'l' in format string (arg1)
                   // old code//printf("Resampling from %ld frames to %ld frames - srcration: %lf\n", sfi.frames, smp->frames, srcratio);
-                  printf("Resampling from %lld frames to %ld frames - srcration: %lf\n", sfi.frames, smp->frames, srcratio);
+                  //printf("Resampling from %lld frames to %ld frames - srcration: %lf\n", sfi.frames, smp->frames, srcratio);
+                  // Changed by Tim. Just avoid the hassle for now. Need to determine 32/64 bit and provide two different printf lines.
+                  printf("Resampling to %ld frames - srcration: %lf\n", smp->frames, srcratio);
                   printf("Nr of new samples: %ld\n", smp->samples);
                   }
 
-- 
cgit v1.2.3