diff options
| author | withmorten <morten.with@gmail.com> | 2021-06-28 13:57:05 +0200 |
|---|---|---|
| committer | withmorten <morten.with@gmail.com> | 2021-06-28 13:57:05 +0200 |
| commit | d17d437de319ca4c388dc724cffea91702d3a699 (patch) | |
| tree | 806104fa5fe0e994cd7f55f1b7b48dc64a998c44 /src/audio/oal/stream.cpp | |
| parent | Redo ReadSaveBuf + common.h cleanup (diff) | |
| download | re3-d17d437de319ca4c388dc724cffea91702d3a699.tar re3-d17d437de319ca4c388dc724cffea91702d3a699.tar.gz re3-d17d437de319ca4c388dc724cffea91702d3a699.tar.bz2 re3-d17d437de319ca4c388dc724cffea91702d3a699.tar.lz re3-d17d437de319ca4c388dc724cffea91702d3a699.tar.xz re3-d17d437de319ca4c388dc724cffea91702d3a699.tar.zst re3-d17d437de319ca4c388dc724cffea91702d3a699.zip | |
Diffstat (limited to 'src/audio/oal/stream.cpp')
| -rw-r--r-- | src/audio/oal/stream.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/audio/oal/stream.cpp b/src/audio/oal/stream.cpp index ab266681..7fc36acd 100644 --- a/src/audio/oal/stream.cpp +++ b/src/audio/oal/stream.cpp @@ -162,7 +162,7 @@ public: else StepIndex--; - StepIndex = clamp(StepIndex, 0, 88); + StepIndex = Clamp(StepIndex, 0, 88); int delta = step >> 3; if (adpcm & 1) delta += step >> 2; @@ -171,7 +171,7 @@ public: if (adpcm & 8) delta = -delta; int newSample = Sample + delta; - Sample = clamp(newSample, -32768, 32767); + Sample = Clamp(newSample, -32768, 32767); return Sample; } }; @@ -716,7 +716,7 @@ public: static short quantize(double sample) { int a = int(sample + 0.5); - return short(clamp(a, -32768, 32767)); + return short(Clamp(a, -32768, 32767)); } void Decode(void* _inbuf, int16* _outbuf, size_t size) @@ -1448,10 +1448,10 @@ void CStream::SetVolume(uint32 nVol) void CStream::SetPan(uint8 nPan) { - m_nPan = clamp((int8)nPan - 63, 0, 63); + m_nPan = Clamp((int8)nPan - 63, 0, 63); SetPosition(0, (m_nPan - 63) / 64.0f, 0.0f, Sqrt(1.0f - SQR((m_nPan - 63) / 64.0f))); - m_nPan = clamp((int8)nPan + 64, 64, 127); + m_nPan = Clamp((int8)nPan + 64, 64, 127); SetPosition(1, (m_nPan - 63) / 64.0f, 0.0f, Sqrt(1.0f - SQR((m_nPan - 63) / 64.0f))); m_nPan = nPan; |