diff options
| author | Jamieson Christian | 2003-07-30 09:26:54 +0000 |
|---|---|---|
| committer | Jamieson Christian | 2003-07-30 09:26:54 +0000 |
| commit | 20d06e2c3dc09085c218620e61c384dc0514fabf (patch) | |
| tree | 76796f189690aed1691a4c64369a7c53113fe372 /sound/rate.cpp | |
| parent | 7fbd161cadcd069aecd9d7bb881b76191b431172 (diff) | |
| download | scummvm-rg350-20d06e2c3dc09085c218620e61c384dc0514fabf.tar.gz scummvm-rg350-20d06e2c3dc09085c218620e61c384dc0514fabf.tar.bz2 scummvm-rg350-20d06e2c3dc09085c218620e61c384dc0514fabf.zip | |
Fixed MSVC errors
svn-id: r9288
Diffstat (limited to 'sound/rate.cpp')
| -rw-r--r-- | sound/rate.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/rate.cpp b/sound/rate.cpp index 0acabd363f..89751029f7 100644 --- a/sound/rate.cpp +++ b/sound/rate.cpp @@ -141,7 +141,7 @@ resume: while (rate->ipos > rate->opos && obuf < oend) { // interpolate - out = ilast[0] + (((icur[0] - ilast[0]) * rate->opos_frac + (1UL << (FRAC_BITS-1))) >> FRAC_BITS); + out = (st_sample_t) (ilast[0] + (((icur[0] - ilast[0]) * rate->opos_frac + (1UL << (FRAC_BITS-1))) >> FRAC_BITS)); // adjust volume out = out * vol / 256; @@ -150,7 +150,7 @@ resume: if (stereo) { // interpolate - out = ilast[1] + (((icur[1] - ilast[1]) * rate->opos_frac + (1UL << (FRAC_BITS-1))) >> FRAC_BITS); + out = (st_sample_t) (ilast[1] + (((icur[1] - ilast[1]) * rate->opos_frac + (1UL << (FRAC_BITS-1))) >> FRAC_BITS)); // adjust volume out = out * vol / 256; } @@ -180,7 +180,9 @@ the_end: } +#ifndef _MSC_VER #pragma mark - +#endif LinearRateConverter::LinearRateConverter(st_rate_t inrate, st_rate_t outrate) { |