zynaddsubfx

commit 5fbde4321f1874a570aa10f16c7eefaaa2c0a902
parent 0680b6bf003ecd685be34c516a1dd8b85616770c
Author: Christopher A. Oliver <[email protected]>
Date:   Sun, 29 Nov 2015 21:57:55 -0500

Make fixed offset 15Hz rather than 25.

Diffstat:
M
src/Synth/ADnote.cpp
 | 
2
+-
M
src/Synth/PADnote.cpp
 | 
2
+-
M
src/Synth/SUBnote.cpp
 | 
2
+-
M
src/UI/ADnoteUI.fl
 | 
2
+-
M
src/UI/PADnoteUI.fl
 | 
2
+-
M
src/UI/SUBnoteUI.fl
 | 
2
+-

6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/Synth/ADnote.cpp b/src/Synth/ADnote.cpp
@@ -113,7 +113,7 @@ ADnote::ADnote(ADnoteParameters *pars_, SynthParams &spars)
 
         float offset_val = (pars.VoicePar[nvoice].POffsetHz - 64)/64.0f;
         NoteVoicePar[nvoice].OffsetHz =
-            25.0f*(offset_val * sqrtf(fabsf(offset_val)));
+            15.0f*(offset_val * sqrtf(fabsf(offset_val)));
 
         unison_stereo_spread[nvoice] =
             pars.VoicePar[nvoice].Unison_stereo_spread / 127.0f;
diff --git a/src/Synth/PADnote.cpp b/src/Synth/PADnote.cpp
@@ -69,7 +69,7 @@ void PADnote::setup(float freq,
     else
         BendAdjust = BendAdj / 24.0f;
     float offset_val = (pars.POffsetHz - 64)/64.0f;
-    OffsetHz = 25.0f*(offset_val * sqrtf(fabsf(offset_val)));
+    OffsetHz = 15.0f*(offset_val * sqrtf(fabsf(offset_val)));
     firsttime = true;
     realfreq  = basefreq;
     if(!legato)
diff --git a/src/Synth/SUBnote.cpp b/src/Synth/SUBnote.cpp
@@ -84,7 +84,7 @@ void SUBnote::setup(float freq,
     else
         BendAdjust = BendAdj / 24.0f;
     float offset_val = (pars.POffsetHz - 64)/64.0f;
-    OffsetHz = 25.0f*(offset_val * sqrtf(fabsf(offset_val)));
+    OffsetHz = 15.0f*(offset_val * sqrtf(fabsf(offset_val)));
     float detune = getdetune(pars.PDetuneType,
                              pars.PCoarseDetune,
                              pars.PDetune);
diff --git a/src/UI/ADnoteUI.fl b/src/UI/ADnoteUI.fl
@@ -578,7 +578,7 @@ o->redraw();}
             Fl_Dial offsethzdial {
               label Offset
               tooltip {Offset of frequency in Hz} xywh {110 270 15 15} box ROUND_UP_BOX labelsize 10 align 8 minimum -64 maximum 63 step 1
-              code0 {o->init("POffsetHz"); o->set_rounding(2); o->set_transform([](float x){x/=64; return 25*(x*sqrtf(fabsf(x)));});}
+              code0 {o->init("POffsetHz"); o->set_rounding(2); o->set_transform([](float x){x/=64; return 15*(x*sqrtf(fabsf(x)));});}
               class Fl_Osc_Dial
             }
             Fl_Slider {} {
diff --git a/src/UI/PADnoteUI.fl b/src/UI/PADnoteUI.fl
@@ -718,7 +718,7 @@ cbwidget->do_callback();}
             Fl_Dial offsethzdial {
               label Offset
               tooltip {Offset of frequency in Hz} xywh {110 278 15 15} box ROUND_UP_BOX labelsize 10 align 8 minimum -64 maximum 63 step 1
-              code0 {o->init("POffsetHz"); o->set_rounding(2); o->set_transform([](float x){x/=64; return 25*(x*sqrtf(fabsf(x)));});}
+              code0 {o->init("POffsetHz"); o->set_rounding(2); o->set_transform([](float x){x/=64; return 15*(x*sqrtf(fabsf(x)));});}
               class Fl_Osc_Dial
             }
             Fl_Check_Button hz440 {
diff --git a/src/UI/SUBnoteUI.fl b/src/UI/SUBnoteUI.fl
@@ -296,7 +296,7 @@ freqsettingsui->redraw();}
         Fl_Dial offsethzdial {
           label Offset
           tooltip {Offset of frequency in Hz} xywh {500 53 15 15} box ROUND_UP_BOX labelsize 10 align 8 minimum -64 maximum 63 step 1
-          code0 {o->init("POffsetHz"); o->set_rounding(2); o->set_transform([](float x){x/=64; return 25*(x*sqrtf(fabsf(x)));});}
+          code0 {o->init("POffsetHz"); o->set_rounding(2); o->set_transform([](float x){x/=64; return 15*(x*sqrtf(fabsf(x)));});}
           class Fl_Osc_Dial
         }
         Fl_Check_Button hz440 {