From b207fb98c8f3d5b335780141f667404b3d632810 Mon Sep 17 00:00:00 2001 From: Benjamin Franzke Date: Wed, 19 Oct 2011 21:46:22 +0200 Subject: interface: Rename status to interface_set_status --- src/interface.c | 4 ++-- src/interface.h | 2 +- src/pa-sink-ctl.c | 14 +++++++------- 3 files changed, 10 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/interface.c b/src/interface.c index 3e87046..ffaf4a8 100644 --- a/src/interface.c +++ b/src/interface.c @@ -51,7 +51,7 @@ interface_resize(gpointer data) mvwin(msg_win, height - H_MSG_BOX, 0); /* NULL := display old status */ - status(NULL); + interface_set_status(NULL); print_sink_list(); return TRUE; } @@ -332,7 +332,7 @@ interface_clear(void) } void -status(const gchar *msg) +interface_set_status(const gchar *msg) { static gchar *save = NULL; if (msg != NULL) { diff --git a/src/interface.h b/src/interface.h index 918ccfe..e251b8f 100644 --- a/src/interface.h +++ b/src/interface.h @@ -7,6 +7,6 @@ void print_sink_list(void); void interface_init(void); void interface_clear(void); -void status(const gchar *); +void interface_set_status(const gchar *); #endif diff --git a/src/pa-sink-ctl.c b/src/pa-sink-ctl.c index 7a3f21c..e9f9c23 100644 --- a/src/pa-sink-ctl.c +++ b/src/pa-sink-ctl.c @@ -76,13 +76,13 @@ context_state_callback(pa_context *c, gpointer userdata) context_ready = FALSE; switch (pa_context_get_state(c)) { case PA_CONTEXT_CONNECTING: - status("connecting..."); + interface_set_status("connecting..."); break; case PA_CONTEXT_AUTHORIZING: - status("authorizing..."); + interface_set_status("authorizing..."); break; case PA_CONTEXT_SETTING_NAME: - status("setting name..."); + interface_set_status("setting name..."); break; case PA_CONTEXT_READY: @@ -92,10 +92,10 @@ context_state_callback(pa_context *c, gpointer userdata) PA_SUBSCRIPTION_MASK_SINK | PA_SUBSCRIPTION_MASK_SINK_INPUT ), NULL, NULL))); context_ready = TRUE; - status("ready to process events."); + interface_set_status("ready to process events."); break; case PA_CONTEXT_FAILED: - status("cannot connect!"); + interface_set_status("cannot connect!"); break; case PA_CONTEXT_TERMINATED: @@ -103,11 +103,11 @@ context_state_callback(pa_context *c, gpointer userdata) pa_operation_cancel(o); pa_operation_unref(o); o = NULL; - status("connection terminated."); + interface_set_status("connection terminated."); g_main_loop_quit((GMainLoop *)userdata); break; default: - status("unknown state"); + interface_set_status("unknown state"); break; } } -- cgit