diff options
| author | balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-05-02 02:11:51 +0000 |
|---|---|---|
| committer | balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-05-02 02:11:51 +0000 |
| commit | 5a1237c45f8ae84da2cbffe07a344e29952c689b (patch) | |
| tree | 36765f6b2101c9228b9fc9b5335e4ba3794f2490 | |
| parent | 549444e1f03d56674f43dfe67a5950638bc3d200 (diff) | |
Don't define HIGH_LATENCY for ARM, this was a workaround for an ALSA problem.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2766 c046a42c-6fe2-441c-8c8c-71466251a162
| -rw-r--r-- | Makefile.target | 2 | ||||
| -rw-r--r-- | audio/alsaaudio.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.target b/Makefile.target index a576796dfe..6a5ff9002e 100644 --- a/Makefile.target +++ b/Makefile.target @@ -456,7 +456,7 @@ VL_OBJS+= arm-semi.o VL_OBJS+= pxa2xx.o pxa2xx_pic.o pxa2xx_gpio.o pxa2xx_timer.o pxa2xx_dma.o VL_OBJS+= pxa2xx_lcd.o pxa2xx_mmci.o pxa2xx_pcmcia.o max111x.o VL_OBJS+= spitz.o ads7846.o ide.o serial.o nand.o $(AUDIODRV) -CPPFLAGS += -DHAS_AUDIO -DHIGH_LATENCY +CPPFLAGS += -DHAS_AUDIO endif ifeq ($(TARGET_BASE_ARCH), sh4) VL_OBJS+= shix.o sh7750.o sh7750_regnames.o tc58128.o diff --git a/audio/alsaaudio.c b/audio/alsaaudio.c index 2e59dfa4c4..3f9ffdbbcd 100644 --- a/audio/alsaaudio.c +++ b/audio/alsaaudio.c @@ -57,6 +57,8 @@ static struct { int period_size_out_overriden; int verbose; } conf = { +#define DEFAULT_BUFFER_SIZE 1024 +#define DEFAULT_PERIOD_SIZE 256 #ifdef HIGH_LATENCY .size_in_usec_in = 1, .size_in_usec_out = 1, @@ -69,8 +71,6 @@ static struct { .buffer_size_out = 400000, .period_size_out = 400000 / 4, #else -#define DEFAULT_BUFFER_SIZE 1024 -#define DEFAULT_PERIOD_SIZE 256 .buffer_size_in = DEFAULT_BUFFER_SIZE * 4, .period_size_in = DEFAULT_PERIOD_SIZE * 4, .buffer_size_out = DEFAULT_BUFFER_SIZE, |