aboutsummaryrefslogtreecommitdiff
path: root/audio/softsynth
diff options
context:
space:
mode:
authorFilippos Karapetis2012-11-15 14:40:04 +0200
committerFilippos Karapetis2012-11-15 14:40:04 +0200
commit2c8cd2d653830a3b10578254c32f2361f1e05a7b (patch)
treee3aefcc1c406d15abe824ff1aa05a54a129e4e87 /audio/softsynth
parent42b8f3db4d3fbddb2e59db761b8b1f488e279071 (diff)
downloadscummvm-rg350-2c8cd2d653830a3b10578254c32f2361f1e05a7b.tar.gz
scummvm-rg350-2c8cd2d653830a3b10578254c32f2361f1e05a7b.tar.bz2
scummvm-rg350-2c8cd2d653830a3b10578254c32f2361f1e05a7b.zip
MT32: Make all constant tables in the MT32Emu namespace static
Added in munt commit d4f8ebf54be0a8255af08bb24f1962afa8378096
Diffstat (limited to 'audio/softsynth')
-rw-r--r--audio/softsynth/mt32/DelayReverb.cpp5
-rw-r--r--audio/softsynth/mt32/Synth.cpp2
2 files changed, 3 insertions, 4 deletions
diff --git a/audio/softsynth/mt32/DelayReverb.cpp b/audio/softsynth/mt32/DelayReverb.cpp
index bfb066630c..23d25a596e 100644
--- a/audio/softsynth/mt32/DelayReverb.cpp
+++ b/audio/softsynth/mt32/DelayReverb.cpp
@@ -22,13 +22,12 @@
namespace MT32Emu {
-
// CONFIRMED: The values below are found via analysis of digital samples. Checked with all time and level combinations.
// Obviously:
// rightDelay = (leftDelay - 2) * 2 + 2
// echoDelay = rightDelay - 1
// Leaving these separate in case it's useful for work on other reverb modes...
-const Bit32u REVERB_TIMINGS[8][3]= {
+static const Bit32u REVERB_TIMINGS[8][3]= {
// {leftDelay, rightDelay, feedbackDelay}
{402, 802, 801},
{626, 1250, 1249},
@@ -40,7 +39,7 @@ const Bit32u REVERB_TIMINGS[8][3]= {
{8002, 16002, 16001}
};
-const float REVERB_FADE[8] = {0.0f, -0.049400051f, -0.08220577f, -0.131861118f, -0.197344907f, -0.262956344f, -0.345162114f, -0.509508615f};
+static const float REVERB_FADE[8] = {0.0f, -0.049400051f, -0.08220577f, -0.131861118f, -0.197344907f, -0.262956344f, -0.345162114f, -0.509508615f};
const float REVERB_FEEDBACK67 = -0.629960524947437f; // = -EXP2F(-2 / 3)
const float REVERB_FEEDBACK = -0.682034520443118f; // = -EXP2F(-53 / 96)
const float LPF_VALUE = 0.594603558f; // = EXP2F(-0.75f)
diff --git a/audio/softsynth/mt32/Synth.cpp b/audio/softsynth/mt32/Synth.cpp
index d47d954746..f37d76cd85 100644
--- a/audio/softsynth/mt32/Synth.cpp
+++ b/audio/softsynth/mt32/Synth.cpp
@@ -36,7 +36,7 @@
namespace MT32Emu {
-const ControlROMMap ControlROMMaps[7] = {
+static const ControlROMMap ControlROMMaps[7] = {
// ID IDc IDbytes PCMmap PCMc tmbrA tmbrAO, tmbrAC tmbrB tmbrBO, tmbrBC tmbrR trC rhythm rhyC rsrv panpot prog rhyMax patMax sysMax timMax
{0x4014, 22, "\000 ver1.04 14 July 87 ", 0x3000, 128, 0x8000, 0x0000, false, 0xC000, 0x4000, false, 0x3200, 30, 0x73A6, 85, 0x57C7, 0x57E2, 0x57D0, 0x5252, 0x525E, 0x526E, 0x520A},
{0x4014, 22, "\000 ver1.05 06 Aug, 87 ", 0x3000, 128, 0x8000, 0x0000, false, 0xC000, 0x4000, false, 0x3200, 30, 0x7414, 85, 0x57C7, 0x57E2, 0x57D0, 0x5252, 0x525E, 0x526E, 0x520A},