[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v1.0-dev-134-gf4a2a8e

[Colin Guthrie]

This is an automated email from the git hooks/post-receive script. It was
generated because of a push to the "PulseAudio Sound Server" repository.

The master branch has been updated
      from  82a84eb1bd03936218de93ca3e59cb37cdaf9328 (commit)

- Log -----------------------------------------------------------------
f4a2a8e alsa-mixer: Fix a git-am cockup in b0f72311
-----------------------------------------------------------------------

Summary of changes:
 src/modules/alsa/alsa-mixer.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

-----------------------------------------------------------------------

commit f4a2a8ebfe78e07593a34ab06968c67ba5d18d46
Author: Colin Guthrie <cguthrie at mandriva.org>
Date:   Fri Mar 4 09:43:41 2011 +0000

    alsa-mixer: Fix a git-am cockup in b0f72311
    
    It seems git managed to mess up a git-am with a patch from
    David which moved where this function was called element_probe
    to within itself (recursive which could normally lead to an
    infinite loop, but as it was now never called from anywhere else,
    this didn't happen).
    
    Thank you to Maarten for spotting and following up the issue.

diff --git a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c
index e111388..fa07674 100644
--- a/src/modules/alsa/alsa-mixer.c
+++ b/src/modules/alsa/alsa-mixer.c
@@ -1154,9 +1154,6 @@ static int check_required(pa_alsa_element *e, snd_mixer_elem_t *me) {
         }
     }
 
-    if (check_required(e, me) < 0)
-        return -1;
-
     return 0;
 }
 
@@ -1360,6 +1357,9 @@ static int element_probe(pa_alsa_element *e, snd_mixer_t *m) {
         }
     }
 
+    if (check_required(e, me) < 0)
+        return -1;
+
     return 0;
 }
 

-- 
hooks/post-receive
PulseAudio Sound Server