diff options
| author | Max Horn | 2009-10-14 23:22:32 +0000 |
|---|---|---|
| committer | Max Horn | 2009-10-14 23:22:32 +0000 |
| commit | 7f0f6655e87461d191c4fa9177779b13406dbb46 (patch) | |
| tree | d30af5bb78dfa17ece5ea1ee1c9cbb9b80b59fc2 /sound/vag.cpp | |
| parent | e6d3bb80b4123df4b6c1d472a426ee333df3bb9f (diff) | |
| download | scummvm-rg350-7f0f6655e87461d191c4fa9177779b13406dbb46.tar.gz scummvm-rg350-7f0f6655e87461d191c4fa9177779b13406dbb46.tar.bz2 scummvm-rg350-7f0f6655e87461d191c4fa9177779b13406dbb46.zip | |
cleanup
svn-id: r45098
Diffstat (limited to 'sound/vag.cpp')
| -rw-r--r-- | sound/vag.cpp | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/sound/vag.cpp b/sound/vag.cpp index 688db2ce1c..483ac36bb8 100644 --- a/sound/vag.cpp +++ b/sound/vag.cpp @@ -40,11 +40,14 @@ VagStream::~VagStream() { delete _stream; } -double f[5][2] = { { 0.0, 0.0 }, - { 60.0 / 64.0, 0.0 }, - { 115.0 / 64.0, -52.0 / 64.0 }, - { 98.0 / 64.0, -55.0 / 64.0 }, - { 122.0 / 64.0, -60.0 / 64.0 } }; +static const double s_vagDataTable[5][2] = + { + { 0.0, 0.0 }, + { 60.0 / 64.0, 0.0 }, + { 115.0 / 64.0, -52.0 / 64.0 }, + { 98.0 / 64.0, -55.0 / 64.0 }, + { 122.0 / 64.0, -60.0 / 64.0 } + }; int VagStream::readBuffer(int16 *buffer, const int numSamples) { int32 samplesDecoded = 0; @@ -53,7 +56,7 @@ int VagStream::readBuffer(int16 *buffer, const int numSamples) { byte i = 0; for (i = 28 - _samplesRemaining; i < 28 && samplesDecoded < numSamples; i++) { - _samples[i] = _samples[i] + _s1 * f[_predictor][0] + _s2 * f[_predictor][1]; + _samples[i] = _samples[i] + _s1 * s_vagDataTable[_predictor][0] + _s2 * s_vagDataTable[_predictor][1]; _s2 = _s1; _s1 = _samples[i]; int16 d = (int) (_samples[i] + 0.5); @@ -94,7 +97,7 @@ int VagStream::readBuffer(int16 *buffer, const int numSamples) { } for (i = 0; i < 28 && samplesDecoded < numSamples; i++) { - _samples[i] = _samples[i] + _s1 * f[_predictor][0] + _s2 * f[_predictor][1]; + _samples[i] = _samples[i] + _s1 * s_vagDataTable[_predictor][0] + _s2 * s_vagDataTable[_predictor][1]; _s2 = _s1; _s1 = _samples[i]; int16 d = (int) (_samples[i] + 0.5); |