Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-05 23:39:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Expanded variable names.

Browse source
This commit is contained in:
matsukaze 2014-04-22 21:57:41 -04:00
parent 1ff3b83644
commit d6e4f217f5
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/src/Audio.cpp
View file

@ -1075,7 +1075,7 @@ void Audio::toggleScope() {
} }
void Audio::addBufferToScope( void Audio::addBufferToScope(
QByteArray& byteArray, unsigned int frameOffset, const int16_t* src, unsigned int srcChannel, unsigned int srcNumChannels) { QByteArray& byteArray, unsigned int frameOffset, const int16_t* source, unsigned int sourceChannel, unsigned int sourceNumberOfChannels) {
// Constant multiplier to map sample value to vertical size of scope // Constant multiplier to map sample value to vertical size of scope
float multiplier = (float)MULTIPLIER_SCOPE_HEIGHT / logf(2.0f); float multiplier = (float)MULTIPLIER_SCOPE_HEIGHT / logf(2.0f);
@ -1087,11 +1087,11 @@ void Audio::addBufferToScope(
int16_t value; int16_t value;
// Short int pointer to mapped samples in byte array // Short int pointer to mapped samples in byte array
int16_t* tgt = (int16_t*) byteArray.data(); int16_t* destination = (int16_t*) byteArray.data();
for (int i = 0; i < NETWORK_SAMPLES_PER_FRAME; i++) { for (int i = 0; i < NETWORK_SAMPLES_PER_FRAME; i++) {
sample = (float)src[i * srcNumChannels + srcChannel]; sample = (float)source[i * sourceNumberOfChannels + sourceChannel];
if (sample > 0) { if (sample > 0) {
value = (int16_t)(multiplier * logf(sample)); value = (int16_t)(multiplier * logf(sample));
@ -1101,7 +1101,7 @@ void Audio::addBufferToScope(
value = 0; value = 0;
} }
tgt[i + frameOffset] = value; destination[i + frameOffset] = value;
} }
} }

3
interface/src/Audio.h
View file

@ -201,7 +201,8 @@ private:
float calculateDeviceToNetworkInputRatio(int numBytes); float calculateDeviceToNetworkInputRatio(int numBytes);
// Audio scope methods for data acquisition // Audio scope methods for data acquisition
void addBufferToScope(QByteArray& byteArray, unsigned int frameOffset, const int16_t* src, unsigned int srcChannel, unsigned int srcNumChannels); void addBufferToScope(
QByteArray& byteArray, unsigned int frameOffset, const int16_t* source, unsigned int sourceChannel, unsigned int sourceNumberOfChannels);
// Audio scope methods for rendering // Audio scope methods for rendering
void renderBackground(const float* color, int x, int y, int width, int height); void renderBackground(const float* color, int x, int y, int width, int height);