From e9b236be051bf0b4c4e06e5d6add0d946ed86554 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Fri, 29 Mar 2013 13:55:55 +0100 Subject: [PATCH] OSX sucks at c++11 --- .../Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h | 11 +++++++++-- 1 file 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 +// I hate OSX. +#if defined(__APPLE__) +# include +using std::tr1::function; +#else +# include +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.. 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 input_callback, s16* output, u32 count, +u32 ResampleAudio(function input_callback, s16* output, u32 count, s16* last_samples, u32 curr_pos, u32 ratio, int srctype, const s16* coeffs) {