From d2a1bb4806a26f9cb3d3e5249814a2633ba4b272 Mon Sep 17 00:00:00 2001 From: Clement Date: Thu, 8 Nov 2018 11:29:20 -0800 Subject: [PATCH] CR --- libraries/audio/src/Sound.cpp | 7 +++---- libraries/audio/src/Sound.h | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/libraries/audio/src/Sound.cpp b/libraries/audio/src/Sound.cpp index 3cc32333f6..7c5dd3813b 100644 --- a/libraries/audio/src/Sound.cpp +++ b/libraries/audio/src/Sound.cpp @@ -111,11 +111,10 @@ void SoundProcessor::run() { return; } - QString fileName = sound->getURL().fileName().toLower(); + auto url = sound->getURL(); + QString fileName = url.fileName().toLower(); qCDebug(audio) << "Processing sound file" << fileName; - // replace our byte array with the downloaded data - static const QString WAV_EXTENSION = ".wav"; static const QString MP3_EXTENSION = ".mp3"; static const QString RAW_EXTENSION = ".raw"; @@ -165,7 +164,7 @@ void SoundProcessor::run() { } QByteArray SoundProcessor::downSample(const QByteArray& rawAudioByteArray, - AudioProperties properties) { + AudioProperties properties) { // we want to convert it to the format that the audio-mixer wants // which is signed, 16-bit, 24Khz diff --git a/libraries/audio/src/Sound.h b/libraries/audio/src/Sound.h index 36bc9c72ac..836e28d582 100644 --- a/libraries/audio/src/Sound.h +++ b/libraries/audio/src/Sound.h @@ -37,8 +37,6 @@ public: static AudioDataPointer make(uint32_t numSamples, uint32_t numChannels, const AudioSample* samples); - AudioData(uint32_t numSamples, uint32_t numChannels, const AudioSample* samples); - uint32_t getNumSamples() const { return _numSamples; } uint32_t getNumChannels() const { return _numChannels; } const AudioSample* data() const { return _data; } @@ -51,6 +49,8 @@ public: uint32_t getNumBytes() const { return _numSamples * sizeof(AudioSample); } private: + AudioData(uint32_t numSamples, uint32_t numChannels, const AudioSample* samples); + const uint32_t _numSamples { 0 }; const uint32_t _numChannels { 0 }; const AudioSample* const _data { nullptr };