From: Michael Walle <michael@walle.cc>
Date: Tue, 4 Jan 2011 00:48:55 +0000 (+0100)
Subject: noaudio: correctly account acquired samples
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=8a7d0890acd03f45f1d86e12449938891ae18ed9;p=qemu-xen-4.1-testing.git

noaudio: correctly account acquired samples

This will fix the return value of the function which otherwise returns too
many samples because sw->total_hw_samples_acquired isn't correctly
accounted.

Signed-off-by: Michael Walle <michael@walle.cc>
Signed-off-by: malc <av1474@comtv.ru>
---

diff --git a/audio/noaudio.c b/audio/noaudio.c
index 80158583b..0304094a6 100644
--- a/audio/noaudio.c
+++ b/audio/noaudio.c
@@ -117,9 +117,12 @@ static int no_run_in (HWVoiceIn *hw)
 
 static int no_read (SWVoiceIn *sw, void *buf, int size)
 {
+    /* use custom code here instead of audio_pcm_sw_read() to avoid
+     * useless resampling/mixing */
     int samples = size >> sw->info.shift;
     int total = sw->hw->total_samples_captured - sw->total_hw_samples_acquired;
     int to_clear = audio_MIN (samples, total);
+    sw->total_hw_samples_acquired += total;
     audio_pcm_info_clear_buf (&sw->info, buf, to_clear);
     return to_clear << sw->info.shift;
 }