aboutsummaryrefslogtreecommitdiffstats
path: root/Alc
diff options
context:
space:
mode:
authorChris Robinson <[email protected]>2012-09-12 07:57:50 -0700
committerChris Robinson <[email protected]>2012-09-12 07:57:50 -0700
commitff809f2271099acf4527a23d55a034e1cef5e900 (patch)
tree0964f798f7f7da352c872995bc89e4adc919f4c2 /Alc
parent41f52fdd6a499a6245e50a131bd7b175fc03dfa2 (diff)
Move a couple methods to where they're used
Diffstat (limited to 'Alc')
-rw-r--r--Alc/ALu.c45
-rw-r--r--Alc/mixer.c45
2 files changed, 45 insertions, 45 deletions
diff --git a/Alc/ALu.c b/Alc/ALu.c
index c15f75b7..cb180ee3 100644
--- a/Alc/ALu.c
+++ b/Alc/ALu.c
@@ -36,6 +36,8 @@
#include "alu.h"
#include "bs2b.h"
+#include "mixer_defs.h"
+
struct ChanMap {
enum Channel channel;
@@ -49,6 +51,49 @@ ALfloat ConeScale = 1.0f;
ALfloat ZScale = 1.0f;
+static DryMixerFunc SelectDirectMixer(void)
+{
+#ifdef HAVE_SSE
+ if((CPUCapFlags&CPU_CAP_SSE))
+ return MixDirect_SSE;
+#endif
+#ifdef HAVE_NEON
+ if((CPUCapFlags&CPU_CAP_NEON))
+ return MixDirect_Neon;
+#endif
+
+ return MixDirect_C;
+}
+
+static DryMixerFunc SelectHrtfMixer(void)
+{
+#ifdef HAVE_SSE
+ if((CPUCapFlags&CPU_CAP_SSE))
+ return MixDirect_Hrtf_SSE;
+#endif
+#ifdef HAVE_NEON
+ if((CPUCapFlags&CPU_CAP_NEON))
+ return MixDirect_Hrtf_Neon;
+#endif
+
+ return MixDirect_Hrtf_C;
+}
+
+static WetMixerFunc SelectSendMixer(void)
+{
+#ifdef HAVE_SSE
+ if((CPUCapFlags&CPU_CAP_SSE))
+ return MixSend_SSE;
+#endif
+#ifdef HAVE_NEON
+ if((CPUCapFlags&CPU_CAP_NEON))
+ return MixSend_Neon;
+#endif
+
+ return MixSend_C;
+}
+
+
static __inline ALvoid aluMatrixVector(ALfloat *vector,ALfloat w,ALfloat matrix[4][4])
{
ALfloat temp[4] = {
diff --git a/Alc/mixer.c b/Alc/mixer.c
index 41eba4ae..da3dcc20 100644
--- a/Alc/mixer.c
+++ b/Alc/mixer.c
@@ -36,51 +36,6 @@
#include "alu.h"
#include "bs2b.h"
-#include "mixer_defs.h"
-
-
-DryMixerFunc SelectDirectMixer(void)
-{
-#ifdef HAVE_SSE
- if((CPUCapFlags&CPU_CAP_SSE))
- return MixDirect_SSE;
-#endif
-#ifdef HAVE_NEON
- if((CPUCapFlags&CPU_CAP_NEON))
- return MixDirect_Neon;
-#endif
-
- return MixDirect_C;
-}
-
-DryMixerFunc SelectHrtfMixer(void)
-{
-#ifdef HAVE_SSE
- if((CPUCapFlags&CPU_CAP_SSE))
- return MixDirect_Hrtf_SSE;
-#endif
-#ifdef HAVE_NEON
- if((CPUCapFlags&CPU_CAP_NEON))
- return MixDirect_Hrtf_Neon;
-#endif
-
- return MixDirect_Hrtf_C;
-}
-
-WetMixerFunc SelectSendMixer(void)
-{
-#ifdef HAVE_SSE
- if((CPUCapFlags&CPU_CAP_SSE))
- return MixSend_SSE;
-#endif
-#ifdef HAVE_NEON
- if((CPUCapFlags&CPU_CAP_NEON))
- return MixSend_Neon;
-#endif
-
- return MixSend_C;
-}
-
static __inline ALfloat Sample_ALbyte(ALbyte val)
{ return val * (1.0f/127.0f); }