The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-06-19 19:00:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Several little things.

Browse Source 
The C version of the GenericLog was being used in both C and C++ branches of the code.
Parent panic alerts by the main_frame so that those windows get the icon too.
Fix a couple of compiler warnings.
Added some checks for libraries in the cmake build.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6385 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice
2010-11-12 05:05:27 +00:00
parent 7800d68fee
commit c0bdf4de81
7 changed files with 34 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/AudioCommon/Src/Mixer.cpp
View File

@ -74,12 +74,12 @@ unsigned int CMixer::Mix(short* samples, unsigned int numSamples)
s16 l1 = Common::swap16(m_buffer[m_indexR & INDEX_MASK]); //current
s16 l2 = Common::swap16(m_buffer[m_indexR2 & INDEX_MASK]); //next
int sampleL = (l1 << 16) + (l2 - l1) * (u16)frac >> 16;
int sampleL = ((l1 << 16) + (l2 - l1) * (u16)frac) >> 16;
samples[i] = sampleL;
s16 r1 = Common::swap16(m_buffer[(m_indexR + 1) & INDEX_MASK]); //current
s16 r2 = Common::swap16(m_buffer[(m_indexR2 + 1) & INDEX_MASK]); //next
int sampleR = (r1 << 16) + (r2 - r1) * (u16)frac >> 16;
int sampleR = ((r1 << 16) + (r2 - r1) * (u16)frac) >> 16;
samples[i+1] = sampleR;
frac += ratio;