diff options
author | Marcus Comstedt | 2011-01-08 21:11:31 +0000 |
---|---|---|
committer | Marcus Comstedt | 2011-01-08 21:11:31 +0000 |
commit | 2001719241a21a57e6ec03420863f189e9183d9e (patch) | |
tree | 920904b9616f88c4d6d6f8df66b9191beed01efb /sound/softsynth/mt32/synth.cpp | |
parent | 910e2f076073dcc98c0345ba4ec25288373c7929 (diff) | |
download | scummvm-rg350-2001719241a21a57e6ec03420863f189e9183d9e.tar.gz scummvm-rg350-2001719241a21a57e6ec03420863f189e9183d9e.tar.bz2 scummvm-rg350-2001719241a21a57e6ec03420863f189e9183d9e.zip |
MT32: Fixed compilation warnings
The conversion specification "%f" converts a double, not a float,
so floats need to be converted to doubles before passing them to
vprintf().
svn-id: r55175
Diffstat (limited to 'sound/softsynth/mt32/synth.cpp')
-rw-r--r-- | sound/softsynth/mt32/synth.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/softsynth/mt32/synth.cpp b/sound/softsynth/mt32/synth.cpp index 55ca11ced7..16460795a5 100644 --- a/sound/softsynth/mt32/synth.cpp +++ b/sound/softsynth/mt32/synth.cpp @@ -316,7 +316,7 @@ bool Synth::initPCMList(Bit16u mapAddress, Bit16u count) { // The number below is confirmed to a reasonable degree of accuracy on CM-32L double STANDARDFREQ = 442.0; float rTune = (float)(STANDARDFREQ * pow(2.0, (0x5000 - rTuneOffset) / 4056.0 - 9.0 / 12.0)); - //printDebug("%f,%d,%d", pTune, tps[i].pitchCoarse, tps[i].pitchFine); + //printDebug("%f,%d,%d", (double)pTune, tps[i].pitchCoarse, tps[i].pitchFine); if (rAddr + rLen > pcmROMSize) { printDebug("Control ROM error: Wave map entry %d points to invalid PCM address 0x%04X, length 0x%04X", i, rAddr, rLen); return false; @@ -1021,7 +1021,7 @@ bool Synth::refreshSystem() { // The LAPC-I documentation claims a range of 427.5Hz-452.6Hz (similar to what we have here) // The MT-32 documentation claims a range of 432.1Hz-457.6Hz masterTune = 440.0f * powf(2.0f, (mt32ram.system.masterTune - 64.0f) / (128.0f * 12.0f)); - printDebug(" Master Tune: %f", masterTune); + printDebug(" Master Tune: %f", (double)masterTune); printDebug(" Reverb: mode=%d, time=%d, level=%d", mt32ram.system.reverbMode, mt32ram.system.reverbTime, mt32ram.system.reverbLevel); report(ReportType_newReverbMode, &mt32ram.system.reverbMode); report(ReportType_newReverbTime, &mt32ram.system.reverbTime); |