From 78031622dbdce0c9a38a7768b5fb4b513667d64f Mon Sep 17 00:00:00 2001
From: wangyix <wangyix@gmail.com>
Date: Fri, 25 Jul 2014 16:06:56 -0700
Subject: [PATCH] removed MixedAudioRingBuffer class files

---
 libraries/audio/src/MixedAudioRingBuffer.cpp | 52 --------------------
 libraries/audio/src/MixedAudioRingBuffer.h   | 29 -----------
 2 files changed, 81 deletions(-)
 delete mode 100644 libraries/audio/src/MixedAudioRingBuffer.cpp
 delete mode 100644 libraries/audio/src/MixedAudioRingBuffer.h

diff --git a/libraries/audio/src/MixedAudioRingBuffer.cpp b/libraries/audio/src/MixedAudioRingBuffer.cpp
deleted file mode 100644
index c975d7b68e..0000000000
--- a/libraries/audio/src/MixedAudioRingBuffer.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-//
-//  MixedAudioRingBuffer.cpp
-//  libraries/audio/src
-//
-//  Created by Stephen Birarda on 2014.
-//  Copyright 2014 High Fidelity, Inc.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-#include "MixedAudioRingBuffer.h"
-
-MixedAudioRingBuffer::MixedAudioRingBuffer(int numFrameSamples) :
-    AudioRingBuffer(numFrameSamples),
-    _lastReadFrameAverageLoudness(0.0f)
-{
-    
-}
-
-qint64 MixedAudioRingBuffer::readSamples(int16_t* destination, qint64 maxSamples) {
-    // calculate the average loudness for the frame about to go out
-    
-    // read from _nextOutput either _numFrameSamples or to the end of the buffer
-    int samplesFromNextOutput = _buffer + _sampleCapacity - _nextOutput;
-    if (samplesFromNextOutput > _numFrameSamples) {
-        samplesFromNextOutput = _numFrameSamples;
-    }
-    
-    float averageLoudness = 0.0f;
-    
-    for (int s = 0; s < samplesFromNextOutput; s++) {
-        averageLoudness += fabsf(_nextOutput[s]);
-    }
-    
-    // read samples from the beginning of the buffer, if any
-    int samplesFromBeginning = _numFrameSamples - samplesFromNextOutput;
-    
-    if (samplesFromBeginning > 0) {
-        for (int b = 0; b < samplesFromBeginning; b++) {
-            averageLoudness += fabsf(_buffer[b]);
-        }
-    }
-    
-    // divide by the number of samples and the MAX_SAMPLE_VALUE to get a float from 0 - 1
-    averageLoudness /= (float) _numFrameSamples;
-    averageLoudness /= (float) MAX_SAMPLE_VALUE;
-    
-    _lastReadFrameAverageLoudness = averageLoudness;
-    
-    return AudioRingBuffer::readSamples(destination, maxSamples);
-}
diff --git a/libraries/audio/src/MixedAudioRingBuffer.h b/libraries/audio/src/MixedAudioRingBuffer.h
deleted file mode 100644
index 25574a3ea6..0000000000
--- a/libraries/audio/src/MixedAudioRingBuffer.h
+++ /dev/null
@@ -1,29 +0,0 @@
-//
-//  MixedAudioRingBuffer.h
-//  libraries/audio/src
-//
-//  Created by Stephen Birarda on 2014.
-//  Copyright 2014 High Fidelity, Inc.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-#ifndef hifi_MixedAudioRingBuffer_h
-#define hifi_MixedAudioRingBuffer_h
-
-#include "AudioRingBuffer.h"
-
-class MixedAudioRingBuffer : public AudioRingBuffer {
-    Q_OBJECT
-public:
-    MixedAudioRingBuffer(int numFrameSamples);
-    
-    float getLastReadFrameAverageLoudness() const { return _lastReadFrameAverageLoudness; }
-    
-    qint64 readSamples(int16_t* destination, qint64 maxSamples);    
-private:
-     float _lastReadFrameAverageLoudness;
-};
-
-#endif // hifi_MixedAudioRingBuffer_h