aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Reisner <dreisner@archlinux.org>2012-08-11 12:08:41 -0400
committerDave Reisner <dreisner@archlinux.org>2012-08-11 12:08:41 -0400
commit23f2ced7b59b01e9eaa59303f972930b3066801e (patch)
tree15164e7b07d2a0c964aecd0cf3c2131e372a9f8a
parent68f071d16fb8d24df54fff699e25d7df2889eb72 (diff)
downloadmirror-ponymix-23f2ced7b59b01e9eaa59303f972930b3066801e.tar.gz
mirror-ponymix-23f2ced7b59b01e9eaa59303f972930b3066801e.tar.bz2
mirror-ponymix-23f2ced7b59b01e9eaa59303f972930b3066801e.zip
tighten scoping on pulse server connect
-rw-r--r--pulsemix.c6
1 files 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;