diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2013-03-29 13:55:55 +0100 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2013-03-29 13:55:55 +0100 |
| commit | e9b236be051bf0b4c4e06e5d6add0d946ed86554 (patch) | |
| tree | c378d1e5ea79dd72db1df44a308c33cf094d1493 /Source/Core | |
| parent | a997824f680aaf9cc86adfd56e8bea865e5614dd (diff) | |
OSX sucks at c++11
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h index 64a01ca8fe..0b5bf4a022 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h @@ -30,7 +30,14 @@ #include "UCode_AXStructs.h" #include "../../DSP.h" -#include <functional> +// I hate OSX. +#if defined(__APPLE__) +# include <tr1/functional> +using std::tr1::function; +#else +# include <functional> +using std::function; +#endif #ifdef AX_GC # define PB_TYPE AXPB @@ -265,7 +272,7 @@ u16 AcceleratorGetSample() // We start getting samples not from sample 0, but 0.<curr_pos_frac>. This // avoids discontinuties in the audio stream, especially with very low ratios // which interpolate a lot of values between two "real" samples. -u32 ResampleAudio(std::function<s16(u32)> input_callback, s16* output, u32 count, +u32 ResampleAudio(function<s16(u32)> input_callback, s16* output, u32 count, s16* last_samples, u32 curr_pos, u32 ratio, int srctype, const s16* coeffs) { |