From 01866aaa6add407fb4183cec52f27895f9453611 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 20 Jun 2006 23:38:49 +0000 Subject: s/polyp/pulse/g git-svn-id: file:///home/lennart/svn/public/paman/trunk@75 cdefa82f-4ce1-0310-97f5-ab6066f37c3c --- Makefile.am | 8 ++++---- bootstrap.sh | 8 ++++---- configure.ac | 24 ++++++++++++------------ doc/Makefile.am | 8 ++++---- doc/style.css | 8 ++++---- src/MainWindow.hh | 2 +- src/Makefile.am | 12 ++++++------ src/ServerInfoManager.cc | 2 +- src/ServerInfoManager.hh | 2 +- src/paman.cc | 8 ++++---- src/paman.desktop | 4 ++-- src/paman.glade | 6 +++--- 12 files changed, 46 insertions(+), 46 deletions(-) diff --git a/Makefile.am b/Makefile.am index b23328e..48ccf43 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,19 +1,19 @@ # $Id$ # -# This file is part of Polypaudio Manager. +# This file is part of PulseAudio Manager. # -# Polypaudio Manager is free software; you can redistribute it and/or modify +# PulseAudio Manager is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # -# Polypaudio Manager is distributed in the hope that it will be useful, but +# PulseAudio Manager is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with Polypaudio Manager; if not, write to the Free Software +# along with PulseAudio Manager; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 # USA. diff --git a/bootstrap.sh b/bootstrap.sh index cf3c414..7a7a899 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -1,20 +1,20 @@ #!/bin/bash # $Id$ -# This file is part of Polypaudio Manager. +# This file is part of PulseAudio Manager. # -# Polypaudio Manager is free software; you can redistribute it and/or modify it +# PulseAudio Manager is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # -# Polypaudio Manager is distributed in the hope that it will be useful, but +# PulseAudio Manager is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with Polypaudio Manager; if not, write to the Free Software Foundation, +# along with PulseAudio Manager; if not, write to the Free Software Foundation, # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. VERSION=1.9 diff --git a/configure.ac b/configure.ac index c933e21..a7c08a8 100644 --- a/configure.ac +++ b/configure.ac @@ -3,24 +3,24 @@ # $Id$ -# This file is part of Polypaudio Manager. +# This file is part of PulseAudio Manager. # -# Polypaudio Manager is free software; you can redistribute it and/or modify it +# PulseAudio Manager is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # -# Polypaudio Manager is distributed in the hope that it will be useful, but +# PulseAudio Manager is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with Polypaudio Manager; if not, write to the Free Software Foundation, +# along with PulseAudio Manager; if not, write to the Free Software Foundation, # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. AC_PREREQ(2.57) -AC_INIT([paman],[0.9.1],[mzcnzna (at) 0pointer (dot) de]) +AC_INIT([paman],[0.9.2],[mzcnzna (at) 0pointer (dot) de]) AC_CONFIG_SRCDIR([src/paman.cc]) AC_CONFIG_HEADERS([config.h]) AM_INIT_AUTOMAKE([foreign 1.9 -Wall]) @@ -43,16 +43,16 @@ PKG_CHECK_MODULES(GUILIBS, [ gtkmm-2.4 libglademm-2.4 ]) AC_SUBST(GUILIBS_CFLAGS) AC_SUBST(GUILIBS_LIBS) -if test -d ../polypaudio ; then - POLYP_CFLAGS='-I$(top_srcdir)/../polypaudio/src' - POLYP_LIBS='-L$(top_srcdir)/../polypaudio/src/.libs -lpolyp -lpolyp-mainloop-glib' - echo "*** Found polypaudio in ../polypaudio, using that version ***" +if test -d ../pulseaudio ; then + PULSE_CFLAGS='-I$(top_srcdir)/../pulseaudio/src' + PULSE_LIBS='-L$(top_srcdir)/../pulseaudio/src/.libs -lpulse -lpulse-mainloop-glib' + echo "*** Found pulseaudio in ../pulseaudio, using that version ***" else - PKG_CHECK_MODULES(POLYP, [ polyplib >= 0.9.0 polyplib-glib-mainloop >= 0.9.0 ]) + PKG_CHECK_MODULES(PULSE, [ libpulse >= 0.9.2 libpulse-mainloop-glib >= 0.9.2 ]) fi -AC_SUBST(POLYP_LIBS) -AC_SUBST(POLYP_CFLAGS) +AC_SUBST(PULSE_LIBS) +AC_SUBST(PULSE_CFLAGS) # If using GCC specifiy some additional parameters if test "x$GCC" = "xyes" ; then diff --git a/doc/Makefile.am b/doc/Makefile.am index 577a2c5..96e55aa 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,19 +1,19 @@ # $Id$ -# This file is part of Polypaudio Manager. +# This file is part of PulseAudio Manager. # -# Polypaudio Manager is free software; you can redistribute it and/or modify it +# PulseAudio Manager is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # -# Polypaudio Manager is distributed in the hope that it will be useful, but +# PulseAudio Manager is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with Polypaudio Manager; if not, write to the Free Software Foundation, +# along with PulseAudio Manager; if not, write to the Free Software Foundation, # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. noinst_DATA = README.html README diff --git a/doc/style.css b/doc/style.css index 8676969..9981b16 100644 --- a/doc/style.css +++ b/doc/style.css @@ -1,20 +1,20 @@ /* $Id$ */ /*** - * This file is part of Polypaudio Manager. + * This file is part of PulseAudio Manager. * - * Polypaudio Manager is free software; you can redistribute it and/or modify it + * PulseAudio Manager is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * Polypaudio Manager is distributed in the hope that it will be useful, but + * PulseAudio Manager is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Polypaudio Manager; if not, write to the Free Software Foundation, + * along with PulseAudio Manager; if not, write to the Free Software Foundation, * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. ***/ diff --git a/src/MainWindow.hh b/src/MainWindow.hh index 681cd65..ddf3904 100644 --- a/src/MainWindow.hh +++ b/src/MainWindow.hh @@ -24,7 +24,7 @@ #include #include -#include +#include class MainWinow; diff --git a/src/Makefile.am b/src/Makefile.am index de381c8..7e36fc9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,19 +1,19 @@ # $Id$ # -# This file is part of Polypaudio Manager. +# This file is part of PulseAudio Manager. # -# Polypaudio Manager is free software; you can redistribute it and/or modify +# PulseAudio Manager is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # -# Polypaudio Manager is distributed in the hope that it will be useful, but +# PulseAudio Manager is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with Polypaudio Manager; if not, write to the Free Software +# along with PulseAudio Manager; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 # USA. @@ -36,7 +36,7 @@ paman_SOURCES=MainWindow.cc MainWindow.hh \ StatWindow.cc StatWindow.hh \ SampleWindow.cc SampleWindow.hh -paman_LDADD=$(AM_LDADD) $(GUILIBS_LIBS) $(POLYP_LIBS) -paman_CXXFLAGS=$(AM_CXXFLAGS) $(GUILIBS_CFLAGS) $(POLYP_CFLAGS) +paman_LDADD=$(AM_LDADD) $(GUILIBS_LIBS) $(PULSE_LIBS) +paman_CXXFLAGS=$(AM_CXXFLAGS) $(GUILIBS_CFLAGS) $(PULSE_CFLAGS) paman_CXXFLAGS+=-DGLADE_FILE=\"$(pkgdatadir)/paman.glade\" #paman_CXXFLAGS+=-DPAVUMETER_PATH=\"/home/lennart/projects/pavumeter/src/pavumeter\" diff --git a/src/ServerInfoManager.cc b/src/ServerInfoManager.cc index 0e41cde..27c4602 100644 --- a/src/ServerInfoManager.cc +++ b/src/ServerInfoManager.cc @@ -21,7 +21,7 @@ #include -#include +#include #include "ServerInfoManager.hh" #include "paman.hh" diff --git a/src/ServerInfoManager.hh b/src/ServerInfoManager.hh index c8ce1d8..80f7c77 100644 --- a/src/ServerInfoManager.hh +++ b/src/ServerInfoManager.hh @@ -25,7 +25,7 @@ #include #include -#include +#include class SinkInfo; class SourceInfo; diff --git a/src/paman.cc b/src/paman.cc index 4813724..cb8122e 100644 --- a/src/paman.cc +++ b/src/paman.cc @@ -24,8 +24,8 @@ #include #include -#include -#include +#include +#include #include "paman.hh" #include "SinkWindow.hh" @@ -36,7 +36,7 @@ ServerInfoManager *serverInfoManager = NULL; struct pa_context *context = NULL; struct pa_mainloop_api *mainloop_api = NULL; -#define WINDOW_TITLE "Polypaudio Manager" +#define WINDOW_TITLE "PulseAudio Manager" static void context_state_callback(struct pa_context *c, void *) { g_assert(c && mainWindow); @@ -97,7 +97,7 @@ void createConnection() { context = NULL; } - context = pa_context_new(mainloop_api, "Polypaudio Manager"); + context = pa_context_new(mainloop_api, "PulseAudio Manager"); g_assert(context); pa_context_set_state_callback(context, context_state_callback, NULL); pa_context_connect(context, NULL, (pa_context_flags_t) 0, NULL); diff --git a/src/paman.desktop b/src/paman.desktop index c8379b9..8151a67 100644 --- a/src/paman.desktop +++ b/src/paman.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Encoding=UTF-8 -Name=Polypaudio Manager -Comment=Manage your Polypaudio sound server. +Name=PulseAudio Manager +Comment=Manager your PulseAudio sound server. Exec=paman Icon=audio-card StartupNotify=true diff --git a/src/paman.glade b/src/paman.glade index 8c37fd4..c299a17 100644 --- a/src/paman.glade +++ b/src/paman.glade @@ -5,7 +5,7 @@ True - Polypaudio Manager + PulseAudio Manager GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False @@ -67,7 +67,7 @@ True - <span size="18000" color="black"><b>Polypaudio Manager</b></span> + <span size="18000" color="black"><b>PulseAudio Manager</b></span> False True GTK_JUSTIFY_LEFT @@ -92,7 +92,7 @@ True - Use this application to view and modify the Polypaudio Sound Daemon's internals + Use this application to view and modify the PulseAudio Sound Daemon's internals False False GTK_JUSTIFY_LEFT -- cgit