diff options
| author | Soren Jorvang <soren.jorvang@gmail.com> | 2011-01-04 02:09:29 +0000 |
|---|---|---|
| committer | Soren Jorvang <soren.jorvang@gmail.com> | 2011-01-04 02:09:29 +0000 |
| commit | efe555fc16ebc62ab667189e43908215d64bb754 (patch) | |
| tree | dfa2b0d73513bf5371abb65c4b0cff7c2a11d8d9 /Source/Core/AudioCommon/Src | |
| parent | 58f5140233963944341fdbd7d6d1b7f585003196 (diff) | |
Some minor tidying of the OS X audio and wiimote code.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6736 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/AudioCommon/Src')
| -rw-r--r-- | Source/Core/AudioCommon/Src/CoreAudioSoundStream.cpp | 4 | ||||
| -rw-r--r-- | Source/Core/AudioCommon/Src/CoreAudioSoundStream.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Source/Core/AudioCommon/Src/CoreAudioSoundStream.cpp b/Source/Core/AudioCommon/Src/CoreAudioSoundStream.cpp index 57e2e448ea..e4d54ffa0f 100644 --- a/Source/Core/AudioCommon/Src/CoreAudioSoundStream.cpp +++ b/Source/Core/AudioCommon/Src/CoreAudioSoundStream.cpp @@ -47,9 +47,10 @@ CoreAudioSound::~CoreAudioSound() bool CoreAudioSound::Start() { OSStatus err; - UInt32 enableIO; AURenderCallbackStruct callback_struct; AudioStreamBasicDescription format; + ComponentDescription desc; + UInt32 enableIO = 1; desc.componentType = kAudioUnitType_Output; desc.componentSubType = kAudioUnitSubType_DefaultOutput; @@ -69,7 +70,6 @@ bool CoreAudioSound::Start() return false; } - enableIO = 1; AudioUnitSetProperty(audioUnit, kAudioOutputUnitProperty_EnableIO, kAudioUnitScope_Output, 0, &enableIO, diff --git a/Source/Core/AudioCommon/Src/CoreAudioSoundStream.h b/Source/Core/AudioCommon/Src/CoreAudioSoundStream.h index 6a1b96a5a8..9c6f7b0991 100644 --- a/Source/Core/AudioCommon/Src/CoreAudioSoundStream.h +++ b/Source/Core/AudioCommon/Src/CoreAudioSoundStream.h @@ -27,9 +27,6 @@ class CoreAudioSound : public SoundStream { #ifdef __APPLE__ - ComponentDescription desc; - AudioUnit audioUnit; - public: CoreAudioSound(CMixer *mixer); virtual ~CoreAudioSound(); @@ -49,6 +46,9 @@ public: virtual void Update(); void RenderSamples(void *target, UInt32 size); + +private: + AudioUnit audioUnit; #else public: CoreAudioSound(CMixer *mixer) : SoundStream(mixer) {} |