aboutsummaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authormalc <malc@c046a42c-6fe2-441c-8c8c-71466251a162>2008-06-23 18:33:30 +0000
committermalc <malc@c046a42c-6fe2-441c-8c8c-71466251a162>2008-06-23 18:33:30 +0000
commit8ff9cbf776ccb6306a8a0699bc4c8f5a8af7f922 (patch)
tree6178d9eeb335a3dfa1c2bf741982a2df787c3ae2 /audio
parente7fb1406b06165daf7c06c6b08d2a10be51f7d1d (diff)
Make mixer emulation a configure option (Jan Kiszka)
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4783 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'audio')
-rw-r--r--audio/mixeng.c2
-rw-r--r--audio/mixeng_template.h10
2 files changed, 5 insertions, 7 deletions
diff --git a/audio/mixeng.c b/audio/mixeng.c
index b668c524e7..5e0426cb6d 100644
--- a/audio/mixeng.c
+++ b/audio/mixeng.c
@@ -28,8 +28,6 @@
#define AUDIO_CAP "mixeng"
#include "audio_int.h"
-#define NOVOL
-
/* 8 bit */
#define ENDIAN_CONVERSION natural
#define ENDIAN_CONVERT(v) (v)
diff --git a/audio/mixeng_template.h b/audio/mixeng_template.h
index d726441e2e..21eef58bf6 100644
--- a/audio/mixeng_template.h
+++ b/audio/mixeng_template.h
@@ -31,14 +31,14 @@
#define HALF (IN_MAX >> 1)
#endif
-#ifdef NOVOL
-#define VOL(a, b) a
-#else
+#ifdef CONFIG_MIXEMU
#ifdef FLOAT_MIXENG
#define VOL(a, b) ((a) * (b))
#else
#define VOL(a, b) ((a) * (b)) >> 32
#endif
+#else
+#define VOL(a, b) a
#endif
#define ET glue (ENDIAN_CONVERSION, glue (_, IN_T))
@@ -113,7 +113,7 @@ static void glue (glue (conv_, ET), _to_stereo)
{
st_sample_t *out = dst;
IN_T *in = (IN_T *) src;
-#ifndef NOVOL
+#ifdef CONFIG_MIXEMU
if (vol->mute) {
mixeng_clear (dst, samples);
return;
@@ -133,7 +133,7 @@ static void glue (glue (conv_, ET), _to_mono)
{
st_sample_t *out = dst;
IN_T *in = (IN_T *) src;
-#ifndef NOVOL
+#ifdef CONFIG_MIXEMU
if (vol->mute) {
mixeng_clear (dst, samples);
return;