From 4f3f5e1abef6a04591083f59580e08c078b0f16b Mon Sep 17 00:00:00 2001
From: tosh <tosh@monster.hlan>
Date: Sat, 18 May 2013 13:35:06 +0200
Subject: [PATCH] clarifies some names

---
 interface/src/Oscilloscope.cpp | 6 +++---
 interface/src/Oscilloscope.h   | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/interface/src/Oscilloscope.cpp b/interface/src/Oscilloscope.cpp
index 088ef6ac14..d4b6a103bb 100644
--- a/interface/src/Oscilloscope.cpp
+++ b/interface/src/Oscilloscope.cpp
@@ -35,7 +35,7 @@ namespace { // everything in here only exists while compiling this .cpp file
 Oscilloscope::Oscilloscope(int w, int h, bool isEnabled) : 
     _valWidth(w), _valHeight(h), 
     _arrSamples(0l), _arrVertices(0l), 
-    _valLowpass(0.4f), _valDownsample(3),
+    _valLowpassFactor(0.4f), _valDownsampleFactor(3),
     enabled(isEnabled), inputPaused(false) {
     
     // allocate enough space for the sample data and to turn it into
@@ -95,8 +95,8 @@ void Oscilloscope::render(int x, int y) {
     }
 
     // determine lowpass / downsample factors
-    int lowpass = -int(std::numeric_limits<short>::min()) * _valLowpass;
-    unsigned downsample = _valDownsample;
+    int lowpass = -int(std::numeric_limits<short>::min()) * _valLowpassFactor;
+    unsigned downsample = _valDownsampleFactor;
     // keep half of the buffer for writing and ensure an even vertex count
     unsigned usedWidth = min(_valWidth, MAX_SAMPLES_PER_CHANNEL / (downsample * 2)) & ~1u;
     unsigned usedSamples = usedWidth * downsample;
diff --git a/interface/src/Oscilloscope.h b/interface/src/Oscilloscope.h
index 8c0b727b6e..23a6632896 100644
--- a/interface/src/Oscilloscope.h
+++ b/interface/src/Oscilloscope.h
@@ -26,8 +26,8 @@ public:
     volatile bool enabled;
     volatile bool inputPaused;
 
-    void setLowpass(float w) { assert(w > 0.0f && w <= 1.0f); _valLowpass = w; }
-    void setDownsampling(unsigned f) { assert(f > 0); _valDownsample = f; }
+    void setLowpass(float w) { assert(w > 0.0f && w <= 1.0f); _valLowpassFactor = w; }
+    void setDownsampling(unsigned f) { assert(f > 0); _valDownsampleFactor = f; }
     
 private:
     // don't copy/assign
@@ -42,8 +42,8 @@ private:
     short*          _arrVertices;
     unsigned        _arrWritePos[MAX_CHANNELS];
 
-    float           _valLowpass;
-    unsigned        _valDownsample;
+    float           _valLowpassFactor;
+    unsigned        _valDownsampleFactor;
 };
 
 #endif /* defined(__interface__oscilloscope__) */