summaryrefslogtreecommitdiffstats
path: root/paman.cc
diff options
context:
space:
mode:
Diffstat (limited to 'paman.cc')
-rw-r--r--paman.cc20
1 files changed, 10 insertions, 10 deletions
diff --git a/paman.cc b/paman.cc
index 1bde0ba..6fb0d88 100644
--- a/paman.cc
+++ b/paman.cc
@@ -12,12 +12,12 @@
#include "MainWindow.hh"
MainWindow *mainWindow = NULL;
-ServerInfo *serverInfo = NULL;
+ServerInfoManager *serverInfoManager = NULL;
struct pa_context *context = NULL;
struct pa_mainloop_api *mainloop_api = NULL;
static void context_complete_callback(struct pa_context *c, int success, void *userdata) {
- g_assert(c && mainWindow && !serverInfo);
+ g_assert(c && mainWindow && !serverInfoManager);
if (!success) {
mainWindow->showFailure(pa_strerror(pa_context_errno(c)));
@@ -29,23 +29,23 @@ static void context_complete_callback(struct pa_context *c, int success, void *u
mainWindow->showSuccess("Connected");
mainWindow->connectButton->set_sensitive(false);
- serverInfo = new ServerInfo(*c);
+ serverInfoManager = new ServerInfoManager(*c);
}
static void die_callback(struct pa_context *c, void *userdata) {
mainWindow->clearAllData();
mainWindow->showFailure(pa_strerror(pa_context_errno(c)));
- delete serverInfo;
- serverInfo = NULL;
+ delete serverInfoManager;
+ serverInfoManager = NULL;
//pa_context_free(contetx); /* Mrprmfmfl! */
context = NULL;
mainWindow->connectButton->set_sensitive(true);
}
void create_connection() {
- if (serverInfo) {
- delete serverInfo;
- serverInfo = NULL;
+ if (serverInfoManager) {
+ delete serverInfoManager;
+ serverInfoManager = NULL;
}
if (context) {
pa_context_free(context);
@@ -85,8 +85,8 @@ int main(int argc, char *argv[]) {
Gtk::Main::run(*mainWindow);
quit:
- if (serverInfo)
- delete serverInfo;
+ if (serverInfoManager)
+ delete serverInfoManager;
if (context)
pa_context_free(context);