Patchwork audio: Fix support for multiple soft output voices.

login
register
mail settings
Submitter digit@google.com
Date Jan. 11, 2011, 2:47 p.m.
Message ID <1294757266-1415-1-git-send-email-digit@google.com>
Download mbox | patch
Permalink /patch/78392/
State New
Headers show

Comments

digit@google.com - Jan. 11, 2011, 2:47 p.m.
From: David 'Digit' Turner <digit@google.com>

This patch fixes a minor bug that prevent audio emulation from working
properly when several soft output voices are opened. The symptom was that
as long as one active soft voice was empty, it prevented any output from
any other voice.

More precisely, audio_pcm_hw_find_min_out always returns 0 with a value
of nb_livep > 0, which later forced the playback of exactly 0 hardware
samples to the audio backend (which of course didn't do anything).

By ignoring empty voices, we can let the active samples of other voices
pass through normally.
---
 audio/audio.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

Patch

diff --git a/audio/audio.c b/audio/audio.c
index ad51077..c7888c0 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -968,7 +968,7 @@  static int audio_pcm_hw_find_min_out (HWVoiceOut *hw, int *nb_livep)
     int nb_live = 0;
 
     for (sw = hw->sw_head.lh_first; sw; sw = sw->entries.le_next) {
-        if (sw->active || !sw->empty) {
+        if (sw->active && !sw->empty) {
             m = audio_MIN (m, sw->total_hw_samples_mixed);
             nb_live += 1;
         }
@@ -1411,7 +1411,7 @@  static void audio_run_out (AudioState *s)
 
         cleanup_required = 0;
         for (sw = hw->sw_head.lh_first; sw; sw = sw->entries.le_next) {
-            if (!sw->active && sw->empty) {
+            if (!sw->active || sw->empty) {
                 continue;
             }
 
@@ -1514,7 +1514,7 @@  static void audio_run_capture (AudioState *s)
         hw->rpos = rpos;
 
         for (sw = hw->sw_head.lh_first; sw; sw = sw->entries.le_next) {
-            if (!sw->active && sw->empty) {
+            if (!sw->active || sw->empty) {
                 continue;
             }