diff options
author | David 'Digit' Turner <digit@android.com> | 2011-01-02 12:58:51 +0100 |
---|---|---|
committer | David 'Digit' Turner <digit@android.com> | 2011-01-02 13:05:31 +0100 |
commit | 5d0e37bc290d1743cb5acf76eb6608f1303f27dd (patch) | |
tree | 142486cd40940a38aa4fe5947521b39dc2cec339 /audio/wavaudio.c | |
parent | e3650680f44fed0262d33eb4f486e5c1e58ddc32 (diff) | |
download | external_qemu-5d0e37bc290d1743cb5acf76eb6608f1303f27dd.zip external_qemu-5d0e37bc290d1743cb5acf76eb6608f1303f27dd.tar.gz external_qemu-5d0e37bc290d1743cb5acf76eb6608f1303f27dd.tar.bz2 |
upstream: audio sub-system improvements.
This patch updates the audio subsystem to match the one
in upstream. Note that this gets rid of the ability to
specify different audio backends for input and output,
which was never really used.
A future patch will remove the -audio-in and -audio-out
options and related code.
Change-Id: I37c21672bcb15ef1f0e928c56bf99fbecda2bce6
Diffstat (limited to 'audio/wavaudio.c')
-rw-r--r-- | audio/wavaudio.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/audio/wavaudio.c b/audio/wavaudio.c index a82997e..62ba42d 100644 --- a/audio/wavaudio.c +++ b/audio/wavaudio.c @@ -55,10 +55,10 @@ static struct { "qemu.wav" }; -static int wav_out_run (HWVoiceOut *hw) +static int wav_out_run (HWVoiceOut *hw, int live) { WAVVoiceOut *wav = (WAVVoiceOut *) hw; - int rpos, live, decr, samples; + int rpos, decr, samples; uint8_t *dst; struct st_sample *src; int64_t now = qemu_get_clock (vm_clock); @@ -73,11 +73,6 @@ static int wav_out_run (HWVoiceOut *hw) samples = bytes >> hw->info.shift; } - live = audio_pcm_hw_get_live_out (hw); - if (!live) { - return 0; - } - wav->old_ticks = now; decr = audio_MIN (live, samples); samples = decr; |