zynaddsubfx

commit 12a84b1cf24ccd4eefbfd02dc31bd214bbe25060
parent 406cf4a4aaab029235a60944c1cbfeba9062e02c
Author: Johannes Lorenz <[email protected]>
Date:   Sat, 17 Jun 2023 13:53:41 +0200

Avoid -0.f when reading old savefiles

By turning the formulae around, we avoid -0.f and get +0.f, which helps
with issues when comparing savefiles.

Partial fixup for 0e3d5ef06ee9edd39b5f71532d30e576cfff89e6 .

Diffstat:
M
src/Params/ADnoteParameters.cpp
 | 
4
++--
M
src/Params/SUBnoteParameters.cpp
 | 
4
+---

2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/Params/ADnoteParameters.cpp b/src/Params/ADnoteParameters.cpp
@@ -982,7 +982,7 @@ void ADnoteGlobalParam::getfromXML(XMLwrapper& xml)
 
         if (upgrade_3_0_3) {
             int vol = xml.getpar127("volume", 0);
-            Volume = 12.0412f - 60.0f * ( 1.0f - vol / 96.0f);
+            Volume = 12.0412f + 60.0f * (vol / 96.0f - 1.0f);
         } else if (upgrade_3_0_5) {
             printf("file version less than 3.0.5\n");
             Volume = 12.0412f + xml.getparreal("volume", Volume);
@@ -1285,7 +1285,7 @@ void ADnoteVoiceParam::getfromXML(XMLwrapper& xml, unsigned nvoice)
 
         if (upgrade_3_0_3) {
             int vol = xml.getpar127("volume", 0);
-            volume    = -60.0f * ( 1.0f - vol / 127.0f);
+            volume    = 60.0f * (vol / 127.0f - 1.0f);
         } else {
             volume    = xml.getparreal("volume", volume);
         }
diff --git a/src/Params/SUBnoteParameters.cpp b/src/Params/SUBnoteParameters.cpp
@@ -577,9 +577,7 @@ void SUBnoteParameters::getfromXML(XMLwrapper& xml)
             (!xml.hasparreal("volume"));
         if (upgrade_3_0_3) {
             int vol = xml.getpar127("volume", 0);
-            Volume    = -60.0f * ( 1.0f - vol / 96.0f);
-            if(Volume == -0.f)
-                Volume = 0.f;
+            Volume    = 60.0f * (vol / 96.0f - 1.0f);
         } else {
             Volume    = xml.getparreal("volume", Volume);
         }