aboutsummaryrefslogtreecommitdiff
path: root/audio/softsynth/mt32/TVF.cpp
diff options
context:
space:
mode:
authorColin Snover2016-11-25 12:24:08 -0600
committerColin Snover2016-11-25 12:24:08 -0600
commitdf4a503622a524ad8ef47e1c325ac4a711549921 (patch)
tree29ac9e6d51fd4cd17e4ebe9d1f66ff93abd0cd9d /audio/softsynth/mt32/TVF.cpp
parentb4dbd6d3c275097b4be964b7da4478ff930cbaa7 (diff)
downloadscummvm-rg350-df4a503622a524ad8ef47e1c325ac4a711549921.tar.gz
scummvm-rg350-df4a503622a524ad8ef47e1c325ac4a711549921.tar.bz2
scummvm-rg350-df4a503622a524ad8ef47e1c325ac4a711549921.zip
Revert "MT32: Update Munt to 2.0.0"
This reverts commit b4dbd6d3c275097b4be964b7da4478ff930cbaa7.
Diffstat (limited to 'audio/softsynth/mt32/TVF.cpp')
-rw-r--r--audio/softsynth/mt32/TVF.cpp16
1 files changed, 7 insertions, 9 deletions
diff --git a/audio/softsynth/mt32/TVF.cpp b/audio/softsynth/mt32/TVF.cpp
index d603883bd4..164cf2b4cb 100644
--- a/audio/softsynth/mt32/TVF.cpp
+++ b/audio/softsynth/mt32/TVF.cpp
@@ -1,5 +1,5 @@
/* Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009 Dean Beeler, Jerome Fisher
- * Copyright (C) 2011-2016 Dean Beeler, Jerome Fisher, Sergey V. Mikayev
+ * Copyright (C) 2011, 2012, 2013, 2014 Dean Beeler, Jerome Fisher, Sergey V. Mikayev
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
@@ -15,13 +15,11 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "internals.h"
+//#include <cmath>
-#include "TVF.h"
-#include "LA32Ramp.h"
-#include "Partial.h"
-#include "Poly.h"
-#include "Tables.h"
+#include "mt32emu.h"
+#include "mmath.h"
+#include "internals.h"
namespace MT32Emu {
@@ -77,7 +75,7 @@ static int calcBaseCutoff(const TimbreParam::PartialParam *partialParam, Bit32u
// biasPoint range here: 64 to 127
int bias = biasPoint - 31 - key; // bias range here: -75 to 84
if (bias < 0) {
- baseCutoff += bias * biasLevelToBiasMult[partialParam->tvf.biasLevel]; // Calculation range: -6375 to 6375
+ baseCutoff += bias * biasLevelToBiasMult[partialParam->tvf.biasLevel]; // Calculation range: −6375 to 6375
// baseCutoff range now: -9399 to 9399
}
}
@@ -230,4 +228,4 @@ void TVF::nextPhase() {
startRamp(newTarget, newIncrement, newPhase);
}
-} // namespace MT32Emu
+}