From: Starg <starg@users.osdn.me>
Date: Fri, 21 Dec 2018 21:36:04 +0000 (+0900)
Subject: Fix sfz envelope
X-Git-Tag: tim41.3.2~1^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f89ae7bf069100f587fe44d20209e9b897e33581;p=timidity41%2Ftimidity41.git

Fix sfz envelope
---

diff --git a/timidity/sfz.cpp b/timidity/sfz.cpp
index ca42f78e..22523523 100644
--- a/timidity/sfz.cpp
+++ b/timidity/sfz.cpp
@@ -1528,7 +1528,7 @@ private:
                     s.envelope_offset[1] = ToOffset(2);
                     s.envelope_rate[1] = CalcRate(1, 0.0);
                     s.envelope_offset[2] = ToOffset(1);
-                    s.envelope_rate[2] = CalcRate(65534, 0.0);
+                    s.envelope_rate[2] = CalcRate(1, 0.0);
 
                     s.envelope_offset[3] = ToOffset(65535);
                     s.envelope_rate[3] = CalcRate(65535, std::clamp(flatSection.GetAs<double>(OpCodeKind::AmpEG_Attack).value_or(0.0), 0.0, 100.0));
@@ -1575,20 +1575,6 @@ private:
                     s.envelope_rate[4] = s.envelope_rate[3];
                     s.envelope_offset[5] = s.envelope_offset[3];
                     s.envelope_rate[5] = s.envelope_rate[3];
-
-                    s.envelope_offset[0] = 0;
-                    s.envelope_rate[0] = 0;
-                    s.envelope_offset[1] = 0;
-                    s.envelope_rate[1] = 0;
-
-                    s.envelope_offset[2] = 0;
-                    s.envelope_rate[2] = 0;
-                    s.envelope_offset[3] = 0;
-                    s.envelope_rate[3] = CalcRate(65535, releaseTime);
-                    s.envelope_offset[4] = s.envelope_offset[3];
-                    s.envelope_rate[4] = s.envelope_rate[3];
-                    s.envelope_offset[5] = s.envelope_offset[3];
-                    s.envelope_rate[5] = s.envelope_rate[3];
                 }
 
                 if (auto ampVelTrack = flatSection.GetAs<double>(OpCodeKind::AmpVelTrack))