diff options
| author | malc <av1474@comtv.ru> | 2009-09-18 11:37:39 +0400 |
|---|---|---|
| committer | malc <av1474@comtv.ru> | 2009-09-18 14:04:36 +0400 |
| commit | bdff253c8fb4c8a64bb4792cc161dd79ab4aaf65 (patch) | |
| tree | 8e12d54b246e2787a7b1bd3b0e50d236910a05a0 /audio/wavaudio.c | |
| parent | 3fd7f635cdd5ee13f08c6ba1b0974a17eb9c9347 (diff) | |
| download | qemu-bdff253c8fb4c8a64bb4792cc161dd79ab4aaf65.tar.gz | |
audio: internal API change
pcm_ops.run_out now takes number of live samples (which will be always
greater than zero) as a second argument, every driver was calling
audio_pcm_hw_get_live_out anyway with exception of fmod which used
audio_pcm_hw_get_live_out2 for no good reason.
Signed-off-by: malc <av1474@comtv.ru>
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 e659aa541c..c522be4531 100644 --- a/audio/wavaudio.c +++ b/audio/wavaudio.c @@ -46,10 +46,10 @@ static struct { .wav_path = "qemu.wav" }; -static int wav_run_out (HWVoiceOut *hw) +static int wav_run_out (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); @@ -64,11 +64,6 @@ static int wav_run_out (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; |