From 040df97be27cf5b0b2635ae2f83d500294cfd1b2 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Tue, 15 Apr 2014 20:23:47 -0700 Subject: [PATCH] more cleanup --- interface/src/Audio.cpp | 5 ----- interface/src/Audio.h | 14 ++++++-------- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/interface/src/Audio.cpp b/interface/src/Audio.cpp index 551acaad84..d6deb66e2a 100644 --- a/interface/src/Audio.cpp +++ b/interface/src/Audio.cpp @@ -665,11 +665,6 @@ void Audio::addReceivedAudioToBuffer(const QByteArray& audioByteArray) { _lastReceiveTime = currentReceiveTime; } -unsigned int Audio::timeValToSampleTick(const quint64 time, int sampleRate) { - unsigned int sample = (unsigned int)(time / 1000000 * sampleRate); - return sample; -} - void Audio::addSpatialAudioToBuffer(unsigned int sampleTime, const QByteArray& spatialAudio, unsigned int numSamples) { // Calculate the number of remaining samples available. The source spatial audio buffer will get // clipped if there are insufficient samples available in the accumulation buffer. diff --git a/interface/src/Audio.h b/interface/src/Audio.h index 99d9bd4884..f2fed15f65 100644 --- a/interface/src/Audio.h +++ b/interface/src/Audio.h @@ -167,16 +167,14 @@ private: GLuint _boxTextureId; QRect _iconBounds; - // Audio callback in class context. + /// Audio callback in class context. inline void performIO(int16_t* inputLeft, int16_t* outputLeft, int16_t* outputRight); - // Process received audio by spatial attenuation geometric response - bool _processSpatialAudio; - unsigned int _spatialAudioStart; /// Start of spatial audio interval (in sample rate time base) - unsigned int _spatialAudioFinish; /// End of spatial audio interval (in sample rate time base) - AudioRingBuffer _spatialAudioRingBuffer; /// Spatially processed audio - - unsigned int timeValToSampleTick(const quint64 time, int sampleRate); + + bool _processSpatialAudio; /// Process received audio by spatial audio hooks + unsigned int _spatialAudioStart; /// Start of spatial audio interval (in sample rate time base) + unsigned int _spatialAudioFinish; /// End of spatial audio interval (in sample rate time base) + AudioRingBuffer _spatialAudioRingBuffer; /// Spatially processed audio // Process procedural audio by // 1. Echo to the local procedural output device