Commit 8ff9cbf7 authored by malc's avatar malc
Browse files

Make mixer emulation a configure option (Jan Kiszka) 

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4783 c046a42c-6fe2-441c-8c8c-71466251a162
parent e7fb1406

audio/mixeng.c

+0 −2
Original line number Diff line number Diff line
@@ -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)

audio/mixeng_template.h

+5 −5
Original line number Diff line number Diff line
@@ -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;

configure

+9 −0
Original line number Diff line number Diff line
@@ -114,6 +114,7 @@ build_docs="no" 
uname_release=""

curses="yes"

nptl="yes"

mixemu="no"



# OS specific

targetos=`uname -s`
@@ -337,6 +338,8 @@ for opt do 
  ;;

  --disable-nptl) nptl="no"

  ;;

  --enable-mixemu) mixemu="yes"

  ;;

  *) echo "ERROR: unknown option $opt"; show_help="yes"

  ;;

  esac
@@ -428,6 +431,7 @@ echo " --enable-alsa enable ALSA audio driver" 
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 "CoreAudio support $coreaudio" 
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 @@ if test "$dsound" = "yes" ; then 
  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