summaryrefslogtreecommitdiffstats
path: root/src/audio/oal/stream.cpp
diff options
context:
space:
mode:
authorwithmorten <morten.with@gmail.com>2021-06-28 13:31:35 +0200
committerwithmorten <morten.with@gmail.com>2021-06-28 13:31:35 +0200
commitcb3b3855b844c14c0e943c1a7614fc29820cf666 (patch)
tree8e9a6ae74e9c98515b813f412476058274d3fde4 /src/audio/oal/stream.cpp
parentLess invasive red tint on Delete Game page (diff)
downloadre3-cb3b3855b844c14c0e943c1a7614fc29820cf666.tar
re3-cb3b3855b844c14c0e943c1a7614fc29820cf666.tar.gz
re3-cb3b3855b844c14c0e943c1a7614fc29820cf666.tar.bz2
re3-cb3b3855b844c14c0e943c1a7614fc29820cf666.tar.lz
re3-cb3b3855b844c14c0e943c1a7614fc29820cf666.tar.xz
re3-cb3b3855b844c14c0e943c1a7614fc29820cf666.tar.zst
re3-cb3b3855b844c14c0e943c1a7614fc29820cf666.zip
Diffstat (limited to '')
-rw-r--r--src/audio/oal/stream.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/audio/oal/stream.cpp b/src/audio/oal/stream.cpp
index 44cc1c93..5d3ff08e 100644
--- a/src/audio/oal/stream.cpp
+++ b/src/audio/oal/stream.cpp
@@ -134,7 +134,7 @@ public:
else
StepIndex--;
- StepIndex = clamp(StepIndex, 0, 88);
+ StepIndex = Clamp(StepIndex, 0, 88);
int delta = step >> 3;
if (adpcm & 1) delta += step >> 2;
@@ -143,7 +143,7 @@ public:
if (adpcm & 8) delta = -delta;
int newSample = Sample + delta;
- Sample = clamp(newSample, -32768, 32767);
+ Sample = Clamp(newSample, -32768, 32767);
return Sample;
}
};
@@ -596,7 +596,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)
@@ -1086,10 +1086,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;