Merge pull request #3324 from Atlante45/master

fix for crash in Audio
This commit is contained in:
Craig Hansen-Sturm 2014-08-27 16:16:13 -07:00
commit 61a09146cd

View file

@ -1313,7 +1313,10 @@ void Audio::freeScope() {
int Audio::addBufferToScope(QByteArray* byteArray, int frameOffset, const int16_t* source, int sourceSamplesPerChannel,
unsigned int sourceChannel, unsigned int sourceNumberOfChannels, float fade) {
if (!_scopeEnabled || _scopeEnabledPause) {
return 0;
}
// Constant multiplier to map sample value to vertical size of scope
float multiplier = (float)MULTIPLIER_SCOPE_HEIGHT / logf(2.0f);