summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2004-08-15 13:15:18 +0000
committerLennart Poettering <lennart@poettering.net>2004-08-15 13:15:18 +0000
commit3f266e3460eeea05a7a80aa4d2a29d2f418c13da (patch)
treeafbac7812819350935a813a0b9b7e1727f3faddf
parentfc360fc2080c27d8e284c373b1b68982b54f09a9 (diff)
Rename ServerInfo.{cc,hh} to ServerInfoManager.{cc,hh}
git-svn-id: file:///home/lennart/svn/public/paman/trunk@10 cdefa82f-4ce1-0310-97f5-ab6066f37c3c
-rw-r--r--configure.ac4
-rw-r--r--src/ClientWindow.hh2
-rw-r--r--src/MainWindow.hh2
-rw-r--r--src/Makefile.am2
-rw-r--r--src/ModuleWindow.hh2
-rw-r--r--src/ServerInfoManager.cc (renamed from src/ServerInfo.cc)2
-rw-r--r--src/ServerInfoManager.hh (renamed from src/ServerInfo.hh)0
-rw-r--r--src/SinkWindow.hh2
-rw-r--r--src/paman.hh3
9 files changed, 9 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac
index d2fb3bc..be10066 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,8 +40,8 @@ AC_SUBST(GUILIBS_CFLAGS)
AC_SUBST(GUILIBS_LIBS)
if test -d ../polypaudio ; then
- POLYP_CFLAGS='-I$(TOPDIR)/../polypaudio'
- POLYP_LIBS='-L$(TOPDIR)/../polypaudio/polyp/.libs -lpolyp -lpolyp-mainloop-glib -lpolyp-mainloop-glib -lpolyp-error'
+ POLYP_CFLAGS='-I$(top_srcdir)/../polypaudio'
+ POLYP_LIBS='-L$(top_srcdir)/../polypaudio/polyp/.libs -lpolyp -lpolyp-mainloop-glib -lpolyp-mainloop-glib -lpolyp-error'
echo "*** Found polypaudio in ../polypaudio, using that version ***"
else
PKG_CHECK_MODULES(POLYP, [ polyplib polyplib-mainloop polyplib-mainloop-glib polyplib-error ])
diff --git a/src/ClientWindow.hh b/src/ClientWindow.hh
index 61a1973..8440daf 100644
--- a/src/ClientWindow.hh
+++ b/src/ClientWindow.hh
@@ -6,7 +6,7 @@
class ClientWindow;
-#include "ServerInfo.hh"
+#include "ServerInfoManager.hh"
class ClientWindow : public Gtk::Window {
public:
diff --git a/src/MainWindow.hh b/src/MainWindow.hh
index 2d5f173..0157f9c 100644
--- a/src/MainWindow.hh
+++ b/src/MainWindow.hh
@@ -7,7 +7,7 @@
class MainWinow;
-#include "ServerInfo.hh"
+#include "ServerInfoManager.hh"
class MainWindow : public Gtk::Window {
public:
diff --git a/src/Makefile.am b/src/Makefile.am
index 3905db3..ff42d0e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,7 +4,7 @@ bin_PROGRAMS=paman
paman_SOURCES=MainWindow.cc MainWindow.hh \
SinkWindow.cc SinkWindow.hh \
SourceWindow.cc SourceWindow.hh \
- ServerInfo.cc ServerInfo.hh \
+ ServerInfoManager.cc ServerInfoManager.hh \
paman.cc paman.hh \
ClientWindow.cc ClientWindow.hh \
ModuleWindow.cc ModuleWindow.hh
diff --git a/src/ModuleWindow.hh b/src/ModuleWindow.hh
index c28af52..989e85a 100644
--- a/src/ModuleWindow.hh
+++ b/src/ModuleWindow.hh
@@ -6,7 +6,7 @@
class ModuleWindow;
-#include "ServerInfo.hh"
+#include "ServerInfoManager.hh"
class ModuleWindow : public Gtk::Window {
public:
diff --git a/src/ServerInfo.cc b/src/ServerInfoManager.cc
index 8362f75..c816f21 100644
--- a/src/ServerInfo.cc
+++ b/src/ServerInfoManager.cc
@@ -1,7 +1,7 @@
#include <iostream>
#include <polyp/polyplib-error.h>
-#include "ServerInfo.hh"
+#include "ServerInfoManager.hh"
#include "paman.hh"
SinkInfo::SinkInfo(const struct pa_sink_info &i) :
diff --git a/src/ServerInfo.hh b/src/ServerInfoManager.hh
index 5c22f64..5c22f64 100644
--- a/src/ServerInfo.hh
+++ b/src/ServerInfoManager.hh
diff --git a/src/SinkWindow.hh b/src/SinkWindow.hh
index 32557c4..b0417aa 100644
--- a/src/SinkWindow.hh
+++ b/src/SinkWindow.hh
@@ -6,7 +6,7 @@
class SinkWindow;
-#include "ServerInfo.hh"
+#include "ServerInfoManager.hh"
class SinkWindow : public Gtk::Window {
public:
diff --git a/src/paman.hh b/src/paman.hh
index 7f2127f..241378d 100644
--- a/src/paman.hh
+++ b/src/paman.hh
@@ -1,7 +1,7 @@
#ifndef foopamanhhfoo
#define foopamanhhfoo
-#include "ServerInfo.hh"
+#include "ServerInfoManager.hh"
#define GLADE_FILE "paman.glade"
@@ -11,5 +11,4 @@ extern struct pa_context *context;
void create_connection();
-
#endif