From 1abbfd4b151e51eb9f90f6a495e217eab8eed108 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Tue, 18 Dec 2012 07:00:04 +0100 Subject: [PATCH] Remove some useless 'inline' attributes from the AX HLE voice mixing functions --- Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 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 16df07e8a4..16a9870b9e 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 @@ -90,7 +90,7 @@ bool ReadPB(u32 addr, PB_TYPE& pb) } // 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; u16* dst = (u16*)Memory::GetPointer(addr); @@ -109,7 +109,7 @@ static u32* acc_cur_addr; static PB_TYPE* acc_pb; // 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_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 // disabling streams that reached the end (this is done by an exception raised // by the accelerator on real hardware). -inline u16 AcceleratorGetSample() +u16 AcceleratorGetSample() { u16 ret; @@ -215,7 +215,7 @@ inline u16 AcceleratorGetSample() } // 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); 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. -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_delta = pvol[1];