audio: align audio_generic_read with audio_pcm_hw_run_in
The function audio_generic_read should work exactly like audio_pcm_hw_run_in. It's a very similar function working on a different buffer. Signed-off-by: Volker Rümelin <vr_qemu@t-online.de> Message-id: 20200920171729.15861-4-vr_qemu@t-online.de Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
parent
aec6d0dc4e
commit
b9896dc5be
|
@ -1495,12 +1495,23 @@ size_t audio_generic_write(HWVoiceOut *hw, void *buf, size_t size)
|
||||||
|
|
||||||
size_t audio_generic_read(HWVoiceIn *hw, void *buf, size_t size)
|
size_t audio_generic_read(HWVoiceIn *hw, void *buf, size_t size)
|
||||||
{
|
{
|
||||||
void *src = hw->pcm_ops->get_buffer_in(hw, &size);
|
size_t total = 0;
|
||||||
|
|
||||||
memcpy(buf, src, size);
|
while (total < size) {
|
||||||
hw->pcm_ops->put_buffer_in(hw, src, size);
|
size_t src_size = size - total;
|
||||||
|
void *src = hw->pcm_ops->get_buffer_in(hw, &src_size);
|
||||||
|
|
||||||
return size;
|
if (src_size == 0) {
|
||||||
|
hw->pcm_ops->put_buffer_in(hw, src, src_size);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
memcpy((char *)buf + total, src, src_size);
|
||||||
|
hw->pcm_ops->put_buffer_in(hw, src, src_size);
|
||||||
|
total += src_size;
|
||||||
|
}
|
||||||
|
|
||||||
|
return total;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int audio_driver_init(AudioState *s, struct audio_driver *drv,
|
static int audio_driver_init(AudioState *s, struct audio_driver *drv,
|
||||||
|
|
Loading…
Reference in a new issue