mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-23 14:19:46 -06:00
Now that Core Audio works, reduce the number of build permutations a bit
by not linking in other Unix audio modules. Use kAudioUnitSubType_DefaultOutput instead of kAudioUnitSubType_HALOutput so that a runtime switch to another audio device is automatically handled. Use ERROR_LOG for audio errors. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5562 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
@ -18,23 +18,15 @@
|
||||
#ifndef _COREAUDIO_SOUND_STREAM_H
|
||||
#define _COREAUDIO_SOUND_STREAM_H
|
||||
|
||||
#include "Common.h"
|
||||
#include "SoundStream.h"
|
||||
#if defined(__APPLE__)
|
||||
#include <CoreAudio/AudioHardware.h>
|
||||
#include <AudioUnit/AudioUnit.h>
|
||||
#include <CoreServices/CoreServices.h>
|
||||
#endif
|
||||
|
||||
#include "Thread.h"
|
||||
#include "Common.h"
|
||||
#include "SoundStream.h"
|
||||
|
||||
class CoreAudioSound : public SoundStream
|
||||
{
|
||||
#if defined(__APPLE__)
|
||||
Common::Thread *thread;
|
||||
Common::Event soundSyncEvent;
|
||||
Common::CriticalSection soundCriticalSection;
|
||||
|
||||
ComponentDescription desc;
|
||||
AudioUnit audioUnit;
|
||||
|
||||
@ -56,10 +48,6 @@ public:
|
||||
virtual void Update();
|
||||
|
||||
void RenderSamples(void *target, UInt32 size);
|
||||
#else
|
||||
public:
|
||||
CoreAudioSound(CMixer *mixer) : SoundStream(mixer) {}
|
||||
#endif
|
||||
};
|
||||
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user