dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r13301) -Fix [FS#1997]: resolve more MSVC 9 x64 warnings.

Browse Source
This commit is contained in:
rubidium
2008-05-27 21:41:00 +00:00
parent 49a0bd7f90
commit 5c5ee7eb57
28 changed files with 88 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/mixer.cpp
View File

@@ -104,7 +104,7 @@ MixerChannel *MxAllocateChannel()
return NULL;
}
void MxSetChannelRawSrc(MixerChannel *mc, int8 *mem, uint size, uint rate, uint flags)
void MxSetChannelRawSrc(MixerChannel *mc, int8 *mem, size_t size, uint rate, uint flags)
{
mc->memory = mem;
mc->flags = flags;
@@ -114,12 +114,12 @@ void MxSetChannelRawSrc(MixerChannel *mc, int8 *mem, uint size, uint rate, uint
mc->frac_speed = (rate << 16) / _play_rate;
/* adjust the magnitude to prevent overflow */
while (size & 0xFFFF0000) {
while (size & ~0xFFFF) {
size >>= 1;
rate = (rate >> 1) + 1;
}
mc->samples_left = size * _play_rate / rate;
mc->samples_left = (uint)size * _play_rate / rate;
}
void MxSetChannelVolume(MixerChannel *mc, uint left, uint right)