From 5ce16f6ec724abb6f211089fd5ce5f3491a9a5eb Mon Sep 17 00:00:00 2001 From: ben Date: Fri, 23 Jul 2010 01:19:40 +0200 Subject: add status function, and display connection state --- src/pa-sink-ctl.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) (limited to 'src/pa-sink-ctl.c') diff --git a/src/pa-sink-ctl.c b/src/pa-sink-ctl.c index d541156..0aed6cd 100644 --- a/src/pa-sink-ctl.c +++ b/src/pa-sink-ctl.c @@ -47,7 +47,10 @@ int main(int argc, char** argv) g_main_loop_run(g_loop); - printf("main loop quit\n"); + sink_list_free(sink_list); + interface_clear(); + + //printf("main loop quit\n"); pa_glib_mainloop_free(m); g_main_loop_unref(g_loop); @@ -76,8 +79,13 @@ void context_state_callback(pa_context *c, gpointer userdata) { switch (pa_context_get_state(c)) { case PA_CONTEXT_CONNECTING: + status("connecting..."); + break; case PA_CONTEXT_AUTHORIZING: + status("authorizing..."); + break; case PA_CONTEXT_SETTING_NAME: + status("setting name..."); break; case PA_CONTEXT_READY: @@ -88,14 +96,19 @@ void context_state_callback(pa_context *c, gpointer userdata) g_assert((o = pa_context_subscribe(c, (pa_subscription_mask_t) ( PA_SUBSCRIPTION_MASK_SINK | PA_SUBSCRIPTION_MASK_SINK_INPUT ), NULL, NULL))); + status("ready to process events."); + break; + case PA_CONTEXT_FAILED: + status("cannot connect!"); break; case PA_CONTEXT_TERMINATED: - printf("pulse connection terminated\n"); + status("connection terminated."); + //printf("pulse connection terminated\n"); g_main_loop_quit((GMainLoop *)userdata); break; default: - printf("unknown state\n"); + status("unknown state"); break; } } @@ -170,8 +183,6 @@ void get_sink_input_info_callback(pa_context *c, const pa_sink_input_info *i, gi void quit(void) { - sink_list_free(sink_list); - interface_clear(); pa_context_disconnect(context); } -- cgit