From 9c21d003af3dc9654a9b302c3085253d55cab20e Mon Sep 17 00:00:00 2001 From: Soren Jorvang Date: Wed, 2 Feb 2011 18:21:20 +0000 Subject: Remove the global namespace a bit and remove some dead code. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7043 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/AudioCommon/Src/CoreAudioSoundStream.cpp | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) (limited to 'Source/Core/AudioCommon/Src/CoreAudioSoundStream.cpp') diff --git a/Source/Core/AudioCommon/Src/CoreAudioSoundStream.cpp b/Source/Core/AudioCommon/Src/CoreAudioSoundStream.cpp index 2e76294681..a230d07a75 100644 --- a/Source/Core/AudioCommon/Src/CoreAudioSoundStream.cpp +++ b/Source/Core/AudioCommon/Src/CoreAudioSoundStream.cpp @@ -19,25 +19,19 @@ #include "CoreAudioSoundStream.h" -OSStatus callback(void *inRefCon, AudioUnitRenderActionFlags *ioActionFlags, - const AudioTimeStamp *inTimeStamp, UInt32 inBusNumber, - UInt32 inNumberFrames, AudioBufferList *ioData) +OSStatus CoreAudioSound::callback(void *inRefCon, + AudioUnitRenderActionFlags *ioActionFlags, + const AudioTimeStamp *inTimeStamp, UInt32 inBusNumber, + UInt32 inNumberFrames, AudioBufferList *ioData) { for (UInt32 i = 0; i < ioData->mNumberBuffers; i++) - { - ((CoreAudioSound *)inRefCon)-> \ - RenderSamples(ioData->mBuffers[i].mData, - ioData->mBuffers[i].mDataByteSize); - } + ((CoreAudioSound *)inRefCon)->m_mixer-> + Mix((short *)ioData->mBuffers[i].mData, + ioData->mBuffers[i].mDataByteSize / 4); return noErr; } -void CoreAudioSound::RenderSamples(void *target, UInt32 size) -{ - m_mixer->Mix((short *)target, size / 4); -} - CoreAudioSound::CoreAudioSound(CMixer *mixer) : SoundStream(mixer) { } -- cgit v1.2.3