diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2014-03-10 23:40:16 +0100 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2014-03-10 23:40:16 +0100 |
| commit | ede46556d9b5043113e19359fee97eb09f9c872c (patch) | |
| tree | 54442e504fc06d44e80a7351be46a1fead5ad356 /Source/Core/AudioCommon/Mixer.cpp | |
| parent | 52ed10213d085caec6007ae3b3856e50f282c756 (diff) | |
| parent | 31cfc73a09a8685cbab20502b4bc132e98e2feb5 (diff) | |
Merge pull request #155 from Parlane/codestyle_fixes
Fixes spacing for "for", "while", "switch" and "if"
Diffstat (limited to 'Source/Core/AudioCommon/Mixer.cpp')
| -rw-r--r-- | Source/Core/AudioCommon/Mixer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/AudioCommon/Mixer.cpp b/Source/Core/AudioCommon/Mixer.cpp index 15a7b4d7f1..2b785ffaf4 100644 --- a/Source/Core/AudioCommon/Mixer.cpp +++ b/Source/Core/AudioCommon/Mixer.cpp @@ -48,8 +48,8 @@ unsigned int CMixer::Mix(short* samples, unsigned int numSamples, bool consider_ float numLeft = ((indexW - indexR) & INDEX_MASK) / 2; m_numLeftI = (numLeft + m_numLeftI*(CONTROL_AVG-1)) / CONTROL_AVG; float offset = (m_numLeftI - LOW_WATERMARK) * CONTROL_FACTOR; - if(offset > MAX_FREQ_SHIFT) offset = MAX_FREQ_SHIFT; - if(offset < -MAX_FREQ_SHIFT) offset = -MAX_FREQ_SHIFT; + if (offset > MAX_FREQ_SHIFT) offset = MAX_FREQ_SHIFT; + if (offset < -MAX_FREQ_SHIFT) offset = -MAX_FREQ_SHIFT; //render numleft sample pairs to samples[] //advance indexR with sample position @@ -65,7 +65,7 @@ unsigned int CMixer::Mix(short* samples, unsigned int numSamples, bool consider_ static u32 frac = 0; const u32 ratio = (u32)( 65536.0f * aid_sample_rate / (float)m_sampleRate ); - if(ratio > 0x10000) + if (ratio > 0x10000) ERROR_LOG(AUDIO, "ratio out of range"); for (; currentSample < numSamples*2 && ((indexW-indexR) & INDEX_MASK) > 2; currentSample+=2) { |