diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2013-04-02 21:15:04 +0200 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2013-04-02 21:15:04 +0200 |
| commit | 27e08f66b59eca3be8f46a40b6fc2d5015bc5086 (patch) | |
| tree | 567b8d50ec87ce9ed2fc2a80580791b576879d54 /Source/Core | |
| parent | eb06c62a6e1f2c5b84a1a11cab269a5e81936f92 (diff) | |
Fix build on OS X
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h | 11 |
1 files changed, 2 insertions, 9 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 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 <tr1/functional> -using std::tr1::function; -#else -# include <functional> -using std::function; -#endif +#include <functional> #ifdef AX_GC # define PB_TYPE AXPB @@ -287,7 +280,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(function<s16(u32)> input_callback, s16* output, u32 count, +u32 ResampleAudio(std::function<s16(u32)> input_callback, s16* output, u32 count, s16* last_samples, u32 curr_pos, u32 ratio, int srctype, const s16* coeffs) { |