aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Reisner <dreisner@archlinux.org>2012-08-14 18:12:05 -0400
committerDave Reisner <dreisner@archlinux.org>2012-08-14 18:12:05 -0400
commitd07eac047131c6fd37a26e003da85f5bb0432526 (patch)
treee4247f26e32467f6178623bc3509f86443cef727
parent9424f1b4507accd1d323053691181b0307d1aca8 (diff)
downloadmirror-ponymix-d07eac047131c6fd37a26e003da85f5bb0432526.tar.gz
mirror-ponymix-d07eac047131c6fd37a26e003da85f5bb0432526.tar.bz2
mirror-ponymix-d07eac047131c6fd37a26e003da85f5bb0432526.zip
s/state_cb/connect_&/
-rw-r--r--ponymix.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ponymix.c b/ponymix.c
index 36f83d7..6177875 100644
--- a/ponymix.c
+++ b/ponymix.c
@@ -285,7 +285,7 @@ static void source_info_cb(pa_context UNUSED *c, const pa_server_info *i, void *
*source_name = i->default_source_name;
}
-static void state_cb(pa_context *cxt, void *raw)
+static void connect_state_cb(pa_context *cxt, void *raw)
{
enum pa_context_state *state = raw;
*state = pa_context_get_state(cxt);
@@ -577,7 +577,7 @@ static int pulse_init(struct pulseaudio_t *pulse)
pulse->cxt = pa_context_new(pa_mainloop_get_api(pulse->mainloop), "bestpony");
pulse->head = NULL;
- pa_context_set_state_callback(pulse->cxt, state_cb, &state);
+ pa_context_set_state_callback(pulse->cxt, connect_state_cb, &state);
pa_context_connect(pulse->cxt, NULL, PA_CONTEXT_NOFLAGS, NULL);
while (state != PA_CONTEXT_READY && state != PA_CONTEXT_FAILED)
pa_mainloop_iterate(pulse->mainloop, 1, NULL);