From 7f2baa056e85b2d2de7d51741ff8d77c69ff9113 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 16 Dec 2014 12:02:10 -0800
Subject: [PATCH] some cleanup in audio library

---
 libraries/audio/src/AudioBuffer.h       | 16 +++++++++-------
 libraries/audio/src/AudioFilterBank.cpp |  3 +--
 libraries/audio/src/AudioFilterBank.h   |  2 +-
 libraries/audio/src/AudioGain.cpp       |  6 +++---
 libraries/audio/src/AudioGain.h         |  2 +-
 5 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/libraries/audio/src/AudioBuffer.h b/libraries/audio/src/AudioBuffer.h
index c489c169a7..e24f53be77 100644
--- a/libraries/audio/src/AudioBuffer.h
+++ b/libraries/audio/src/AudioBuffer.h
@@ -14,6 +14,8 @@
 
 #include <typeinfo>
 
+#include <QDebug>
+
 template< typename T >
 class AudioFrameBuffer {
     
@@ -150,13 +152,13 @@ inline void AudioFrameBuffer< T >::copyFrames(uint32_t channelCount, const uint3
         _channelCount = channelCount; 
     } else {
         qDebug() << "Audio framing error:  _channelCount=" 
-        << _channelCount 
-        << "channelCountMax=" 
-        << _channelCountMax
-        << "_frameCount=" 
-        << _frameCount 
-        << "frameCountMax=" 
-        << _frameCountMax;
+            << _channelCount
+            << "channelCountMax="
+            << _channelCountMax
+            << "_frameCount="
+            << _frameCount
+            << "frameCountMax="
+            << _frameCountMax;
         
         _channelCount = std::min(_channelCount,_channelCountMax);
         _frameCount = std::min(_frameCount,_frameCountMax);
diff --git a/libraries/audio/src/AudioFilterBank.cpp b/libraries/audio/src/AudioFilterBank.cpp
index 6599b29a01..d5792ae97c 100644
--- a/libraries/audio/src/AudioFilterBank.cpp
+++ b/libraries/audio/src/AudioFilterBank.cpp
@@ -1,6 +1,6 @@
 //
 //  AudioFilterBank.cpp
-//  hifi
+//  libraries/audio/src
 //
 //  Created by Craig Hansen-Sturm on 8/10/14.
 //  Copyright 2014 High Fidelity, Inc.
@@ -12,7 +12,6 @@
 #include <assert.h>
 #include <math.h>
 #include <SharedUtil.h>
-#include "AudioRingBuffer.h"
 #include "AudioFormat.h"
 #include "AudioBuffer.h"
 #include "AudioFilter.h"
diff --git a/libraries/audio/src/AudioFilterBank.h b/libraries/audio/src/AudioFilterBank.h
index 41b2985cbe..c5f0c4c171 100644
--- a/libraries/audio/src/AudioFilterBank.h
+++ b/libraries/audio/src/AudioFilterBank.h
@@ -1,6 +1,6 @@
 //
 //  AudioFilterBank.h
-//  hifi
+//  libraries/audio/src
 //
 //  Created by Craig Hansen-Sturm on 8/23/14.
 //  Copyright 2014 High Fidelity, Inc.
diff --git a/libraries/audio/src/AudioGain.cpp b/libraries/audio/src/AudioGain.cpp
index 8bd2b5b7a3..217a4d3791 100644
--- a/libraries/audio/src/AudioGain.cpp
+++ b/libraries/audio/src/AudioGain.cpp
@@ -1,6 +1,6 @@
 //
 //  AudioGain.cpp
-//  hifi
+//  libraries/audio/src
 //
 //  Created by Craig Hansen-Sturm on 9/10/14.
 //  Copyright 2014 High Fidelity, Inc.
@@ -10,9 +10,9 @@
 //
 
 #include <assert.h>
+#include <algorithm>
 #include <math.h>
-#include <SharedUtil.h>
-#include "AudioRingBuffer.h"
+
 #include "AudioFormat.h"
 #include "AudioBuffer.h"
 #include "AudioGain.h"
diff --git a/libraries/audio/src/AudioGain.h b/libraries/audio/src/AudioGain.h
index 1d54d76f7f..3bf7b0d4dd 100644
--- a/libraries/audio/src/AudioGain.h
+++ b/libraries/audio/src/AudioGain.h
@@ -1,6 +1,6 @@
 //
 //  AudioGain.h
-//  hifi
+//  libraries/audio/src
 //
 //  Created by Craig Hansen-Sturm on 9/1/14.
 //  Copyright 2014 High Fidelity, Inc.