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

Remove some useless 'inline' attributes from the AX HLE voice mixing functions

This commit is contained in:
Pierre Bourdon 2012-12-18 07:00:04 +01:00
parent 70b3980f46
commit 1abbfd4b15
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -90,7 +90,7 @@ bool ReadPB(u32 addr, PB_TYPE& pb)
} }
// Write a PB back to MRAM/ARAM // Write a PB back to MRAM/ARAM
inline bool WritePB(u32 addr, const PB_TYPE& pb) bool WritePB(u32 addr, const PB_TYPE& pb)
{ {
const u16* src = (const u16*)&pb; const u16* src = (const u16*)&pb;
u16* dst = (u16*)Memory::GetPointer(addr); u16* dst = (u16*)Memory::GetPointer(addr);
@ -109,7 +109,7 @@ static u32* acc_cur_addr;
static PB_TYPE* acc_pb; static PB_TYPE* acc_pb;
// Sets up the simulated accelerator. // Sets up the simulated accelerator.
inline void AcceleratorSetup(PB_TYPE* pb, u32* cur_addr) void AcceleratorSetup(PB_TYPE* pb, u32* cur_addr)
{ {
acc_pb = pb; acc_pb = pb;
acc_loop_addr = HILO_TO_32(pb->audio_addr.loop_addr); acc_loop_addr = HILO_TO_32(pb->audio_addr.loop_addr);
@ -120,7 +120,7 @@ inline void AcceleratorSetup(PB_TYPE* pb, u32* cur_addr)
// Reads a sample from the simulated accelerator. Also handles looping and // Reads a sample from the simulated accelerator. Also handles looping and
// disabling streams that reached the end (this is done by an exception raised // disabling streams that reached the end (this is done by an exception raised
// by the accelerator on real hardware). // by the accelerator on real hardware).
inline u16 AcceleratorGetSample() u16 AcceleratorGetSample()
{ {
u16 ret; u16 ret;
@ -215,7 +215,7 @@ inline u16 AcceleratorGetSample()
} }
// Read 32 input samples from ARAM, decoding and converting rate if required. // Read 32 input samples from ARAM, decoding and converting rate if required.
inline void GetInputSamples(PB_TYPE& pb, s16* samples) void GetInputSamples(PB_TYPE& pb, s16* samples)
{ {
u32 cur_addr = HILO_TO_32(pb.audio_addr.cur_addr); u32 cur_addr = HILO_TO_32(pb.audio_addr.cur_addr);
AcceleratorSetup(&pb, &cur_addr); AcceleratorSetup(&pb, &cur_addr);
@ -304,7 +304,7 @@ inline void GetInputSamples(PB_TYPE& pb, s16* samples)
} }
// Add samples to an output buffer, with optional volume ramping. // Add samples to an output buffer, with optional volume ramping.
inline void MixAdd(int* out, const s16* input, u16* pvol, bool ramp) void MixAdd(int* out, const s16* input, u16* pvol, bool ramp)
{ {
u16& volume = pvol[0]; u16& volume = pvol[0];
u16 volume_delta = pvol[1]; u16 volume_delta = pvol[1];