From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KAqr8-00015g-H3 for qemu-devel@nongnu.org; Mon, 23 Jun 2008 14:33:34 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KAqr7-00015J-M2 for qemu-devel@nongnu.org; Mon, 23 Jun 2008 14:33:34 -0400 Received: from [199.232.76.173] (port=39837 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KAqr7-00015E-HZ for qemu-devel@nongnu.org; Mon, 23 Jun 2008 14:33:33 -0400 Received: from savannah.gnu.org ([199.232.41.3]:50151 helo=sv.gnu.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1KAqr7-0002rl-3y for qemu-devel@nongnu.org; Mon, 23 Jun 2008 14:33:33 -0400 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.63) (envelope-from ) id 1KAqr5-0004ut-Li for qemu-devel@nongnu.org; Mon, 23 Jun 2008 18:33:31 +0000 Received: from malc by cvs.savannah.gnu.org with local (Exim 4.63) (envelope-from ) id 1KAqr5-0004un-Cn for qemu-devel@nongnu.org; Mon, 23 Jun 2008 18:33:31 +0000 MIME-Version: 1.0 Errors-To: malc Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: malc Message-Id: Date: Mon, 23 Jun 2008 18:33:31 +0000 Subject: [Qemu-devel] [4783] Make mixer emulation a configure option (Jan Kiszka) Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Revision: 4783 http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=4783 Author: malc Date: 2008-06-23 18:33:30 +0000 (Mon, 23 Jun 2008) Log Message: ----------- Make mixer emulation a configure option (Jan Kiszka) Modified Paths: -------------- trunk/audio/mixeng.c trunk/audio/mixeng_template.h trunk/configure Modified: trunk/audio/mixeng.c =================================================================== --- trunk/audio/mixeng.c 2008-06-23 17:52:43 UTC (rev 4782) +++ trunk/audio/mixeng.c 2008-06-23 18:33:30 UTC (rev 4783) @@ -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) Modified: trunk/audio/mixeng_template.h =================================================================== --- trunk/audio/mixeng_template.h 2008-06-23 17:52:43 UTC (rev 4782) +++ trunk/audio/mixeng_template.h 2008-06-23 18:33:30 UTC (rev 4783) @@ -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 @@ { 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 @@ { st_sample_t *out = dst; IN_T *in = (IN_T *) src; -#ifndef NOVOL +#ifdef CONFIG_MIXEMU if (vol->mute) { mixeng_clear (dst, samples); return; Modified: trunk/configure =================================================================== --- trunk/configure 2008-06-23 17:52:43 UTC (rev 4782) +++ trunk/configure 2008-06-23 18:33:30 UTC (rev 4783) @@ -114,6 +114,7 @@ uname_release="" curses="yes" nptl="yes" +mixemu="no" # OS specific targetos=`uname -s` @@ -337,6 +338,8 @@ ;; --disable-nptl) nptl="no" ;; + --enable-mixemu) mixemu="yes" + ;; *) echo "ERROR: unknown option $opt"; show_help="yes" ;; esac @@ -428,6 +431,7 @@ echo " --enable-esd enable EsoundD audio driver" echo " --enable-fmod enable FMOD audio driver" echo " --enable-dsound enable DirectSound audio driver" +echo " --enable-mixemu enable mixer emulation" echo " --disable-brlapi disable BrlAPI" echo " --disable-vnc-tls disable TLS encryption for VNC server" echo " --disable-curses disable curses output" @@ -839,6 +843,7 @@ echo "ALSA support $alsa" echo "EsounD support $esd" echo "DSound support $dsound" +echo "Mixer emulation $mixemu" if test "$fmod" = "yes"; then if test -z $fmod_lib || test -z $fmod_inc; then echo @@ -1067,6 +1072,10 @@ echo "CONFIG_DSOUND=yes" >> $config_mak echo "#define CONFIG_DSOUND 1" >> $config_h fi +if test "$mixemu" = "yes" ; then + echo "CONFIG_MIXEMU=yes" >> $config_mak + echo "#define CONFIG_MIXEMU 1" >> $config_h +fi if test "$fmod" = "yes" ; then echo "CONFIG_FMOD=yes" >> $config_mak echo "CONFIG_FMOD_LIB=$fmod_lib" >> $config_mak