diff options
| author | Paweł Kołodziejski | 2004-10-23 13:39:03 +0000 |
|---|---|---|
| committer | Paweł Kołodziejski | 2004-10-23 13:39:03 +0000 |
| commit | c10cce6af180c6bf5e23abc1ae4206d59965c269 (patch) | |
| tree | e9099f1d5d6c31fac91088be2101d5c5c2b59699 | |
| parent | 879c2562e6e8f10b1c8f3a4b01047e1e39678247 (diff) | |
| download | scummvm-rg350-c10cce6af180c6bf5e23abc1ae4206d59965c269.tar.gz scummvm-rg350-c10cce6af180c6bf5e23abc1ae4206d59965c269.tar.bz2 scummvm-rg350-c10cce6af180c6bf5e23abc1ae4206d59965c269.zip | |
fixed warnings
svn-id: r15665
| -rw-r--r-- | backends/midi/mt32/synth.cpp | 8 | ||||
| -rw-r--r-- | sound/mp3.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/backends/midi/mt32/synth.cpp b/backends/midi/mt32/synth.cpp index c97c77205f..0af4832a69 100644 --- a/backends/midi/mt32/synth.cpp +++ b/backends/midi/mt32/synth.cpp @@ -2769,11 +2769,11 @@ bool CSynthMT32::InitTables(const char *baseDir ) { //LOG_MSG("MT-32 Initializing Pitch Tables"); for(f=-108;f<109;f++) { - keytable[f+108] = (int)(256 * pow((float)2,(float)f/24.0)); + keytable[f + 108] = (int)(256 * pow((float)2, (float)f / (float)24.0)); //LOG_MSG("KT %d = %d", f, keytable[f+108]); } - float ff; + float ff = 0; for(f=0;f<=101;f++) { ff = (float)f/100.00; sqrtable[f] = (int)(100*sqrt(ff)); @@ -3012,7 +3012,7 @@ bool CSynthMT32::InitTables(const char *baseDir ) { fp.close(); int j,res; - float fres, tres; + float fres = 0, tres = 0; for(res=0;res<31;res++) { fres = (float)res/30.0; ResonFactor[res] = (pow((float)2,log(pow((float)fres,(float)16))) * 2.5)+1.0; @@ -4244,7 +4244,7 @@ void CSynthMT32::PlaySysex(uint8 * sysex,uint32 len) { int CSynthMT32::DumpSysex(char *filename) { File fp; - char tmpc; + byte tmpc; fp.open(filename,File::kFileWriteMode); if(!fp.isOpen()) return -1; diff --git a/sound/mp3.cpp b/sound/mp3.cpp index f6a08e29f1..3d2afbcdc8 100644 --- a/sound/mp3.cpp +++ b/sound/mp3.cpp @@ -98,7 +98,7 @@ MP3InputStream::MP3InputStream(File *file, mad_timer_t duration) { * @param size limits playback based on the number of input bytes, 0 means * playback until EOF */ -MP3InputStream::MP3InputStream(File *file, uint size) { +MP3InputStream::MP3InputStream(File *file, uint32 size) { mad_stream_init(&_stream); mad_frame_init(&_frame); mad_synth_init(&_synth); |