From 71d68278db92214f0647dd72c316d6938f859c3d Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 17 Nov 2004 03:10:21 +0000 Subject: * dont autospawn daemons * show a nice titlebar git-svn-id: file:///home/lennart/svn/public/paman/trunk@42 cdefa82f-4ce1-0310-97f5-ab6066f37c3c --- src/paman.cc | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/paman.cc b/src/paman.cc index 06c4046..de397c1 100644 --- a/src/paman.cc +++ b/src/paman.cc @@ -18,14 +18,19 @@ struct pa_mainloop_api *mainloop_api = NULL; extern "C" static void context_state_callback(struct pa_context *c, void *userdata); +#define WINDOW_TITLE "Polypaudio Manager" + static void context_state_callback(struct pa_context *c, void *) { g_assert(c && mainWindow); switch (pa_context_get_state(c)) { - case PA_CONTEXT_CONNECTING: - mainWindow->showSuccess("Connecting ..."); + case PA_CONTEXT_CONNECTING: { + char t[256]; + snprintf(t, sizeof(t), "Connection to %s ...", pa_context_get_server(c)); + mainWindow->showSuccess(t); mainWindow->connectButton->set_sensitive(false); return; + } case PA_CONTEXT_AUTHORIZING: mainWindow->showSuccess("Authorizing ..."); @@ -35,20 +40,26 @@ static void context_state_callback(struct pa_context *c, void *) { mainWindow->showSuccess("Setting name ..."); return; - case PA_CONTEXT_READY: + case PA_CONTEXT_READY: { + char t[256]; + snprintf(t, sizeof(t), WINDOW_TITLE" [%s]", pa_context_get_server(c)); + mainWindow->set_title(t); mainWindow->showSuccess("Ready"); g_assert(!serverInfoManager); serverInfoManager = new ServerInfoManager(*c); mainWindow->statButton->set_sensitive(true); mainWindow->disconnectButton->set_sensitive(true); return; - + } + case PA_CONTEXT_TERMINATED: + mainWindow->set_title(WINDOW_TITLE); mainWindow->showSuccess("Disconnected"); break; case PA_CONTEXT_FAILED: default: + mainWindow->set_title(WINDOW_TITLE); mainWindow->showFailure(pa_strerror(pa_context_errno(c))); break; @@ -71,7 +82,7 @@ void createConnection() { context = pa_context_new(mainloop_api, "Polypaudio Manager"); g_assert(context); pa_context_set_state_callback(context, context_state_callback, NULL); - pa_context_connect(context, NULL, 1, NULL); + pa_context_connect(context, NULL, 0, NULL); } void killConnection() { @@ -89,6 +100,7 @@ void killConnection() { mainWindow->disconnectButton->set_sensitive(false); mainWindow->statButton->set_sensitive(false); mainWindow->clearAllData(); + mainWindow->set_title(WINDOW_TITLE); } int main(int argc, char *argv[]) { -- cgit