From 431fcbcf6c7ba2eaaed97f690f34d72f83380210 Mon Sep 17 00:00:00 2001
From: Craig Hansen-Sturm <chansensturm@comcast.net>
Date: Mon, 8 Sep 2014 11:18:14 -0700
Subject: [PATCH] coding standard / SLOT selectAudioSourceSine440 linkage /
 tone gen amplitude parameter

---
 interface/src/Menu.cpp                |  2 +-
 libraries/audio/src/AudioBuffer.h     | 20 ++++++++++----------
 libraries/audio/src/AudioFilter.h     | 10 +++++-----
 libraries/audio/src/AudioFilterBank.h |  6 +++---
 libraries/audio/src/AudioSourceTone.h |  9 ++++++---
 5 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index 5f6abe9527..c863c098c2 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -563,7 +563,7 @@ Menu::Menu() :
                                                                     0,
                                                                     true,
                                                                     appInstance->getAudio(),
-                                                                    SLOT(selectAudioSourceSine440));
+                                                                    SLOT(selectAudioSourceSine440()));
 
         QActionGroup* audioSourceGroup = new QActionGroup(audioSourceMenu);
         audioSourceGroup->addAction(pinkNoise);
diff --git a/libraries/audio/src/AudioBuffer.h b/libraries/audio/src/AudioBuffer.h
index 7c244f47bf..0644139f80 100644
--- a/libraries/audio/src/AudioBuffer.h
+++ b/libraries/audio/src/AudioBuffer.h
@@ -44,18 +44,18 @@ class AudioFrameBuffer {
     
 public:
     
-    AudioFrameBuffer() 
-    : _channelCount(0)
-    , _frameCount(0)
-    , _frameCountMax(0)
-    , _frameBuffer(NULL) {
+    AudioFrameBuffer() :
+        _channelCount(0),
+        _frameCount(0),
+        _frameCountMax(0),
+        _frameBuffer(NULL) {
     }
     
-    AudioFrameBuffer(const uint16_t channelCount, const uint16_t frameCount) 
-    : _channelCount(channelCount)
-    , _frameCount(frameCount)
-    , _frameCountMax(frameCount)
-    , _frameBuffer(NULL) {
+    AudioFrameBuffer(const uint16_t channelCount, const uint16_t frameCount) :
+        _channelCount(channelCount),
+        _frameCount(frameCount),
+        _frameCountMax(frameCount),
+        _frameBuffer(NULL) {
         allocateFrames();
     }
     
diff --git a/libraries/audio/src/AudioFilter.h b/libraries/audio/src/AudioFilter.h
index c2de3860db..c9458f280e 100644
--- a/libraries/audio/src/AudioFilter.h
+++ b/libraries/audio/src/AudioFilter.h
@@ -37,11 +37,11 @@ public:
     //
     // ctor/dtor
     //
-    AudioBiquad() 
-    : _xm1(0.)
-    , _xm2(0.)
-    , _ym1(0.)
-    , _ym2(0.) {
+    AudioBiquad() :
+    _xm1(0.),
+    _xm2(0.),
+    _ym1(0.),
+    _ym2(0.) {
         setParameters(0.,0.,0.,0.,0.);
     }
 
diff --git a/libraries/audio/src/AudioFilterBank.h b/libraries/audio/src/AudioFilterBank.h
index 46d781075a..b9546999d9 100644
--- a/libraries/audio/src/AudioFilterBank.h
+++ b/libraries/audio/src/AudioFilterBank.h
@@ -49,9 +49,9 @@ public:
     //
     // ctor/dtor
     //
-    AudioFilterBank() 
-    : _sampleRate(0.)
-    , _frameCount(0) {
+    AudioFilterBank() :
+        _sampleRate(0.0f),
+        _frameCount(0) {
         for (int i = 0; i < _channelCount; ++i) {
             _buffer[ i ] = NULL;
         }
diff --git a/libraries/audio/src/AudioSourceTone.h b/libraries/audio/src/AudioSourceTone.h
index fb9d6be0fe..5ebe1ba2a9 100644
--- a/libraries/audio/src/AudioSourceTone.h
+++ b/libraries/audio/src/AudioSourceTone.h
@@ -16,6 +16,7 @@ class AudioSourceTone
 {
     static uint32_t _frameOffset;
     float32_t _frequency;
+    float32_t _amplitude;
     float32_t _sampleRate;
     float32_t _omega;
     
@@ -30,7 +31,7 @@ public:
     
     void initialize() {
         _frameOffset = 0;
-        setParameters(SAMPLE_RATE, 220.0f);
+        setParameters(SAMPLE_RATE, 220.0f, 0.9f);
     }
     
     void finalize() {
@@ -40,15 +41,17 @@ public:
         _frameOffset = 0;
     }
 
-    void setParameters(const float32_t sampleRate, const float32_t frequency) {
+    void setParameters(const float32_t sampleRate, const float32_t frequency,  const float32_t amplitude) {
         _sampleRate = std::max(sampleRate, 1.0f);
         _frequency = std::max(frequency, 1.0f);
+        _amplitude = std::max(amplitude, 1.0f);
         _omega = _frequency / _sampleRate * TWO_PI;
     }
     
-    void getParameters(float32_t& sampleRate, float32_t& frequency) {
+    void getParameters(float32_t& sampleRate, float32_t& frequency, float32_t& amplitude) {
         sampleRate = _sampleRate;
         frequency = _frequency;
+        amplitude = _amplitude;
     }
 
     void render(AudioBufferFloat32& frameBuffer) {