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

Real fix for the crashes on Windows with AXWii

This commit is contained in:
Pierre Bourdon 2012-11-20 09:49:27 +01:00
parent e858835c7e
commit affdf08fd6
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,6 +36,10 @@
# define PB_TYPE AXPBWii # define PB_TYPE AXPBWii
#endif #endif
// Put all of that in an anonymous namespace to avoid stupid compilers merging
// functions from AX GC and AX Wii.
namespace {
// Useful macro to convert xxx_hi + xxx_lo to xxx for 32 bits. // Useful macro to convert xxx_hi + xxx_lo to xxx for 32 bits.
#define HILO_TO_32(name) \ #define HILO_TO_32(name) \
((name##_hi << 16) | name##_lo) ((name##_hi << 16) | name##_lo)
@ -242,7 +246,7 @@ inline void GetInputSamples(PB_TYPE& pb, s16* samples)
if (ratio > 0x00100000) if (ratio > 0x00100000)
ratio = 0x00100000; ratio = 0x00100000;
s16 real_samples[1026]; s16 real_samples[514];
u32 real_samples_needed = (32 * ratio + curr_pos) >> 16; u32 real_samples_needed = (32 * ratio + curr_pos) >> 16;
// The first two real samples are the ones we read at the previous // The first two real samples are the ones we read at the previous
@ -384,4 +388,6 @@ void Process1ms(PB_TYPE& pb, const AXBuffers& buffers, AXMixControl mctrl)
} }
} }
} // namespace
#endif // !_UCODE_AX_VOICE_H #endif // !_UCODE_AX_VOICE_H