From a9fc69b4ac6174150f4de197a3b2e6820549b29b Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 10 Feb 2016 10:49:13 -0800
Subject: [PATCH] cleanup percentage calculation for AM mix stats

---
 assignment-client/src/audio/AudioMixer.cpp | 14 +++++++++-----
 assignment-client/src/audio/AudioMixer.h   |  2 ++
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/assignment-client/src/audio/AudioMixer.cpp b/assignment-client/src/audio/AudioMixer.cpp
index ac78298573..47f9204d36 100644
--- a/assignment-client/src/audio/AudioMixer.cpp
+++ b/assignment-client/src/audio/AudioMixer.cpp
@@ -489,6 +489,10 @@ void AudioMixer::removeHRTFsForFinishedInjector(const QUuid& streamID) {
     }
 }
 
+float AudioMixer::percentageForMixStats(int counter) {
+    return (_totalMixes > 0) ? (float(counter) / _totalMixes) * 100.0f : 0;
+}
+
 void AudioMixer::sendStatsPacket() {
     static QJsonObject statsObject;
 
@@ -499,11 +503,11 @@ void AudioMixer::sendStatsPacket() {
     statsObject["avg_listeners_per_frame"] = (float) _sumListeners / (float) _numStatFrames;
 
     QJsonObject mixStats;
-    mixStats["%_hrtf_mixes"] = (_totalMixes > 0) ? (_hrtfRenders / _totalMixes) * 100.0f : 0;
-    mixStats["%_hrtf_silent_mixes"] = (_totalMixes > 0) ? (_hrtfSilentRenders / _totalMixes) * 100.0f : 0;
-    mixStats["%_hrtf_struggle_mixes"] = (_totalMixes > 0) ? (_hrtfStruggleRenders / _totalMixes) * 100.0f : 0;
-    mixStats["%_manual_stereo_mixes"] = (_totalMixes > 0) ? (_manualStereoMixes / _totalMixes) * 100.0f : 0;
-    mixStats["%_manual_echo_mixes"] = (_totalMixes > 0) ? (_manualEchoMixes / _totalMixes) * 100.0f : 0;
+    mixStats["%_hrtf_mixes"] = percentageForMixStats(_hrtfRenders);
+    mixStats["%_hrtf_silent_mixes"] = percentageForMixStats(_hrtfSilentRenders);
+    mixStats["%_hrtf_struggle_mixes"] = percentageForMixStats(_hrtfStruggleRenders);
+    mixStats["%_manual_stereo_mixes"] = percentageForMixStats(_manualStereoMixes);
+    mixStats["%_manual_echo_mixes"] = percentageForMixStats(_manualEchoMixes);
 
     mixStats["total_mixes"] = _totalMixes;
     mixStats["avg_mixes_per_block"] = _totalMixes / _numStatFrames;
diff --git a/assignment-client/src/audio/AudioMixer.h b/assignment-client/src/audio/AudioMixer.h
index 1098840180..ee9e5b4eb9 100644
--- a/assignment-client/src/audio/AudioMixer.h
+++ b/assignment-client/src/audio/AudioMixer.h
@@ -71,6 +71,8 @@ private:
 
     void perSecondActions();
 
+    float percentageForMixStats(int counter);
+
     bool shouldMute(float quietestFrame);
 
     void parseSettingsObject(const QJsonObject& settingsObject);