[pulseaudio-commits] Branch 'next' - 2 commits - README src/modules

[Tanu Kaskinen]

 README                              |    2 +-
 src/modules/alsa/module-alsa-card.c |    3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 9886097ee054baad3174a3ef5d337b51b2ecd85e
Author: Peter Meerwald <p.meerwald at bct-electronic.com>
Date:   Tue Apr 2 14:59:07 2013 +0200

    doc: Fix suggested dl-search-path in README
    
    the README suggests to set the following dl-search-path: -p $(pwd)/src/.libs/
    
    N: [lt-pulseaudio] daemon-conf.c: Detected that we are run from the build tree, fixing search path.
    E: [lt-pulseaudio] ltdl-bind-now.c: Failed to open module /redacted/pulseaudio/src/.libs/.libs/module-device-restore.so: /home/pmeerw/src/pulseaudio/src/.libs/.libs/module-device-restore.so: cannot open shared object file: No such file or directory
    
    the last part seems superfluous, so -p $(pwd)/src/
    
    Signed-off-by: Peter Meerwald <p.meerwald at bct-electronic.com>

diff --git a/README b/README
index 3a80324..66c1847 100644
--- a/README
+++ b/README
@@ -40,7 +40,7 @@ HACKING:
 	  ./autogen.sh
 	  CFLAGS="-ggdb3 -O0" LDFLAGS="-ggdb3" ./configure
 	  make
-	  ./src/pulseaudio -n -F src/default.pa -p $(pwd)/src/.libs/
+	  ./src/pulseaudio -n -F src/default.pa -p $(pwd)/src/
 
 SPELLING:
         PulseAudio

commit ca55a267a490793433d124b5e421a60be59c47ea
Author: Maarten Lankhorst <maarten.lankhorst at canonical.com>
Date:   Tue Apr 2 11:27:38 2013 +0200

    alsa-card: skip eld initialization if hctl_handle is NULL.
    
    Due to a misconfiguration on my side my hdmi card didn't load with
    snd-hda-codec-hdmi but through the fallback mechanism. Pulseaudio
    would crash during early because hctl_handle was null, so skip
    init_eld_ctls when hctl_handle is null to prevent a crash.
    
    Thanks to David Henningsson for helping me find the underlying issue.
    
    Signed-off-by: Maarten Lankhorst <maarten.lankhorst at canonical.com>

diff --git a/src/modules/alsa/module-alsa-card.c b/src/modules/alsa/module-alsa-card.c
index 3b96cea..2529c0d 100644
--- a/src/modules/alsa/module-alsa-card.c
+++ b/src/modules/alsa/module-alsa-card.c
@@ -437,6 +437,9 @@ static void init_eld_ctls(struct userdata *u) {
     void *state;
     pa_device_port *port;
 
+    if (!u->hctl_handle)
+        return;
+
     PA_HASHMAP_FOREACH(port, u->card->ports, state) {
         pa_alsa_port_data *data = PA_DEVICE_PORT_DATA(port);
         snd_hctl_elem_t* hctl_elem;