summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authorMichael Walle <michael@walle.cc>2011-01-04 01:48:55 +0100
committermalc <av1474@comtv.ru>2011-01-04 03:53:47 +0300
commit8a7d0890acd03f45f1d86e12449938891ae18ed9 (patch)
tree71143c162068e6e08306497fa42f46b4cc0fc6a4 /audio
parent011da610ba6416df54feed46bcde1955211a2149 (diff)
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>
Diffstat (limited to 'audio')
-rw-r--r--audio/noaudio.c3
1 files changed, 3 insertions, 0 deletions
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;
}