From c91ffdcf2b53871e88bfdd15f6572b102bcb532e Mon Sep 17 00:00:00 2001
From: waker <wakeroid@gmail.com>
Date: Fri, 1 Apr 2011 19:47:00 +0200
Subject: pulseaudio compile fix

---
 plugins/pulse/pulse.c | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'plugins/pulse')

diff --git a/plugins/pulse/pulse.c b/plugins/pulse/pulse.c
index 3a6eacbd..9a08ff08 100644
--- a/plugins/pulse/pulse.c
+++ b/plugins/pulse/pulse.c
@@ -126,13 +126,6 @@ static int pulse_set_spec(ddb_waveformat_t *fmt)
         pa_simple_free(s);
     }
 
-    // Read serveraddr from config
-    const char * server = deadbeef->conf_get_str(CONFSTR_PULSE_SERVERADDR, NULL);
-
-    if (server) {
-        server = strcmp(server, "default") ? server : NULL;
-    }
-
     pa_buffer_attr * attr = NULL;
     //attr->maxlength = Maximum length of the buffer.
     //attr->tlength = Playback only: target length of the buffer.
@@ -147,7 +140,17 @@ static int pulse_set_spec(ddb_waveformat_t *fmt)
 
     int error;
 
+    // Read serveraddr from config
+    deadbeef->conf_lock ();
+    const char * server = deadbeef->conf_get_str_fast (CONFSTR_PULSE_SERVERADDR, NULL);
+
+    if (server) {
+        server = strcmp(server, "default") ? server : NULL;
+    }
+
     s = pa_simple_new(server, "Deadbeef", PA_STREAM_PLAYBACK, dev, "Music", &ss, &channel_map, attr, &error);
+    deadbeef->conf_unlock ();
+
     if (!s)
     {
         trace ("pulse_init failed (%d)\n", error);
-- 
cgit v1.2.3