mirror/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-01-23 05:38:46 -05:00
Code Issues Packages Projects Releases Wiki Activity

UI: Use std::clamp instead of macro

Browse Source
This commit is contained in:
Norihiro Kamae
2024-08-21 21:12:13 +09:00
committed by Lain
parent 15038232c5
commit 60a45d3aa3
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
UI/volume-control.cpp
View File

@@ -15,7 +15,6 @@
using namespace std;
#define CLAMP(x, min, max) ((x) < (min) ? (min) : ((x) > (max) ? (max) : (x)))
#define FADER_PRECISION 4096.0
// Size of the audio indicator in pixels
@@ -1004,8 +1003,9 @@ VolumeMeter::calculateBallisticsForChannel(int channelNr, uint64_t ts,
// 20 dB / 1.7 seconds for Medium Profile (Type I PPM)
// 24 dB / 2.8 seconds for Slow Profile (Type II PPM)
float decay = float(peakDecayRate * timeSinceLastRedraw);
displayPeak[channelNr] = CLAMP(displayPeak[channelNr] - decay,
currentPeak[channelNr], 0);
displayPeak[channelNr] =
std::clamp(displayPeak[channelNr] - decay,
currentPeak[channelNr], 0.f);
}
if (currentPeak[channelNr] >= displayPeakHold[channelNr] ||
@@ -1060,8 +1060,8 @@ VolumeMeter::calculateBallisticsForChannel(int channelNr, uint64_t ts,
(timeSinceLastRedraw / magnitudeIntegrationTime) *
0.99);
displayMagnitude[channelNr] =
CLAMP(displayMagnitude[channelNr] + attack,
(float)minimumLevel, 0);
std::clamp(displayMagnitude[channelNr] + attack,
(float)minimumLevel, 0.f);
}
}