obs: Remove update time from volume meter
Remove the update time check from the volume meter since it is no longer nescessary. The update interval can now be set with the volmeter which has the added benefit of not loosing data where previously updates had been skipped.
This commit is contained in:
@@ -12,8 +12,6 @@
|
||||
|
||||
using namespace std;
|
||||
|
||||
#define UPDATE_INTERVAL_MS 50
|
||||
|
||||
void VolControl::OBSVolumeChanged(void *data, calldata_t *calldata)
|
||||
{
|
||||
Q_UNUSED(calldata);
|
||||
@@ -42,17 +40,7 @@ void VolControl::VolumeChanged()
|
||||
|
||||
void VolControl::VolumeLevel(float mag, float peak, float peakHold)
|
||||
{
|
||||
uint64_t curMeterTime = os_gettime_ns() / 1000000;
|
||||
|
||||
/*
|
||||
Add again peak averaging?
|
||||
*/
|
||||
|
||||
/* only update after a certain amount of time */
|
||||
if ((curMeterTime - lastMeterTime) > UPDATE_INTERVAL_MS) {
|
||||
lastMeterTime = curMeterTime;
|
||||
volMeter->setLevels(mag, peak, peakHold);
|
||||
}
|
||||
volMeter->setLevels(mag, peak, peakHold);
|
||||
}
|
||||
|
||||
void VolControl::SliderChanged(int vol)
|
||||
@@ -74,7 +62,6 @@ void VolControl::SetName(const QString &newName)
|
||||
|
||||
VolControl::VolControl(OBSSource source_)
|
||||
: source (source_),
|
||||
lastMeterTime (0),
|
||||
levelTotal (0.0f),
|
||||
levelCount (0.0f),
|
||||
obs_fader (obs_fader_create(OBS_FADER_CUBIC)),
|
||||
|
@@ -32,7 +32,6 @@ private:
|
||||
QLabel *volLabel;
|
||||
VolumeMeter *volMeter;
|
||||
QSlider *slider;
|
||||
uint64_t lastMeterTime;
|
||||
float levelTotal;
|
||||
float levelCount;
|
||||
obs_fader_t *obs_fader;
|
||||
|
Reference in New Issue
Block a user