diff options
| author | S. Davilla <davilla@4pi.com> | 2012-05-09 21:15:08 -0400 |
|---|---|---|
| committer | S. Davilla <davilla@4pi.com> | 2012-05-09 21:15:08 -0400 |
| commit | d1686eb811e388986b782ab0f96784ea63cecf1c (patch) | |
| tree | 4695ca50cd469e44aa2293fb4514dca20e26abb9 | |
| parent | a4bbc751330a8ec4445e05dd30b787257a40b6e7 (diff) | |
[osx] clean up and remove 10.4'isum
| -rw-r--r-- | xbmc/cores/AudioEngine/Engines/CoreAudioAEHALOSX.h | 28 |
1 files changed, 7 insertions, 21 deletions
diff --git a/xbmc/cores/AudioEngine/Engines/CoreAudioAEHALOSX.h b/xbmc/cores/AudioEngine/Engines/CoreAudioAEHALOSX.h index 5a0764dbc9..e392c8de27 100644 --- a/xbmc/cores/AudioEngine/Engines/CoreAudioAEHALOSX.h +++ b/xbmc/cores/AudioEngine/Engines/CoreAudioAEHALOSX.h @@ -20,19 +20,20 @@ * */ -#ifndef __arm__ +#if defined(TARGET_DARWIN_OSX) + +#include <list> +#include <vector> #include "ICoreAudioAEHAL.h" #include "ICoreAudioSource.h" +#include "CoreAudioAEHAL.h" +#include "utils/StdString.h" -#include <CoreAudio/CoreAudio.h> #include <AudioUnit/AudioUnit.h> #include <AudioToolbox/AudioToolbox.h> #include <AudioToolbox/AUGraph.h> -#include <list> -#include <vector> -#include "utils/StdString.h" -#include "CoreAudioAEHAL.h" +#include <CoreAudio/CoreAudio.h> #define kOutputBus 0 #define kInputBus 1 @@ -52,21 +53,6 @@ class CAUGenericSource; typedef std::list<AudioDeviceID> CoreAudioDeviceList; -#if MAC_OS_X_VERSION_MAX_ALLOWED <= 1040 -/* AudioDeviceIOProcID does not exist in Mac OS X 10.4. We can emulate - * this by using AudioDeviceAddIOProc() and AudioDeviceRemoveIOProc(). */ -#define AudioDeviceIOProcID AudioDeviceIOProc -#define AudioDeviceDestroyIOProcID AudioDeviceRemoveIOProc -static OSStatus AudioDeviceCreateIOProcID(AudioDeviceID dev, - AudioDeviceIOProc proc, - void *data, - AudioDeviceIOProcID *procid) -{ - *procid = proc; - return AudioDeviceAddIOProc(dev, proc, data); -} -#endif - // There is only one AudioSystemObject instance system-side. // Therefore, all CCoreAudioHardware methods are static class CCoreAudioHardware |