From 23f2ced7b59b01e9eaa59303f972930b3066801e Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Sat, 11 Aug 2012 12:08:41 -0400 Subject: tighten scoping on pulse server connect --- pulsemix.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pulsemix.c b/pulsemix.c index 46f54e9..13481d5 100644 --- a/pulsemix.c +++ b/pulsemix.c @@ -421,14 +421,12 @@ static void pulse_deinit(struct pulseaudio_t *pulse) static int pulse_connect(struct pulseaudio_t *pulse) { - int r; - pa_context_connect(pulse->cxt, NULL, PA_CONTEXT_NOFLAGS, NULL); while (pulse->state == STATE_CONNECTING) - pa_mainloop_iterate(pulse->mainloop, 1, &r); + pa_mainloop_iterate(pulse->mainloop, 1, NULL); if (pulse->state == STATE_ERROR) { - r = pa_context_errno(pulse->cxt); + int r = pa_context_errno(pulse->cxt); fprintf(stderr, "failed to connect to pulse daemon: %s\n", pa_strerror(r)); return 1; -- cgit v1.2.3