piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 14:49:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix the CMake build.

Browse Source 
Prevent the PS3 HID crash until I can debug it.

AudioUnits are enabled by default.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7052 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang
2011-02-03 21:11:06 +00:00
parent dfe84ce0ac
commit 435b25fa55
10 changed files with 253 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Core/AudioCommon/Src/CoreAudioSoundStream.cpp
View File

@ -46,15 +46,14 @@ bool CoreAudioSound::Start()
AURenderCallbackStruct callback_struct;
AudioStreamBasicDescription format;
ComponentDescription desc;
UInt32 enableIO = 1;
Component component;
desc.componentType = kAudioUnitType_Output;
desc.componentSubType = kAudioUnitSubType_DefaultOutput;
desc.componentFlags = 0;
desc.componentFlagsMask = 0;
desc.componentManufacturer = kAudioUnitManufacturer_Apple;
Component component = FindNextComponent(NULL, &desc);
component = FindNextComponent(NULL, &desc);
if (component == NULL) {
ERROR_LOG(AUDIO, "error finding audio component");
return false;
@ -66,11 +65,6 @@ bool CoreAudioSound::Start()
return false;
}
AudioUnitSetProperty(audioUnit,
kAudioOutputUnitProperty_EnableIO,
kAudioUnitScope_Output, 0, &enableIO,
sizeof enableIO);
FillOutASBDForLPCM(format, m_mixer->GetSampleRate(),
2, 16, 16, false, false, false);
err = AudioUnitSetProperty(audioUnit,

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

@ -31,8 +31,6 @@
#include <tmmintrin.h>
#endif
static const __m128i sr_mask = _mm_set_epi32(0x0C0D0E0FL, 0x08090A0BL, 0x04050607L, 0x00010203L);
// Executed from sound stream thread
unsigned int CMixer::Mix(short* samples, unsigned int numSamples)
{
@ -64,6 +62,10 @@ unsigned int CMixer::Mix(short* samples, unsigned int numSamples)
if (m_sampleRate == 32000)
{
#if _M_SSE >= 0x301
static const __m128i sr_mask =
_mm_set_epi32(0x0C0D0E0FL, 0x08090A0BL,
0x04050607L, 0x00010203L);
if (cpu_info.bSSSE3 && !((numLeft * 2) % 8))
{
for (unsigned int i = 0; i < numLeft * 2; i += 8)