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 e364e42888..3040f04f40 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,14 +30,7 @@ #include "UCode_AXStructs.h" #include "../../DSP.h" -// I hate OSX. -#if defined(__APPLE__) -# include -using std::tr1::function; -#else -# include -using std::function; -#endif +#include #ifdef AX_GC # define PB_TYPE AXPB @@ -287,7 +280,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(function input_callback, s16* output, u32 count, +u32 ResampleAudio(std::function input_callback, s16* output, u32 count, s16* last_samples, u32 curr_pos, u32 ratio, int srctype, const s16* coeffs) {