ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix build on OS X

This commit is contained in:
Pierre Bourdon 2013-04-02 21:15:04 +02:00
parent eb06c62a6e
commit 27e08f66b5
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h
View File

@ -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)
{