[polypaudio-commits] r1033 - in /trunk: ./ doc/ doxygen/ src/ src/daemon/ src/modules/ src/modules/rtp/ src/polyp/ src/polypcore/ src/pulse/ src/pulsecore/ src/tests/ src/utils/

svnmailer-noreply at 0pointer.de svnmailer-noreply at 0pointer.de
Mon Jun 19 14:58:23 PDT 2006


Author: lennart
Date: Mon Jun 19 23:53:48 2006
New Revision: 1033

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=1033&root=pulseaudio&view=rev
Log:
big s/polyp/pulse/g

Added:
    trunk/libpulse-browse.pc.in
      - copied, changed from r1031, trunk/polyplib-browse.pc.in
    trunk/libpulse-glib-mainloop.pc.in
      - copied, changed from r1031, trunk/polyplib-glib-mainloop.pc.in
    trunk/libpulse-glib12-mainloop.pc.in
      - copied, changed from r1031, trunk/polyplib-glib12-mainloop.pc.in
    trunk/libpulse-simple.pc.in
      - copied, changed from r1031, trunk/polyplib-simple.pc.in
    trunk/libpulse.pc.in
      - copied, changed from r1031, trunk/polyplib.pc.in
    trunk/src/pulse/
      - copied from r1031, trunk/src/polyp/
    trunk/src/pulsecore/
      - copied from r1031, trunk/src/polypcore/
Removed:
    trunk/polyplib-browse.pc.in
    trunk/polyplib-glib-mainloop.pc.in
    trunk/polyplib-glib12-mainloop.pc.in
    trunk/polyplib-simple.pc.in
    trunk/polyplib.pc.in
    trunk/src/polyp/
    trunk/src/polypcore/
Modified:
    trunk/LICENSE
    trunk/Makefile.am
    trunk/bootstrap.sh
    trunk/configure.ac
    trunk/doc/FAQ.html.in
    trunk/doc/Makefile.am
    trunk/doc/README.html.in
    trunk/doc/cli.html.in
    trunk/doc/daemon.html.in
    trunk/doc/modules.html.in
    trunk/doc/style.css
    trunk/doxygen/Makefile.am
    trunk/doxygen/doxygen.conf.in
    trunk/src/Makefile.am
    trunk/src/daemon/Makefile
    trunk/src/daemon/caps.c
    trunk/src/daemon/caps.h
    trunk/src/daemon/cmdline.c
    trunk/src/daemon/cmdline.h
    trunk/src/daemon/cpulimit.c
    trunk/src/daemon/cpulimit.h
    trunk/src/daemon/daemon-conf.c
    trunk/src/daemon/daemon-conf.h
    trunk/src/daemon/daemon.conf.in
    trunk/src/daemon/default.pa.in
    trunk/src/daemon/default.pa.win32
    trunk/src/daemon/dumpmodules.c
    trunk/src/daemon/dumpmodules.h
    trunk/src/daemon/esdcompat.in
    trunk/src/daemon/main.c
    trunk/src/depmod.py
    trunk/src/modules/Makefile
    trunk/src/modules/alsa-util.c
    trunk/src/modules/alsa-util.h
    trunk/src/modules/howl-wrap.c
    trunk/src/modules/howl-wrap.h
    trunk/src/modules/module-alsa-sink.c
    trunk/src/modules/module-alsa-source.c
    trunk/src/modules/module-cli.c
    trunk/src/modules/module-combine.c
    trunk/src/modules/module-defs.h.m4
    trunk/src/modules/module-detect.c
    trunk/src/modules/module-esound-compat-spawnfd.c
    trunk/src/modules/module-esound-compat-spawnpid.c
    trunk/src/modules/module-esound-sink.c
    trunk/src/modules/module-jack-sink.c
    trunk/src/modules/module-jack-source.c
    trunk/src/modules/module-lirc.c
    trunk/src/modules/module-match.c
    trunk/src/modules/module-mmkbd-evdev.c
    trunk/src/modules/module-native-protocol-fd.c
    trunk/src/modules/module-null-sink.c
    trunk/src/modules/module-oss-mmap.c
    trunk/src/modules/module-oss.c
    trunk/src/modules/module-pipe-sink.c
    trunk/src/modules/module-pipe-source.c
    trunk/src/modules/module-protocol-stub.c
    trunk/src/modules/module-sine.c
    trunk/src/modules/module-solaris.c
    trunk/src/modules/module-tunnel.c
    trunk/src/modules/module-volume-restore.c
    trunk/src/modules/module-waveout.c
    trunk/src/modules/module-x11-bell.c
    trunk/src/modules/module-x11-publish.c
    trunk/src/modules/module-zeroconf-publish.c
    trunk/src/modules/oss-util.c
    trunk/src/modules/oss-util.h
    trunk/src/modules/rtp/module-rtp-recv.c
    trunk/src/modules/rtp/module-rtp-send.c
    trunk/src/modules/rtp/rtp.c
    trunk/src/modules/rtp/rtp.h
    trunk/src/modules/rtp/sap.c
    trunk/src/modules/rtp/sap.h
    trunk/src/modules/rtp/sdp.c
    trunk/src/modules/rtp/sdp.h
    trunk/src/pulse/browser.c
    trunk/src/pulse/browser.h
    trunk/src/pulse/cdecl.h
    trunk/src/pulse/channelmap.c
    trunk/src/pulse/channelmap.h
    trunk/src/pulse/client-conf-x11.c
    trunk/src/pulse/client-conf-x11.h
    trunk/src/pulse/client-conf.c
    trunk/src/pulse/client-conf.h
    trunk/src/pulse/client.conf.in
    trunk/src/pulse/context.c
    trunk/src/pulse/context.h
    trunk/src/pulse/def.h
    trunk/src/pulse/error.c
    trunk/src/pulse/error.h
    trunk/src/pulse/glib-mainloop.c
    trunk/src/pulse/glib-mainloop.h
    trunk/src/pulse/glib12-mainloop.c
    trunk/src/pulse/internal.h
    trunk/src/pulse/introspect.c
    trunk/src/pulse/introspect.h
    trunk/src/pulse/mainloop-api.c
    trunk/src/pulse/mainloop-api.h
    trunk/src/pulse/mainloop-signal.c
    trunk/src/pulse/mainloop-signal.h
    trunk/src/pulse/mainloop.c
    trunk/src/pulse/mainloop.h
    trunk/src/pulse/operation.c
    trunk/src/pulse/operation.h
    trunk/src/pulse/polypaudio.h
    trunk/src/pulse/sample.c
    trunk/src/pulse/sample.h
    trunk/src/pulse/scache.c
    trunk/src/pulse/scache.h
    trunk/src/pulse/simple.c
    trunk/src/pulse/simple.h
    trunk/src/pulse/stream.c
    trunk/src/pulse/stream.h
    trunk/src/pulse/subscribe.c
    trunk/src/pulse/subscribe.h
    trunk/src/pulse/thread-mainloop.c
    trunk/src/pulse/thread-mainloop.h
    trunk/src/pulse/timeval.c
    trunk/src/pulse/timeval.h
    trunk/src/pulse/utf8.h
    trunk/src/pulse/util.c
    trunk/src/pulse/util.h
    trunk/src/pulse/version.h.in
    trunk/src/pulse/volume.c
    trunk/src/pulse/volume.h
    trunk/src/pulse/xmalloc.c
    trunk/src/pulse/xmalloc.h
    trunk/src/pulsecore/Makefile
    trunk/src/pulsecore/authkey-prop.c
    trunk/src/pulsecore/authkey-prop.h
    trunk/src/pulsecore/authkey.c
    trunk/src/pulsecore/authkey.h
    trunk/src/pulsecore/autoload.c
    trunk/src/pulsecore/autoload.h
    trunk/src/pulsecore/cli-command.c
    trunk/src/pulsecore/cli-command.h
    trunk/src/pulsecore/cli-text.c
    trunk/src/pulsecore/cli-text.h
    trunk/src/pulsecore/cli.c
    trunk/src/pulsecore/cli.h
    trunk/src/pulsecore/client.c
    trunk/src/pulsecore/client.h
    trunk/src/pulsecore/conf-parser.c
    trunk/src/pulsecore/conf-parser.h
    trunk/src/pulsecore/core-def.h
    trunk/src/pulsecore/core-error.c
    trunk/src/pulsecore/core-error.h
    trunk/src/pulsecore/core-scache.c
    trunk/src/pulsecore/core-scache.h
    trunk/src/pulsecore/core-subscribe.c
    trunk/src/pulsecore/core-subscribe.h
    trunk/src/pulsecore/core-util.c
    trunk/src/pulsecore/core-util.h
    trunk/src/pulsecore/core.c
    trunk/src/pulsecore/core.h
    trunk/src/pulsecore/dllmain.c
    trunk/src/pulsecore/dynarray.c
    trunk/src/pulsecore/dynarray.h
    trunk/src/pulsecore/endianmacros.h
    trunk/src/pulsecore/esound.h
    trunk/src/pulsecore/gccmacro.h
    trunk/src/pulsecore/hashmap.c
    trunk/src/pulsecore/hashmap.h
    trunk/src/pulsecore/idxset.c
    trunk/src/pulsecore/idxset.h
    trunk/src/pulsecore/inet_ntop.c
    trunk/src/pulsecore/inet_pton.c
    trunk/src/pulsecore/iochannel.c
    trunk/src/pulsecore/iochannel.h
    trunk/src/pulsecore/ioline.c
    trunk/src/pulsecore/ioline.h
    trunk/src/pulsecore/llist.h
    trunk/src/pulsecore/log.c
    trunk/src/pulsecore/log.h
    trunk/src/pulsecore/mcalign.c
    trunk/src/pulsecore/mcalign.h
    trunk/src/pulsecore/memblock.c
    trunk/src/pulsecore/memblock.h
    trunk/src/pulsecore/memblockq.c
    trunk/src/pulsecore/memblockq.h
    trunk/src/pulsecore/memchunk.c
    trunk/src/pulsecore/memchunk.h
    trunk/src/pulsecore/modargs.c
    trunk/src/pulsecore/modargs.h
    trunk/src/pulsecore/modinfo.c
    trunk/src/pulsecore/modinfo.h
    trunk/src/pulsecore/module.c
    trunk/src/pulsecore/module.h
    trunk/src/pulsecore/namereg.c
    trunk/src/pulsecore/namereg.h
    trunk/src/pulsecore/native-common.h
    trunk/src/pulsecore/packet.c
    trunk/src/pulsecore/packet.h
    trunk/src/pulsecore/parseaddr.c
    trunk/src/pulsecore/parseaddr.h
    trunk/src/pulsecore/pdispatch.c
    trunk/src/pulsecore/pdispatch.h
    trunk/src/pulsecore/pid.c
    trunk/src/pulsecore/pid.h
    trunk/src/pulsecore/pipe.c
    trunk/src/pulsecore/pipe.h
    trunk/src/pulsecore/play-memchunk.c
    trunk/src/pulsecore/play-memchunk.h
    trunk/src/pulsecore/poll.c
    trunk/src/pulsecore/poll.h
    trunk/src/pulsecore/props.c
    trunk/src/pulsecore/props.h
    trunk/src/pulsecore/protocol-cli.c
    trunk/src/pulsecore/protocol-cli.h
    trunk/src/pulsecore/protocol-esound.c
    trunk/src/pulsecore/protocol-esound.h
    trunk/src/pulsecore/protocol-http.c
    trunk/src/pulsecore/protocol-http.h
    trunk/src/pulsecore/protocol-native.c
    trunk/src/pulsecore/protocol-native.h
    trunk/src/pulsecore/protocol-simple.c
    trunk/src/pulsecore/protocol-simple.h
    trunk/src/pulsecore/pstream-util.c
    trunk/src/pulsecore/pstream-util.h
    trunk/src/pulsecore/pstream.c
    trunk/src/pulsecore/pstream.h
    trunk/src/pulsecore/queue.c
    trunk/src/pulsecore/queue.h
    trunk/src/pulsecore/random.c
    trunk/src/pulsecore/random.h
    trunk/src/pulsecore/resampler.c
    trunk/src/pulsecore/resampler.h
    trunk/src/pulsecore/sample-util.c
    trunk/src/pulsecore/sample-util.h
    trunk/src/pulsecore/sconv-s16be.c
    trunk/src/pulsecore/sconv-s16be.h
    trunk/src/pulsecore/sconv-s16le.c
    trunk/src/pulsecore/sconv-s16le.h
    trunk/src/pulsecore/sconv.c
    trunk/src/pulsecore/sconv.h
    trunk/src/pulsecore/sink-input.c
    trunk/src/pulsecore/sink-input.h
    trunk/src/pulsecore/sink.c
    trunk/src/pulsecore/sink.h
    trunk/src/pulsecore/sioman.c
    trunk/src/pulsecore/sioman.h
    trunk/src/pulsecore/socket-client.c
    trunk/src/pulsecore/socket-client.h
    trunk/src/pulsecore/socket-server.c
    trunk/src/pulsecore/socket-server.h
    trunk/src/pulsecore/socket-util.c
    trunk/src/pulsecore/socket-util.h
    trunk/src/pulsecore/sound-file-stream.c
    trunk/src/pulsecore/sound-file-stream.h
    trunk/src/pulsecore/sound-file.c
    trunk/src/pulsecore/sound-file.h
    trunk/src/pulsecore/source-output.c
    trunk/src/pulsecore/source-output.h
    trunk/src/pulsecore/source.c
    trunk/src/pulsecore/source.h
    trunk/src/pulsecore/strbuf.c
    trunk/src/pulsecore/strbuf.h
    trunk/src/pulsecore/strlist.c
    trunk/src/pulsecore/strlist.h
    trunk/src/pulsecore/tagstruct.c
    trunk/src/pulsecore/tagstruct.h
    trunk/src/pulsecore/tokenizer.c
    trunk/src/pulsecore/tokenizer.h
    trunk/src/pulsecore/x11prop.c
    trunk/src/pulsecore/x11prop.h
    trunk/src/pulsecore/x11wrap.c
    trunk/src/pulsecore/x11wrap.h
    trunk/src/tests/Makefile
    trunk/src/tests/channelmap-test.c
    trunk/src/tests/cpulimit-test.c
    trunk/src/tests/interpol-test.c
    trunk/src/tests/mainloop-test.c
    trunk/src/tests/mcalign-test.c
    trunk/src/tests/memblockq-test.c
    trunk/src/tests/pacat-simple.c
    trunk/src/tests/parec-simple.c
    trunk/src/tests/strlist-test.c
    trunk/src/tests/sync-playback.c
    trunk/src/tests/thread-mainloop-test.c
    trunk/src/tests/utf8-test.c
    trunk/src/tests/voltest.c
    trunk/src/utils/Makefile
    trunk/src/utils/pabrowse.c
    trunk/src/utils/pacat.c
    trunk/src/utils/pacmd.c
    trunk/src/utils/pactl.c
    trunk/src/utils/padsp
    trunk/src/utils/padsp.c
    trunk/src/utils/paplay.c
    trunk/src/utils/pax11publish.c

Modified: trunk/LICENSE
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/LICENSE?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/LICENSE (original)
+++ trunk/LICENSE Mon Jun 19 23:53:48 2006
@@ -1,13 +1,13 @@
-All Polypaudio source files are licensed under the GNU Lesser General Public
+All PulseAudio source files are licensed under the GNU Lesser General Public
 License. (see file LGPL for details)
 
 However, the server side links to the GPL-only library 'libsamplerate' which
 practically downgrades the license of the server part to GPL (see file GPL for
 details), exercising section 3 of the LGPL.
 
-Hence you should treat the client library ('libpolyp') of Polypaudio as being
-LGPL licensed and the server part ('libpolypcore') as being GPL licensed. Since
-the Polypaudio daemon and the modules link to 'libpolypcore' they are of course
+Hence you should treat the client library ('libpulse') of Polypaudio as being
+LGPL licensed and the server part ('libpulsecore') as being GPL licensed. Since
+the PulseAudio daemon and the modules link to 'libpulsecore' they are of course
 also GPL licensed.
 
 -- Lennart Poettering, April 20th, 2006.

Modified: trunk/Makefile.am
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/Makefile.am?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/Makefile.am (original)
+++ trunk/Makefile.am Mon Jun 19 23:53:48 2006
@@ -1,19 +1,19 @@
 # $Id$
 #
-# This file is part of polypaudio.
+# This file is part of PulseAudio.
 #
-# polypaudio is free software; you can redistribute it and/or modify
+# PulseAudio is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 #
-# polypaudio is distributed in the hope that it will be useful, but
+# PulseAudio 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 Lesser General Public License
-# along with polypaudio; if not, write to the Free Software
+# along with PulseAudio; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 
@@ -24,16 +24,21 @@
 noinst_DATA =
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = polyplib.pc polyplib-simple.pc polyplib-browse.pc
+pkgconfig_DATA = libpulse.pc libpulse-simple.pc
+
+if HAVE_HOWL
+pkgconfig_DATA += \
+	 libpulse-browse.pc
+endif
 
 if HAVE_GLIB20
 pkgconfig_DATA += \
-	 polyplib-glib-mainloop.pc
+	 libpulse-glib-mainloop.pc
 endif
 
 if HAVE_GLIB12
 pkgconfig_DATA += \
-	polyplib-glib12-mainloop.pc
+	libpulse-glib12-mainloop.pc
 endif
 
 if USE_LYNX
@@ -49,11 +54,11 @@
 
 homepage: all dist doxygen
 	test -d $$HOME/homepage/private
-	mkdir -p $$HOME/homepage/private/projects/polypaudio $$HOME/homepage/private/projects/polypaudio/doxygen
-	cp polypaudio- at PACKAGE_VERSION@.tar.gz $$HOME/homepage/private/projects/polypaudio
-	cp doc/README.html doc/FAQ.html doc/cli.html doc/daemon.html doc/modules.html doc/style.css $$HOME/homepage/private/projects/polypaudio
-	cp -a doxygen/html/* $$HOME/homepage/private/projects/polypaudio/doxygen
-	ln -sf $$HOME/homepage/private/projects/polypaudio/README.html $$HOME/homepage/private/projects/polypaudio/index.html
+	mkdir -p $$HOME/homepage/private/projects/pulseaudio $$HOME/homepage/private/projects/pulseaudio/doxygen
+	cp pulseaudio- at PACKAGE_VERSION@.tar.gz $$HOME/homepage/private/projects/pulseaudio
+	cp doc/README.html doc/FAQ.html doc/cli.html doc/daemon.html doc/modules.html doc/style.css $$HOME/homepage/private/projects/pulseaudio
+	cp -a doxygen/html/* $$HOME/homepage/private/projects/pulseaudio/doxygen
+	ln -sf $$HOME/homepage/private/projects/pulseaudio/README.html $$HOME/homepage/private/projects/pulseaudio/index.html
 
 #distcleancheck:
 #	@:

Modified: trunk/bootstrap.sh
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/bootstrap.sh?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/bootstrap.sh (original)
+++ trunk/bootstrap.sh Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 #!/bin/bash
 # $Id$
 
-# This file is part of polypaudio.
+# This file is part of PulseAudio.
 #
-# polypaudio is free software; you can redistribute it and/or modify it
+# PulseAudio is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 #
-# polypaudio is distributed in the hope that it will be useful, but
+# PulseAudio 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 Lesser General Public License
-# along with polypaudio; if not, write to the Free Software Foundation,
+# along with PulseAudio; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
 
 VERSION=1.9

Modified: trunk/configure.ac
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/configure.ac?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Mon Jun 19 23:53:48 2006
@@ -3,20 +3,20 @@
 
 # $Id$
 
-# This file is part of polypaudio.
+# This file is part of PulseAudio.
 #
-# polypaudio is free software; you can redistribute it and/or modify it
+# PulseAudio is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 #
-# polypaudio is distributed in the hope that it will be useful, but
+# PulseAudio 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 Lesser General Public License
-# along with polypaudio; if not, write to the Free Software Foundation,
+# along with PulseAudio; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
 
 AC_PREREQ(2.57)
@@ -25,13 +25,13 @@
 m4_define(PA_MINOR, [9])
 m4_define(PA_MICRO, [1])
 
-AC_INIT([polypaudio], PA_MAJOR.PA_MINOR.PA_MICRO,[mzcbylcnhqvb (at) 0pointer (dot) de])
+AC_INIT([pulseaudio], PA_MAJOR.PA_MINOR.PA_MICRO,[mzcbylcnhqvb (at) 0pointer (dot) de])
 AC_CONFIG_SRCDIR([src/daemon/main.c])
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([foreign -Wall])
 
 AC_SUBST(PA_MAJORMINOR, "PA_MAJOR.PA_MINOR")
-AC_SUBST(PACKAGE_URL, [http://0pointer.de/lennart/projects/polypaudio/])
+AC_SUBST(PACKAGE_URL, [http://0pointer.de/lennart/projects/pulseaudio/])
 
 AC_SUBST(PA_API_VERSION, 9)
 AC_SUBST(PA_PROTOCOL_VERSION, 9)
@@ -681,8 +681,8 @@
 
 AC_ARG_WITH(
         [module-dir],
-        AC_HELP_STRING([--with-module-dir],[Directory where to install the modules to (defaults to ${libdir}/polypaudio-${PA_MAJORMINOR}/modules/]),
-        [modlibexecdir=$withval], [modlibexecdir="${libdir}/polypaudio-${PA_MAJORMINOR}/modules/"])
+        AC_HELP_STRING([--with-module-dir],[Directory where to install the modules to (defaults to ${libdir}/pulse-${PA_MAJORMINOR}/modules/]),
+        [modlibexecdir=$withval], [modlibexecdir="${libdir}/pulse-${PA_MAJORMINOR}/modules/"])
 
 AC_SUBST(modlibexecdir)
 
@@ -695,11 +695,11 @@
 AC_CONFIG_FILES([
 Makefile
 src/Makefile
-polyplib.pc
-polyplib-simple.pc
-polyplib-browse.pc
-polyplib-glib-mainloop.pc
-polyplib-glib12-mainloop.pc
+libpulse.pc
+libpulse-simple.pc
+libpulse-browse.pc
+libpulse-glib-mainloop.pc
+libpulse-glib12-mainloop.pc
 doc/Makefile
 doc/README.html
 doc/cli.html
@@ -707,7 +707,7 @@
 doc/modules.html
 doxygen/Makefile
 doxygen/doxygen.conf
-src/polyp/version.h
+src/pulse/version.h
 doc/FAQ.html
 ])
 AC_OUTPUT

Modified: trunk/doc/FAQ.html.in
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/doc/FAQ.html.in?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/doc/FAQ.html.in (original)
+++ trunk/doc/FAQ.html.in Mon Jun 19 23:53:48 2006
@@ -2,7 +2,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<title>polypaudio: FAQ</title>
+<title>pulseaudio: FAQ</title>
 <link rel="stylesheet" type="text/css" href="style.css" />
 </head>
 
@@ -57,64 +57,64 @@
   reimplement very much code for Polypaudio. It should be easy to
   implement limited support for <tt>libartsc</tt> based
   applications. Noone has done this yet. It is probably a better idea to
-  run <tt>arts</tt> on top of Polypaudio (through a polypaudio driver
+  run <tt>arts</tt> on top of Polypaudio (through a pulseaudio driver
   for aRts, which nobody has written yet). Another solution would be to
   embed Polypaudio in the aRts process.</p></li>
 
   <li><p><b>I often hear noises when playing back with Polypaudio, what can I do?</b></p>
-  <p>There are to possible solutions: run polypaudio with argument
+  <p>There are to possible solutions: run pulseaudio with argument
 <tt>--high-priority=1</tt> and make yourself member of the group
 <tt>realtime</tt>, or increase the fragment sizes of the audio
   drivers. The former will allow Polypaudio to activate
   <tt>SCHED_FIFO</tt> high priority scheduling (root rights are dropped
   immediately after this). Keep in mind that this is a potential security hole!</p></li>
 
-   <li><p><b>The <tt>polypaudio</tt>  executable is installed SUID root by default. Why this? Isn't this a potential security hole?</b></p>
+   <li><p><b>The <tt>pulseaudio</tt>  executable is installed SUID root by default. Why this? Isn't this a potential security hole?</b></p>
 
   <p>Polypaudio activates <tt>SCHED_FIFO</tt> scheduling if the user
 passes <tt>--high-priority=1</tt>. This will only succeed when
 executed as root, therefore the binary is marked SUID root by
-default. Yes, this is a potential security hole. However, polypaudio
+default. Yes, this is a potential security hole. However, pulseaudio
 tries its best to minimize the security threat: immediately after
-startup polypaudio drops all capabilities except
+startup pulseaudio drops all capabilities except
 <tt>CAP_SYS_NICE</tt> (At least on systems that support it, like Linux; see <tt>man 7
 capabilities</tt> for more information). If the calling user is not a
 member of the group <tt>realtime</tt> (which is required to have a GID
 < 1000), root rights are dropped immediately. This means, you can
-install polypaudio SUID root, but only a subset of your users (the
+install pulseaudio SUID root, but only a subset of your users (the
 members of the group <tt>realtime</tt>) may make use of realtime
 scheduling. Keep in mind that these users might load their own binary
-modules into the polypaudio daemon which may freeze the machine. The
+modules into the pulseaudio daemon which may freeze the machine. The
 daemon has a minimal protection against CPU hogging (the daemon is
 killed after hogging more than 70% CPU for 5 seconds), but this may
 be circumvented easily by evildoers.</p></li>
   
-  <li><p><b>I want to run polypaudio only when it is needed, how do I do this?</b></p>
+  <li><p><b>I want to run pulseaudio only when it is needed, how do I do this?</b></p>
 
   <p>Set <tt>autospawn = yes</tt> in <tt>client.conf</tt>. That
-configuration file may be found either in <tt>/etc/polypaudio/</tt> or
-in <tt>~/.polypaudio/</tt>.</p></li>
-
-  <li><p><b>How do I list all polypaudio modules installed?</b></p>
-
-   <p><tt>polypaudio --dump-modules</tt></p>
+configuration file may be found either in <tt>/etc/pulseaudio/</tt> or
+in <tt>~/.pulseaudio/</tt>.</p></li>
+
+  <li><p><b>How do I list all pulseaudio modules installed?</b></p>
+
+   <p><tt>pulseaudio --dump-modules</tt></p>
 
    <p>Add <tt>-v</tt> for terse usage instructions.</p>
 
-<li><p><b>How do I use polypaudio over the network?</b></p>
-
-<p>Just set <tt>$POLYP_SERVER</tt> to the host name of the polypaudio
+<li><p><b>How do I use pulseaudio over the network?</b></p>
+
+<p>Just set <tt>$POLYP_SERVER</tt> to the host name of the pulseaudio
 server. For authentication you need the same auth cookies on all sides. For
-that copy <tt>~./polypaudio-cookie</tt> to all clients that shall
+that copy <tt>~./pulseaudio-cookie</tt> to all clients that shall
 be allowed to connect.</p>
 
 <p>Alternatively the authorization cookies can be stored in the X11 server.</p></li>
 
-<li><p><b>Is polypaudio capable of providing synchronized audio playback over the network for movie players like <tt>mplayer</tt>?</b></p>
+<li><p><b>Is pulseaudio capable of providing synchronized audio playback over the network for movie players like <tt>mplayer</tt>?</b></p>
 
 <p>Yes! Unless your network is congested in some way (i.e. transfer latencies vary strongly) it works perfectly. Drop me an email for experimental patches for MPlayer.</p>
 
-   <li><p><b>What environment variables does polypaudio care about?</b></p>
+   <li><p><b>What environment variables does pulseaudio care about?</b></p>
 
 <p>The client honors: <tt>POLYP_SINK</tt> (default sink to connect to), <tt>POLYP_SOURCE</tt> (default source to connect to), <tt>POLYP_SERVER</tt> (default server to connect to, like <tt>ESPEAKER</tt>), <tt>POLYP_BINARY</tt> (the binary to start when autospawning a daemon), <tt>POLYP_CLIENTCONFIG</tt> (path to the client configuration file).</p>
 
@@ -126,31 +126,31 @@
 <p>A brilliant guy named Lennart Poettering once wrote a nifty tool
 for that purpose: <a
 href="http://0pointer.de/lennart/projects/bidilink/">bidilink</a>. To
-connect to a running polypaudio daemon try using the following commands:</p>
-
-<pre>killall -USR2 polypaudio
-bidilink unix-client:/tmp/polypaudio/cli</pre>
+connect to a running pulseaudio daemon try using the following commands:</p>
+
+<pre>killall -USR2 pulseaudio
+bidilink unix-client:/tmp/pulseaudio/cli</pre>
 
 <p><i>BTW: Someone should package this great tool for Debian!</i></p>
 
 <p><b>New:</b> There's now a tool <tt>pacmd</tt> that automates sending SIGUSR2 to the daemon and running a bidilink like tool for you.</p>
 </li>
 
-<li><p><b>How do the polypaudio libraries decide where to connect to?</b></p>
+<li><p><b>How do the pulseaudio libraries decide where to connect to?</b></p>
 <p>The following rule applies:</p>
 <ol>
   <li>If the the application using the library specifies a server to connect to it is used. If the connection fails, the library fails too.</li>
   <li>If the environment variable <tt>POLYP_SERVER</tt> is defined the library connects to that server. If the connection fails, the library fails too.</li>
   <li>If <tt>$DISPLAY</tt> is set, the library tries to connect to that server and looks for the root window property <tt>POYLP_SERVER</tt> for the host to connect to. If <tt>POLYP_COOKIE</tt> is set it is used as authentication cookie.</li>
-  <li>If the client configuration file (<tt>~/.polypaudio/client.conf</tt> or <tt>/etc/polypaudio/client.conf</tt>) sets the server address, the library connects to that server. If the connection fails, the library fails too.</li>
-  <li>The library tries to connect to the default local UNIX socket for polypaudio servers. If the connection fails, it proceeds with the next item.</li>
-  <li>The library tries to connect to the default local TCP socket for polypaudio servers. If the connection fails, it proceeds with the next item.</li>
+  <li>If the client configuration file (<tt>~/.pulseaudio/client.conf</tt> or <tt>/etc/pulseaudio/client.conf</tt>) sets the server address, the library connects to that server. If the connection fails, the library fails too.</li>
+  <li>The library tries to connect to the default local UNIX socket for pulseaudio servers. If the connection fails, it proceeds with the next item.</li>
+  <li>The library tries to connect to the default local TCP socket for pulseaudio servers. If the connection fails, it proceeds with the next item.</li>
   <li>If <tt>$DISPLAY</tt> is set, the library tries to connect to the default TCP port of that host. If the connection fails, it proceeds with the next item.</li>
   <li>The connection fails.</li>
 </ol>
 </li>
 
-<li><p><b>Why the heck does libpolyp link against libX11?</b></p>
+<li><p><b>Why the heck does libpulse link against libX11?</b></p>
 <p>The Polypaudio client libraries look for some X11 root window
 properties for the credentials of the Polypaudio server to access. You
 may compile Polypaudio without X11 for disabling this feature.</p></li>

Modified: trunk/doc/Makefile.am
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/doc/Makefile.am?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/doc/Makefile.am (original)
+++ trunk/doc/Makefile.am Mon Jun 19 23:53:48 2006
@@ -1,19 +1,19 @@
 # $Id$
 
-# This file is part of polypaudio.
+# This file is part of PulseAudio.
 #
-# polypaudio is free software; you can redistribute it and/or modify it
+# PulseAudio is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 #
-# polypaudio is distributed in the hope that it will be useful, but
+# PulseAudio 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 Lesser General Public License
-# along with polypaudio; if not, write to the Free Software Foundation,
+# along with PulseAudio; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
 
 noinst_DATA = README.html cli.html modules.html daemon.html FAQ.html

Modified: trunk/doc/README.html.in
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/doc/README.html.in?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/doc/README.html.in (original)
+++ trunk/doc/README.html.in Mon Jun 19 23:53:48 2006
@@ -3,12 +3,12 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 
 <head>
-<title>polypaudio @PACKAGE_VERSION@</title>
+<title>pulseaudio @PACKAGE_VERSION@</title>
 <link rel="stylesheet" type="text/css" href="style.css" />
 </head>
 
 <body>
-<h1><a name="top">polypaudio @PACKAGE_VERSION@</a></h1>
+<h1><a name="top">pulseaudio @PACKAGE_VERSION@</a></h1>
 
 <p><i>Copyright 2004-2006 Lennart Poettering &lt;@PACKAGE_BUGREPORT@&gt;</i> and Pierre Ossman</p>
 
@@ -44,7 +44,7 @@
 <h2><a name="news">News</a></h2>
 
 <div class="news-date">Fri Jun 2 2006: </div> <p class="news-text"><a
-href="@PACKAGE_URL at polypaudio-0.9.1.tar.gz">Version 0.9.1</a>
+href="@PACKAGE_URL at pulseaudio-0.9.1.tar.gz">Version 0.9.1</a>
 released; changes include: load modules even when libtool <tt>.la</tt>
 files are missing; generate better ALSA device names from
 <tt>module-detect</tt>; if an ALSA device doesn't support the
@@ -53,7 +53,7 @@
 <tt>esdcompat.sh</tt>; build system fixes; No API or ABI changes were made</p>
 
 <div class="news-date">Fri May 26 2006: </div> <p class="news-text"><a
-href="@PACKAGE_URL at polypaudio-0.9.0.tar.gz">Version 0.9.0</a>
+href="@PACKAGE_URL at pulseaudio-0.9.0.tar.gz">Version 0.9.0</a>
 released; changes include: new module <tt>module-volume-restore</tt>;
 new OSS API emulation tool <tt>padsp</tt>; require valid UTF8 strings
 everywhere; properly support ALSA channel maps for surround sound;
@@ -62,7 +62,7 @@
 versioning; a few API additions; many, many bugfixes</p>
 
 <div class="news-date">Fri Apr 28 2006: </div> <p class="news-text"><a
-href="@PACKAGE_URL at polypaudio-0.8.1.tar.gz">Version 0.8.1</a>
+href="@PACKAGE_URL at pulseaudio-0.8.1.tar.gz">Version 0.8.1</a>
 released; changes include: support for specifying the channel map on
 the command lines of <tt>paplay</tt> and <tt>pacat</tt> and as
 arguments to the driver modules; ALSA hardware mixer compatibility;
@@ -70,16 +70,16 @@
 protocol modules; fix sample cache; many other fixes</p>
 
 <div class="news-date">Thu Apr 13 2006: </div> <p class="news-text"><a
-href="@PACKAGE_URL at polypaudio-0.8.tar.gz">Version 0.8</a> released;
-changes include: too many to count - consider reading <a href="http://0pointer.de/blog/projects/polypaudio-0.8.html">this blog entry</a> for more information; many, many minor fixes.</p>
+href="@PACKAGE_URL at pulseaudio-0.8.tar.gz">Version 0.8</a> released;
+changes include: too many to count - consider reading <a href="http://0pointer.de/blog/projects/pulseaudio-0.8.html">this blog entry</a> for more information; many, many minor fixes.</p>
 
 <div class="news-date">Sun Nov 21 2004: </div> <p class="news-text"><a
-href="@PACKAGE_URL at polypaudio-0.7.tar.gz">Version 0.7</a> released;
+href="@PACKAGE_URL at pulseaudio-0.7.tar.gz">Version 0.7</a> released;
 changes include: IPv6 support; PID file support; publish credentials
 in X11 root window (<tt>module-x11-publish</tt>; new tool <tt>pacmd</tt>; ESOUND backend; new command <tt>load-sample-dir-lazy</tt>; many, many minor fixes.</p>
 
 <div class="news-date">Thu Oct 28 2004: </div> <p class="news-text"><a
-href="@PACKAGE_URL at polypaudio-0.6.tar.gz">Version 0.6</a> released;
+href="@PACKAGE_URL at pulseaudio-0.6.tar.gz">Version 0.6</a> released;
 changes include: TCP wrappers support; don't load the complete sound
 file into memory when playing back using <tt>pa_play_file()</tt>;
 autoload API change; don't load all sound files as FLOAT32; shorten
@@ -91,14 +91,14 @@
 STDERR on SIGHUP; new options for <tt>pacat</tt>: allow sample type specification.</p>
 
 <div class="news-date">Mon Sep 24 2004: </div> <p class="news-text"><a
-href="@PACKAGE_URL at polypaudio-0.5.1.tar.gz">Version 0.5.1</a> released;
+href="@PACKAGE_URL at pulseaudio-0.5.1.tar.gz">Version 0.5.1</a> released;
 changes include: improve esound protocol compatibility; fix
 autospawning via <tt>libesd</tt>; make use of POSIX capabilities;
 allow <tt>SCHED_FIFO</tt> scheduling only for users in group
 <tt>realtime</tt>; minor build system fix.</p>
 
 <div class="news-date">Mon Sep 20 2004: </div> <p class="news-text"><a
-href="@PACKAGE_URL at polypaudio-0.5.tar.gz">Version 0.5</a> released;
+href="@PACKAGE_URL at pulseaudio-0.5.tar.gz">Version 0.5</a> released;
 changes include: extensive API improvements, new module
 <tt>module-combine</tt> for combining multiple sound cards into one,
 gcc 2.95 compatibility, configuration files, add "lazy" samples,
@@ -106,29 +106,29 @@
 <tt>module-pipe-source</tt>, many other fixes and improvements.</p>
 
 <div class="news-date">Wed Sep 8 2004: </div> <p class="news-text"><a
-href="@PACKAGE_URL at polypaudio-0.4.tar.gz">Version 0.4</a> released;
+href="@PACKAGE_URL at pulseaudio-0.4.tar.gz">Version 0.4</a> released;
 changes include: daemon auto spawning, support for <tt>SCHED_FIFO</tt> scheduling, three new modules, proper logging, CPU load watchdog, many fixes.</p>
 
 <div class="news-date">Fri Aug 27 2004: </div> <p class="news-text"><a
-href="@PACKAGE_URL at polypaudio-0.3.tar.gz">Version 0.3</a> released;
+href="@PACKAGE_URL at pulseaudio-0.3.tar.gz">Version 0.3</a> released;
 changes include: support for both glib 2.0 and glib 1.2, future cancellation, API updates, many fixes, relicense client library to LGPL.</p>
 
 <div class="news-date">Fri Aug 20 2004: </div> <p class="news-text"><a
-href="@PACKAGE_URL at polypaudio-0.2.tar.gz">Version 0.2</a> released;
+href="@PACKAGE_URL at pulseaudio-0.2.tar.gz">Version 0.2</a> released;
 changes include: added sample cache, introspection API, client API
 documentation, module autoloading, glib support, a module for intercepting X11 bell events, and much more.</p>
 
 <div class="news-date">Sat Jul 17 2004: </div> <p class="news-text"><a
-href="@PACKAGE_URL at polypaudio-0.1.tar.gz">Version 0.1</a> released</p>
+href="@PACKAGE_URL at pulseaudio-0.1.tar.gz">Version 0.1</a> released</p>
 
 <h2><a name="overview">Overview</a></h2>
 
-<p><tt>polypaudio</tt> is a networked sound server for Linux and other
+<p><tt>pulseaudio</tt> is a networked sound server for Linux and other
 Unix like operating systems and Microsoft Windows. It is intended to be an improved drop-in
 replacement for the <a
 href="http://www.tux.org/~ricdude/apps.html">Enlightened Sound
 Daemon</a> (ESOUND). In addition to the features ESOUND provides
-<tt>polypaudio</tt> has:</p>
+<tt>pulseaudio</tt> has:</p>
 
 <ul>
   <li>Extensible plugin architecture (by loading dynamic loadable modules with <tt>dlopen()</tt>)</li>
@@ -150,8 +150,8 @@
 use of a simple main loop abstraction layer. This allows easy
 integration with asynchronous applications using the
 <tt>glib</tt>/<tt>gtk</tt> mainloop. Since the asynchronous API
-available through <tt>polyplib</tt> is quite difficult to use there is
-a simplified synchronous API wrapper <tt>polyplib-simple</tt>
+available through <tt>pulselib</tt> is quite difficult to use there is
+a simplified synchronous API wrapper <tt>pulselib-simple</tt>
 available. A simple main loop implementation is available as well.</p>
 
 <p>The following modules are currently available:</p>
@@ -169,9 +169,9 @@
   <li><tt>module-x11-bell</tt>: play a sample from the sample cache on every X11 bell event.</li>
   <li><tt>module-x11-publish</tt>: store Polypaudio credentials in the X11 root window.</li>
   <li><tt>module-esound-protocol-tcp</tt>, <tt>module-esound-protocol-unix</tt>: <a href="http://www.tux.org/~ricdude/apps.html">ESOUND</a> compatibility modules (for TCP/IP resp. UNIX domain sockets)</li>
-  <li><tt>module-native-protocol-tcp</tt>, <tt>module-native-protocol-unix</tt>: Native polypaudio protocol (for TCP/IP resp. UNIX domain sockets)</li>
+  <li><tt>module-native-protocol-tcp</tt>, <tt>module-native-protocol-unix</tt>: Native pulseaudio protocol (for TCP/IP resp. UNIX domain sockets)</li>
   <li><tt>module-simple-protocol-tcp</tt>, <tt>module-simple-protocol-unix</tt>: Simplistic protocol for playback/capture for usage with tools like <tt>netcat</tt> (for TCP/IP resp. UNIX domain sockets)</li>
-  <li><tt>module-cli-protocol-tcp</tt>, <tt>module-cli-protocol-unix</tt>, <tt>module-cli</tt>: Expose polypaudio's internals whith a simple command line interface. (for TCP/IP resp. UNIX domain sockets resp. STDIN/STDOUT)</li>
+  <li><tt>module-cli-protocol-tcp</tt>, <tt>module-cli-protocol-unix</tt>, <tt>module-cli</tt>: Expose pulseaudio's internals whith a simple command line interface. (for TCP/IP resp. UNIX domain sockets resp. STDIN/STDOUT)</li>
   <li><tt>module-http-protocol-tcp</tt>: Spawns a small HTTP server which can be used to introspect the Polypaudio server with a web browser.</li>
   <li><tt>module-tunnel-sink</tt>, <tt>module-tunnel-source</tt>: make sinks/sources from other hosts available locally.</li>
   <li><tt>module-match</tt>: adjust volume automatically for newly created playback streams based on a regular expression matching table.</li>
@@ -186,7 +186,7 @@
   <li><tt>module-jack-sink</tt>, <tt>module-jack-source</tt>: connect to a <a href="http://jackit.sourceforge.net/">JACK Audio Connection Kit</a> server. (A sound server for professional audio production)</li>
 </ul>
 
-<p>A GTK GUI manager application for polypaudio is the <a
+<p>A GTK GUI manager application for pulseaudio is the <a
 href="http://0pointer.de/lennart/projects/paman/">Polypaudio
 Manager</a>. Other GTK GUI tool for Polypaudio are the <a
 href="http://0pointer.de/lennart/projects/pavumeter">Polypaudio Volume
@@ -195,10 +195,10 @@
 Control</a> .</p>
 
 <p>There are output plugins for <a
-href="http://0pointer.de/lennart/projects/xmms-polyp/">XMMS</a>, <a
-href="http://0pointer.de/lennart/projects/libao-polyp/">libao</a>
+href="http://0pointer.de/lennart/projects/xmms-pulse/">XMMS</a>, <a
+href="http://0pointer.de/lennart/projects/libao-pulse/">libao</a>
 (merged in <tt>libao</tt> SVN) and <a
-href="http://0pointer.de/lennart/projects/gst-polyp/">gstreamer</a>
+href="http://0pointer.de/lennart/projects/gst-pulse/">gstreamer</a>
 (merged in <tt>gstreamer-plugins</tt> CVS), <a
 href="http://mplayerhq.hu">MPlayer</a> (merged in MPlayer CVS) and <a
 href="http://xine.sf.net/">Xine</a> (merged in Xine CVS). Drivers for
@@ -216,68 +216,68 @@
 href="cli.html"><tt>cli.html</tt></a>, <a
 href="daemon.html"><tt>daemon.html</tt></a> and <a href="FAQ.html"><tt>FAQ.html</tt></a>.</p>
 
-<p>There is a <a href="http://www.edgewall.com/products/trac/">Trac</a> based <a href="http://0pointer.de/trac/polypaudio/">Wiki for Polypaudio</a> available.</p>
+<p>There is a <a href="http://www.edgewall.com/products/trac/">Trac</a> based <a href="http://0pointer.de/trac/pulseaudio/">Wiki for Polypaudio</a> available.</p>
 
 <h3>First Steps</h3>
 
-<p>Simply start the polypaudio daemon with the argument <tt>-nC</tt></p>
-
-<pre>polypaudio -nC</pre>
+<p>Simply start the pulseaudio daemon with the argument <tt>-nC</tt></p>
+
+<pre>pulseaudio -nC</pre>
 
 <p>This will present you a screen like this:</p>
 
-<pre>Welcome to polypaudio! Use "help" for usage information.
+<pre>Welcome to pulseaudio! Use "help" for usage information.
 &gt;&gt;&gt; </pre>
 
 <p>Now you can issue CLI commands as described in <a
 href="cli.html"><tt>cli.html</tt></a>. Another way to start
-<tt>polypaudio</tt> is by specifying a configuration script like that one included in the distribution on the
+<tt>pulseaudio</tt> is by specifying a configuration script like that one included in the distribution on the
 command line :</p>
 
-<pre>polypaudio -nF polypaudio.pa</pre>
+<pre>pulseaudio -nF pulseaudio.pa</pre>
 
 <p>This will load some drivers and protocols automatically.</p>
 
-<p>The best idea is to configure your daemon in <tt>/etc/polypaudio/daemon.conf</tt> and <tt>/etc/polypaudio/default.pa</tt> and to run polypaudio without any arguments.</p>
+<p>The best idea is to configure your daemon in <tt>/etc/pulseaudio/daemon.conf</tt> and <tt>/etc/pulseaudio/default.pa</tt> and to run pulseaudio without any arguments.</p>
 
 <p><b>Beware!</b> Unless you pass the option <tt>--sysconfdir=/etc</tt> to
-<tt>configure</tt>, the directory <tt>/etc/polypaudio/</tt> is really
-<tt>/usr/local/etc/polypaudio/</tt>.</p>
-
-<h3>Developing polypaudio Clients</h3>
+<tt>configure</tt>, the directory <tt>/etc/pulseaudio/</tt> is really
+<tt>/usr/local/etc/pulseaudio/</tt>.</p>
+
+<h3>Developing pulseaudio Clients</h3>
 
 <p>You may browse the <a href="http://www.doxygen.org/">Doxygen</a> generated <a
-href="http://0pointer.de/lennart/projects/polypaudio/doxygen/">programing
+href="http://0pointer.de/lennart/projects/pulseaudio/doxygen/">programing
 documentation</a> for the client API. (Run <tt>make doxygen</tt> to generate this documentation from the source tree)</p>
 
-<h3>Developing polypaudio Modules</h3>
-
-<p>There are several reasons for writing loadable modules for polypaudio:</p>
+<h3>Developing pulseaudio Modules</h3>
+
+<p>There are several reasons for writing loadable modules for pulseaudio:</p>
 
 <ul>
   <li>Extended device driver support</li>
   <li>Protocol support beyond ESOUND's protocol and the native protocol. (such as NAS or a subset of aRts)</li>
   <li>New programming interfaces such as XMLRPC or DBUS for controlling the daemon.</li>
-  <li>Hooking audio event sources directly into polypaudio (similar to <tt>module-x11-bell</tt>)</li>
-  <li>For low latency applications such as VOIP: load the VOIP core directly into polypaudio and have a slim GUI frontend to control it.</li>
+  <li>Hooking audio event sources directly into pulseaudio (similar to <tt>module-x11-bell</tt>)</li>
+  <li>For low latency applications such as VOIP: load the VOIP core directly into pulseaudio and have a slim GUI frontend to control it.</li>
 </ul>
 
 <p>There is currently no documentation how to write loadable modules
-for polypaudio. <i>Read the source, Luke!</i> If you are interested in
+for pulseaudio. <i>Read the source, Luke!</i> If you are interested in
 writing new modules feel free to contact the author in case you have any
 questions.</p>
 
 <h2><a name="requirements">Requirements</a></h2>
 
-<p>Currently, <tt>polypaudio</tt> is tested on Linux, FreeBSD, Solaris and Microsoft Windows. It requires an OSS, ALSA, Win32 or Solaris compatible soundcard.</p>
-
-<p><tt>polypaudio</tt> was developed and tested on Debian GNU/Linux
+<p>Currently, <tt>pulseaudio</tt> is tested on Linux, FreeBSD, Solaris and Microsoft Windows. It requires an OSS, ALSA, Win32 or Solaris compatible soundcard.</p>
+
+<p><tt>pulseaudio</tt> was developed and tested on Debian GNU/Linux
 "testing" from November 2004, it should work on most other Linux
 distributions (and maybe Unix versions) since it uses GNU autoconf and
 GNU libtool for source code configuration and shared library
 management.</p>
 
-<p><tt>polypaudio</tt> needs <a
+<p><tt>pulseaudio</tt> needs <a
 href="http://www.mega-nerd.com/SRC/">Secret Rabbit Code (aka
 <tt>libsamplerate</tt>)</a>, <a
 href="http://www.mega-nerd.com/libsndfile"><tt>libsndfile</tt></a>, <a
@@ -296,7 +296,7 @@
 <tt>./configure</tt> inside the distribution directory for configuring
 the source tree. After that you should run <tt>make</tt> for
 compilation and <tt>make install</tt> (as root) for installation of
-<tt>polypaudio</tt>.</p>
+<tt>pulseaudio</tt>.</p>
 
 <h2><a name="acks">Acknowledgements</a></h2>
 
@@ -318,25 +318,25 @@
 
 <p>The newest release is always available from <a href="@PACKAGE_URL@">@PACKAGE_URL@</a></p>
 
-<p>The current release is <a href="@PACKAGE_URL at polypaudio-@PACKAGE_VERSION at .tar.gz">@PACKAGE_VERSION@</a></p>
-
-<p>Get <tt>polypaudio</tt>'s development sources from the <a href="http://subversion.tigris.org/">Subversion</a> <a href="svn://0pointer.de/polypaudio">repository</a> (<a href="http://0pointer.de/cgi-bin/viewcvs.cgi/?root=polypaudio">viewcvs</a>): </p>
-
-<pre>svn checkout svn://0pointer.de/polypaudio/trunk polypaudio</pre>
+<p>The current release is <a href="@PACKAGE_URL at pulseaudio-@PACKAGE_VERSION at .tar.gz">@PACKAGE_VERSION@</a></p>
+
+<p>Get <tt>pulseaudio</tt>'s development sources from the <a href="http://subversion.tigris.org/">Subversion</a> <a href="svn://0pointer.de/pulseaudio">repository</a> (<a href="http://0pointer.de/cgi-bin/viewcvs.cgi/?root=pulseaudio">viewcvs</a>): </p>
+
+<pre>svn checkout svn://0pointer.de/pulseaudio/trunk pulseaudio</pre>
 
 <h2><a name="community">Community</a></h2>
 
-<p>If you want to be notified whenever I release a new version of this software use the subscription feature of <a href="http://freshmeat.net/projects/polypaudio/">Freshmeat</a>.</p>
-
-<p>There is a general discussion <a href="https://tango.0pointer.de/mailman/listinfo/polypaudio-discuss">mailing list for polypaudio</a> available. In addition, you can subscribe to <a href="https://tango.0pointer.de/mailman/listinfo/polypaudio-commits">SVN changes</a> and <a href="https://tango.0pointer.de/mailman/listinfo/polypaudio-tickets">Trac Tickets</a>.</p>
-
-<p>Polypaudio is being tracked at <a href="http://cia.navi.cx/stats/project/polypaudio">CIA</a>.</p>
-
-<p>There's a chance to meet the Polypaudio developers on our <a href="irc://irc.freenode.org/polypaudio">IRC channel #polypaudio on irc.freenode.org</a>.</p>
-
-<p>There is a <a href="http://www.edgewall.com/products/trac/">Trac</a> based <a href="http://0pointer.de/trac/polypaudio/">Wiki for Polypaudio</a> available.</p>
-
-<p><b>Please report bugs to <a href="http://0pointer.de/trac/polypaudio/newticket">our Trac ticket system</a>.</b></p>
+<p>If you want to be notified whenever I release a new version of this software use the subscription feature of <a href="http://freshmeat.net/projects/pulseaudio/">Freshmeat</a>.</p>
+
+<p>There is a general discussion <a href="https://tango.0pointer.de/mailman/listinfo/pulseaudio-discuss">mailing list for pulseaudio</a> available. In addition, you can subscribe to <a href="https://tango.0pointer.de/mailman/listinfo/pulseaudio-commits">SVN changes</a> and <a href="https://tango.0pointer.de/mailman/listinfo/pulseaudio-tickets">Trac Tickets</a>.</p>
+
+<p>Polypaudio is being tracked at <a href="http://cia.navi.cx/stats/project/pulseaudio">CIA</a>.</p>
+
+<p>There's a chance to meet the Polypaudio developers on our <a href="irc://irc.freenode.org/pulseaudio">IRC channel #pulseaudio on irc.freenode.org</a>.</p>
+
+<p>There is a <a href="http://www.edgewall.com/products/trac/">Trac</a> based <a href="http://0pointer.de/trac/pulseaudio/">Wiki for Polypaudio</a> available.</p>
+
+<p><b>Please report bugs to <a href="http://0pointer.de/trac/pulseaudio/newticket">our Trac ticket system</a>.</b></p>
 
 <hr/>
 <address class="grey">Lennart Poettering &lt;@PACKAGE_BUGREPORT@&gt;, June 2006</address>

Modified: trunk/doc/cli.html.in
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/doc/cli.html.in?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/doc/cli.html.in (original)
+++ trunk/doc/cli.html.in Mon Jun 19 23:53:48 2006
@@ -2,14 +2,14 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<title>polypaudio: Simple Command Line Language</title>
+<title>pulseaudio: Simple Command Line Language</title>
 <link rel="stylesheet" type="text/css" href="style.css" />
 </head>
 
 <body>
 <h1>Simple Command Line Language</h1>
 
-<p><tt>polypaudio</tt> provides a simple command line language used by
+<p><tt>pulseaudio</tt> provides a simple command line language used by
 configuration scripts as well as the modules <tt>module-cli</tt>
 and <tt>module-cli-protocol-{unix,tcp}</tt>. Empty lines and lines
 beginning with a hashmark (<tt>#</tt>) are silently ignored. Several
@@ -181,7 +181,7 @@
 
 <h2>Example Configuration Script</h2>
 
-<p>Mark the following script as executable (<tt>chmod +x</tt>) and run it for a sensible polypaudio configuration.</p>
+<p>Mark the following script as executable (<tt>chmod +x</tt>) and run it for a sensible pulseaudio configuration.</p>
 
 <pre>
 #!/usr/bin/polaudio -nF

Modified: trunk/doc/daemon.html.in
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/doc/daemon.html.in?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/doc/daemon.html.in (original)
+++ trunk/doc/daemon.html.in Mon Jun 19 23:53:48 2006
@@ -2,7 +2,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<title>polypaudio: Daemon</title>
+<title>pulseaudio: Daemon</title>
 <link rel="stylesheet" type="text/css" href="style.css" />
 </head>
 
@@ -11,7 +11,7 @@
 
 <h2>Command Line Arguments</h2>
 
-The <tt>polypaudio</tt> daemon accepts several command line arguments:
+The <tt>pulseaudio</tt> daemon accepts several command line arguments:
 
 <pre>
 COMMANDS:
@@ -58,9 +58,9 @@
 
 <p>It is a good idea to run the daemon like this:</p>
 
-<pre>polypaudio -D</pre>
+<pre>pulseaudio -D</pre>
 
-<p>This will run <tt>/etc/polypaudio/default.pa</tt> after startup. This should be a script written in the CLI language described in <a href="cli.html">cli.html</a>. </p>
+<p>This will run <tt>/etc/pulseaudio/default.pa</tt> after startup. This should be a script written in the CLI language described in <a href="cli.html">cli.html</a>. </p>
 
 <h2>Signals</h2>
 

Modified: trunk/doc/modules.html.in
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/doc/modules.html.in?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/doc/modules.html.in (original)
+++ trunk/doc/modules.html.in Mon Jun 19 23:53:48 2006
@@ -2,7 +2,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<title>polypaudio: Loadable Modules</title>
+<title>pulseaudio: Loadable Modules</title>
 <link rel="stylesheet" type="text/css" href="style.css" />
 </head>
 
@@ -10,7 +10,7 @@
 
 <h1>Loadable Modules</h1>
 
-<p>The following loadable modules are provided with the <tt>polypaudio</tt> distribution:</p>
+<p>The following loadable modules are provided with the <tt>pulseaudio</tt> distribution:</p>
 
 <h2>Device Drivers</h2>
 
@@ -157,7 +157,7 @@
 <h3>module-tunnel-{sink,source}</h3>
 
 <p>Tunnel a remote sink/source to a local "ghost"
-sink/source. Requires a running polypaudio daemon on the remote server
+sink/source. Requires a running pulseaudio daemon on the remote server
 with <tt>module-native-protocol-tcp</tt> loaded. It's probably a
 better idea to connect to the remote sink/source directly since some
 buffer control is lost through this tunneling.</p>
@@ -204,7 +204,7 @@
 <h3>module-cli-protocol-{unix,tcp}</h3>
 
 <p>An implemenation of a simple command line based protocol for
-controlling the <tt>polypaudio</tt> daemon. If loaded, the user may
+controlling the <tt>pulseaudio</tt> daemon. If loaded, the user may
 connect with tools like <tt>netcat</tt>, <tt>telnet</tt> or
 <a href="http://0pointer.de/lennart/projects/bidilink/"><tt>bidilink</tt></a> to the listening sockets and execute commands the
 same way as with <tt>module-cli</tt>.</p>
@@ -225,7 +225,7 @@
 a numerical binary value. If 1 the socket is bound to the loopback
 device, i.e. not publicly accessible. (defaults to 1)</td></tr>
   <tr><td><tt>listen=</tt></td><td>(only for <tt>-tcp</tt>) The IP address to listen on. If specified, supersedes the value specified in <tt>loopback=</tt></td></tr>
-  <tr><td><tt>socket=</tt></td><td>(only for <tt>-unix</tt>) The UNIX socket name (defaults to <tt>/tmp/polypaudio/cli</tt>)</td></tr>
+  <tr><td><tt>socket=</tt></td><td>(only for <tt>-unix</tt>) The UNIX socket name (defaults to <tt>/tmp/pulseaudio/cli</tt>)</td></tr>
 </table>
 
 <h3>module-simple-protocol-{unix,tcp}</h3>
@@ -254,7 +254,7 @@
 <p>An implemenation of a protocol compatible with the <a
 href="http://www.tux.org/~ricdude/EsounD.html">Enlightened Sound
 Daemon</a> (ESOUND, <tt>esd</tt>). When you load this module you may
-access the <tt>polypaudio</tt> daemon with tools like <tt>esdcat</tt>,
+access the <tt>pulseaudio</tt> daemon with tools like <tt>esdcat</tt>,
 <tt>esdrec</tt> or even <tt>esdctl</tt>. Many applications, such as
 XMMS, include support for this protocol.</p>
 
@@ -273,7 +273,7 @@
 
 <h3>module-native-protocol-{unix,tcp}</h3>
 
-<p>The native protocol of <tt>polypaudio</tt>.</p>
+<p>The native protocol of <tt>pulseaudio</tt>.</p>
 
 <p>See <tt>module-cli-protocol-{unix,tcp}</tt> for more information
 about the two possible suffixes of this module.</p>
@@ -293,7 +293,7 @@
 <h3>module-http-protocol-tcp</h3>
 
 <p>A proof-of-concept HTTP module, which can be used to introspect
-the current status of the polypaudio daemon using HTTP. Just load this
+the current status of the pulseaudio daemon using HTTP. Just load this
 module and point your browser to <a
 href="http://localhost:4714/">http://localhost:4714/</a>. This module takes the same arguments
 as <tt>module-cli-protocol-tcp</tt>.</p>
@@ -347,7 +347,7 @@
 
 <table>
   <tr><td><tt>config=</tt></td><td>The LIRC configuration file</td></tr>
-  <tr><td><tt>appname=</tt></td><td>The application name to pass to LIRC (defaults to <tt>polypaudio</tt>)</td></tr>
+  <tr><td><tt>appname=</tt></td><td>The application name to pass to LIRC (defaults to <tt>pulseaudio</tt>)</td></tr>
   <tr><td><tt>sink=</tt></td><td>The sink to control</td></tr>
 </table>
 
@@ -430,7 +430,7 @@
 <table>
   <tr><td><tt>sink_name=</tt></td><td>The name for the Polypaudio sink. If ommited defaults to <tt>jack_out</tt>.</td></tr>
   <tr><td><tt>server_name=</tt></td><td>The JACK server to connect to. If ommited defaults to the default server.</td></tr>
-  <tr><td><tt>client_name=</tt></td><td>The client name to tell the JACK server. If ommited defaults to <tt>polypaudio</tt>.</td></tr>
+  <tr><td><tt>client_name=</tt></td><td>The client name to tell the JACK server. If ommited defaults to <tt>pulseaudio</tt>.</td></tr>
   <tr><td><tt>channels=</tt></td><td>Number of channels to register. If ommited defaults to the number of physical playback ports of the JACK server.</td></tr>
   <tr><td><tt>connect=</tt></td><td>Takes a boolean value. If enabled (the default) Polypaudio will try to connect its ports to the physicial playback ports of the JACK server</td></tr>
 </table>
@@ -455,18 +455,18 @@
 
 <h3>module-esound-compat-spawnfd</h3>
 
-<p>This is a compatibility module for <tt>libesd</tt> based autospawning of polypaudio. Don't use it directly.</p>
+<p>This is a compatibility module for <tt>libesd</tt> based autospawning of pulseaudio. Don't use it directly.</p>
 
 <h3>module-esound-compat-spawnpid</h3>
 
-<p>This is a compatibility module for <tt>libesd</tt> based autospawning of polypaudio. Don't use it directly.</p>
+<p>This is a compatibility module for <tt>libesd</tt> based autospawning of pulseaudio. Don't use it directly.</p>
 
 <h3>module-match</h3>
 
 <p>Adjust the volume of a playback stream automatically based on its name.</p>
 
 <table>
-  <tr><td><tt>table=</tt></td><td>The regular expression matching table file to use (defaults to <tt>~/.polypaudio/match.table</tt>)</td></tr>
+  <tr><td><tt>table=</tt></td><td>The regular expression matching table file to use (defaults to <tt>~/.pulseaudio/match.table</tt>)</td></tr>
 </table>
 
 <p>The table file should contain a regexp and volume on each line, seperated by spaces. An example:</p>
@@ -482,7 +482,7 @@
 <p>Adjust the volume of a playback stream automatically based on its name.</p>
 
 <table>
-  <tr><td><tt>table=</tt></td><td>The table file to use (defaults to <tt>~/.polypaudio/volume.table</tt>)</td></tr>
+  <tr><td><tt>table=</tt></td><td>The table file to use (defaults to <tt>~/.pulseaudio/volume.table</tt>)</td></tr>
 </table>
 
 <p>In contrast to <tt>module-match</tt> this module needs no explicit

Modified: trunk/doc/style.css
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/doc/style.css?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/doc/style.css (original)
+++ trunk/doc/style.css Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
- * This file is part of polypaudio.
+ * This file is part of PulseAudio.
  *
- * polypaudio is free software; you can redistribute it and/or modify it
+ * PulseAudio is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * polypaudio is distributed in the hope that it will be useful, but
+ * PulseAudio 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 Lesser General Public License
- * along with polypaudio; if not, write to the Free Software Foundation,
+ * along with PulseAudio; if not, write to the Free Software Foundation,
  * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  ***/
 

Modified: trunk/doxygen/Makefile.am
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/doxygen/Makefile.am?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/doxygen/Makefile.am (original)
+++ trunk/doxygen/Makefile.am Mon Jun 19 23:53:48 2006
@@ -1,19 +1,19 @@
 # $Id$
 #
-# This file is part of polypaudio.
+# This file is part of PulseAudio.
 #
-# polypaudio is free software; you can redistribute it and/or modify
+# PulseAudio is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 #
-# polypaudio is distributed in the hope that it will be useful, but
+# PulseAudio 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 Lesser General Public License
-# along with polypaudio; if not, write to the Free Software
+# along with PulseAudio; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 

Modified: trunk/doxygen/doxygen.conf.in
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/doxygen/doxygen.conf.in?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/doxygen/doxygen.conf.in (original)
+++ trunk/doxygen/doxygen.conf.in Mon Jun 19 23:53:48 2006
@@ -17,7 +17,7 @@
 # The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
 # by quotes) that should identify the project.
 
-PROJECT_NAME           = @PACKAGE_NAME@
+PROJECT_NAME           = PulseAudio
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number. 
 # This could be handy for archiving the generated documentation or 
@@ -417,7 +417,7 @@
 # directories like "/usr/src/myproject". Separate the files or directories 
 # with spaces.
 
-INPUT                  = ../src/polyp/context.h ../src/polyp/stream.h ../src/polyp/polypaudio.h ../src/polyp/sample.h ../src/polyp/def.h ../src/polyp/subscribe.h ../src/polyp/introspect.h ../src/polyp/scache.h ../src/polyp/mainloop-api.h ../src/polyp/glib-mainloop.h ../src/polyp/mainloop.h ../src/polyp/mainloop-signal.h ../src/polyp/error.h ../src/polyp/operation.h ../src/polyp/simple.h ../src/polyp/version.h ../src/polyp/volume.h ../src/polyp/channelmap.h ../src/polyp/thread-mainloop.h ../src/polyp/xmalloc.h ../src/polyp/utf8.h ../src/polyp/util.h ../src/polyp/timeval.h
+INPUT                  = ../src/pulse/context.h ../src/pulse/stream.h ../src/pulse/pulseaudio.h ../src/pulse/sample.h ../src/pulse/def.h ../src/pulse/subscribe.h ../src/pulse/introspect.h ../src/pulse/scache.h ../src/pulse/mainloop-api.h ../src/pulse/glib-mainloop.h ../src/pulse/mainloop.h ../src/pulse/mainloop-signal.h ../src/pulse/error.h ../src/pulse/operation.h ../src/pulse/simple.h ../src/pulse/version.h ../src/pulse/volume.h ../src/pulse/channelmap.h ../src/pulse/thread-mainloop.h ../src/pulse/xmalloc.h ../src/pulse/utf8.h ../src/pulse/util.h ../src/pulse/timeval.h
 
 # If the value of the INPUT tag contains directories, you can use the 
 # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 

Copied: trunk/libpulse-browse.pc.in (from r1031, trunk/polyplib-browse.pc.in)
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/libpulse-browse.pc.in?p2=trunk/libpulse-browse.pc.in&p1=trunk/polyplib-browse.pc.in&r1=1031&r2=1033&rev=1033&root=pulseaudio&view=diff
==============================================================================
--- trunk/polyplib-browse.pc.in (original)
+++ trunk/libpulse-browse.pc.in Mon Jun 19 23:53:48 2006
@@ -3,9 +3,9 @@
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include
 
-Name: polyplib-browse
-Description: Polypaudio network browsing API
+Name: libpuls-browse
+Description: PulseAudio Network Browsing API
 Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lpolyp-browse
+Libs: -L${libdir} -lpulse-browse
 Cflags: -D_REENTRANT -I${includedir}
-Requires: polyplib
+Requires: libpulse

Copied: trunk/libpulse-glib-mainloop.pc.in (from r1031, trunk/polyplib-glib-mainloop.pc.in)
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/libpulse-glib-mainloop.pc.in?p2=trunk/libpulse-glib-mainloop.pc.in&p1=trunk/polyplib-glib-mainloop.pc.in&r1=1031&r2=1033&rev=1033&root=pulseaudio&view=diff
==============================================================================
--- trunk/polyplib-glib-mainloop.pc.in (original)
+++ trunk/libpulse-glib-mainloop.pc.in Mon Jun 19 23:53:48 2006
@@ -3,9 +3,9 @@
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include
 
-Name: polyplib-glib-mainloop
-Description: GLIB main loop wrapper for polypaudio
+Name: libpulse-glib-mainloop
+Description: GLIB 2.0 Main Loop Wrapper for PulseAudio
 Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lpolyp-mainloop-glib
+Libs: -L${libdir} -lpulse-mainloop-glib
 Cflags: -D_REENTRANT -I${includedir}
-Requires: polyplib glib-2.0
+Requires: libpulse glib-2.0

Copied: trunk/libpulse-glib12-mainloop.pc.in (from r1031, trunk/polyplib-glib12-mainloop.pc.in)
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/libpulse-glib12-mainloop.pc.in?p2=trunk/libpulse-glib12-mainloop.pc.in&p1=trunk/polyplib-glib12-mainloop.pc.in&r1=1031&r2=1033&rev=1033&root=pulseaudio&view=diff
==============================================================================
--- trunk/polyplib-glib12-mainloop.pc.in (original)
+++ trunk/libpulse-glib12-mainloop.pc.in Mon Jun 19 23:53:48 2006
@@ -3,9 +3,9 @@
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include
 
-Name: polyplib-glib12-mainloop
-Description: GLIB main loop wrapper for polypaudio
+Name: libpulse-glib12-mainloop
+Description: GLIB 1.2 Main Loop Wrapper for PulseAudio
 Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lpolyp-mainloop-glib12
+Libs: -L${libdir} -lpulse-mainloop-glib12
 Cflags: -D_REENTRANT -I${includedir}
-Requires: polyplib glib
+Requires: libpulse glib

Copied: trunk/libpulse-simple.pc.in (from r1031, trunk/polyplib-simple.pc.in)
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/libpulse-simple.pc.in?p2=trunk/libpulse-simple.pc.in&p1=trunk/polyplib-simple.pc.in&r1=1031&r2=1033&rev=1033&root=pulseaudio&view=diff
==============================================================================
--- trunk/polyplib-simple.pc.in (original)
+++ trunk/libpulse-simple.pc.in Mon Jun 19 23:53:48 2006
@@ -3,9 +3,9 @@
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include
 
-Name: polyplib-simple
-Description: Simplified synchronous client interface to polypaudio
+Name: libpulse-simple
+Description: Simplified Synchronous Client Interface to PulseAudio
 Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lpolyp-simple
+Libs: -L${libdir} -lpulse-simple
 Cflags: -D_REENTRANT -I${includedir}
-Requires: polyplib
+Requires: libpulse

Copied: trunk/libpulse.pc.in (from r1031, trunk/polyplib.pc.in)
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/libpulse.pc.in?p2=trunk/libpulse.pc.in&p1=trunk/polyplib.pc.in&r1=1031&r2=1033&rev=1033&root=pulseaudio&view=diff
==============================================================================
--- trunk/polyplib.pc.in (original)
+++ trunk/libpulse.pc.in Mon Jun 19 23:53:48 2006
@@ -3,9 +3,9 @@
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include
 
-Name: polyplib
-Description: Client interface to polypaudio
+Name: libpulse
+Description: Client Interface to PulseAudio
 Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lpolyp
+Libs: -L${libdir} -lpulse
 Cflags: -D_REENTRANT -I${includedir}
 Requires:

Modified: trunk/src/Makefile.am
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/Makefile.am?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/Makefile.am (original)
+++ trunk/src/Makefile.am Mon Jun 19 23:53:48 2006
@@ -1,19 +1,19 @@
 # $Id$
 #
-# This file is part of polypaudio.
+# This file is part of PulseAudio.
 #
-# polypaudio is free software; you can redistribute it and/or modify
+# PulseAudio is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 #
-# polypaudio is distributed in the hope that it will be useful, but
+# PulseAudio 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 Lesser General Public License
-# along with polypaudio; if not, write to the Free Software
+# along with PulseAudio; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 
@@ -22,19 +22,19 @@
 #       Extra directories         #
 ###################################
 
-polypincludedir=$(includedir)/polyp
-polypcoreincludedir=$(includedir)/polypcore
-polypconfdir=$(sysconfdir)/polypaudio
+pulseincludedir=$(includedir)/pulse
+pulsecoreincludedir=$(includedir)/pulsecore
+pulseconfdir=$(sysconfdir)/pulse
 
 ###################################
 #            Defines              #
 ###################################
 
-POLYPAUDIO_BINARY=$(bindir)/polypaudio$(EXEEXT)
+POLYPAUDIO_BINARY=$(bindir)/pulseaudio$(EXEEXT)
 if OS_IS_WIN32
 DEFAULT_CONFIG_DIR=%POLYP_ROOT%
 else
-DEFAULT_CONFIG_DIR=$(polypconfdir)
+DEFAULT_CONFIG_DIR=$(pulseconfdir)
 endif
 
 ###################################
@@ -73,7 +73,7 @@
 ###################################
 
 EXTRA_DIST = \
-		polyp/client.conf.in \
+		pulse/client.conf.in \
 		daemon/daemon.conf.in \
 		daemon/default.pa.in \
 		depmod.py \
@@ -81,35 +81,35 @@
 		utils/padsp \
 		modules/module-defs.h.m4
 
-polypconf_DATA = \
+pulseconf_DATA = \
 		default.pa \
 		daemon.conf \
 		client.conf
 
 BUILT_SOURCES = \
-		polyp/version.h
+		pulse/version.h
 
 ###################################
 #          Main daemon            #
 ###################################
 
-bin_PROGRAMS = polypaudio
-
-polypaudio_SOURCES = \
+bin_PROGRAMS = pulseaudio
+
+pulseaudio_SOURCES = \
 		daemon/caps.h daemon/caps.c \
 		daemon/cmdline.c daemon/cmdline.h \
 		daemon/cpulimit.c daemon/cpulimit.h \
 		daemon/daemon-conf.c daemon/daemon-conf.h \
 		daemon/dumpmodules.c daemon/dumpmodules.h \
 		daemon/main.c \
-		polypcore/gccmacro.h
-
-polypaudio_CFLAGS = $(AM_CFLAGS) $(LIBOIL_CFLAGS)
-polypaudio_CPPFLAGS = $(AM_CPPFLAGS) 
-polypaudio_LDADD = $(AM_LDADD) libpolypcore.la $(LIBLTDL) \
+		pulsecore/gccmacro.h
+
+pulseaudio_CFLAGS = $(AM_CFLAGS) $(LIBOIL_CFLAGS)
+pulseaudio_CPPFLAGS = $(AM_CPPFLAGS) 
+pulseaudio_LDADD = $(AM_LDADD) libpulsecore.la $(LIBLTDL) \
 		$(LIBSAMPLERATE_LIBS) $(LIBSNDFILE_LIBS) $(CAP_LIBS) $(LIBOIL_LIBS)
 # This is needed because automake doesn't properly expand the foreach below
-polypaudio_DEPENDENCIES = libpolypcore.la $(PREOPEN_LIBS)
+pulseaudio_DEPENDENCIES = libpulsecore.la $(PREOPEN_LIBS)
 
 if PREOPEN_MODS
 PREOPEN_LIBS = $(PREOPEN_MODS)
@@ -118,9 +118,9 @@
 endif
 
 if FORCE_PREOPEN
-polypaudio_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) -dlpreopen force $(foreach f,$(PREOPEN_LIBS),-dlpreopen $(f))
+pulseaudio_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) -dlpreopen force $(foreach f,$(PREOPEN_LIBS),-dlpreopen $(f))
 else
-polypaudio_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) -dlopen force $(foreach f,$(PREOPEN_LIBS),-dlopen $(f))
+pulseaudio_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) -dlopen force $(foreach f,$(PREOPEN_LIBS),-dlopen $(f))
 endif
 
 ###################################
@@ -147,32 +147,32 @@
 bin_SCRIPTS = esdcompat
 
 pacat_SOURCES = utils/pacat.c
-pacat_LDADD = $(AM_LDADD) libpolyp.la 
+pacat_LDADD = $(AM_LDADD) libpulse.la 
 pacat_CFLAGS = $(AM_CFLAGS) 
 pacat_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
 paplay_SOURCES = utils/paplay.c
-paplay_LDADD = $(AM_LDADD) libpolyp.la $(LIBSNDFILE_LIBS)
+paplay_LDADD = $(AM_LDADD) libpulse.la $(LIBSNDFILE_LIBS)
 paplay_CFLAGS = $(AM_CFLAGS) $(LIBSNDFILE_CFLAGS)
 paplay_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
 pactl_SOURCES = utils/pactl.c
-pactl_LDADD = $(AM_LDADD) libpolyp.la $(LIBSNDFILE_LIBS)
+pactl_LDADD = $(AM_LDADD) libpulse.la $(LIBSNDFILE_LIBS)
 pactl_CFLAGS = $(AM_CFLAGS) $(LIBSNDFILE_CFLAGS)
 pactl_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
-pacmd_SOURCES = utils/pacmd.c polypcore/pid.c polypcore/pid.h
+pacmd_SOURCES = utils/pacmd.c pulsecore/pid.c pulsecore/pid.h
 pacmd_CFLAGS = $(AM_CFLAGS)
-pacmd_LDADD = $(AM_LDADD) libpolyp.la
+pacmd_LDADD = $(AM_LDADD) libpulse.la
 pacmd_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
 pax11publish_SOURCES = utils/pax11publish.c
 pax11publish_CFLAGS = $(AM_CFLAGS) $(X_CFLAGS)
-pax11publish_LDADD = $(AM_LDADD) libpolyp.la $(X_PRE_LIBS) -lX11 $(X_LIBS) $(X_EXTRA_LIBS)
+pax11publish_LDADD = $(AM_LDADD) libpulse.la $(X_PRE_LIBS) -lX11 $(X_LIBS) $(X_EXTRA_LIBS)
 pax11publish_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
 pabrowse_SOURCES = utils/pabrowse.c
-pabrowse_LDADD = $(AM_LDADD) libpolyp.la libpolyp-browse.la
+pabrowse_LDADD = $(AM_LDADD) libpulse.la libpulse-browse.la
 pabrowse_CFLAGS = $(AM_CFLAGS)
 pabrowse_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
@@ -212,81 +212,81 @@
 
 mainloop_test_SOURCES = tests/mainloop-test.c
 mainloop_test_CFLAGS = $(AM_CFLAGS)
-mainloop_test_LDADD = $(AM_LDADD) libpolyp.la
+mainloop_test_LDADD = $(AM_LDADD) libpulse.la
 mainloop_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
 thread_mainloop_test_SOURCES = tests/thread-mainloop-test.c
 thread_mainloop_test_CFLAGS = $(AM_CFLAGS)
-thread_mainloop_test_LDADD = $(AM_LDADD) libpolyp.la
+thread_mainloop_test_LDADD = $(AM_LDADD) libpulse.la
 thread_mainloop_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
 utf8_test_SOURCES = tests/utf8-test.c
 utf8_test_CFLAGS = $(AM_CFLAGS)
-utf8_test_LDADD = $(AM_LDADD) libpolypcore.la
+utf8_test_LDADD = $(AM_LDADD) libpulsecore.la
 utf8_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
 mcalign_test_SOURCES = tests/mcalign-test.c
 mcalign_test_CFLAGS = $(AM_CFLAGS)
-mcalign_test_LDADD = $(AM_LDADD) $(WINSOCK_LIBS) libpolypcore.la
+mcalign_test_LDADD = $(AM_LDADD) $(WINSOCK_LIBS) libpulsecore.la
 mcalign_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
 pacat_simple_SOURCES = tests/pacat-simple.c
-pacat_simple_LDADD = $(AM_LDADD) libpolyp.la libpolyp-simple.la
+pacat_simple_LDADD = $(AM_LDADD) libpulse.la libpulse-simple.la
 pacat_simple_CFLAGS = $(AM_CFLAGS)
 pacat_simple_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
 parec_simple_SOURCES = tests/parec-simple.c
-parec_simple_LDADD = $(AM_LDADD) libpolyp.la libpolyp-simple.la
+parec_simple_LDADD = $(AM_LDADD) libpulse.la libpulse-simple.la
 parec_simple_CFLAGS = $(AM_CFLAGS)
 parec_simple_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
 strlist_test_SOURCES = tests/strlist-test.c
 strlist_test_CFLAGS = $(AM_CFLAGS)
-strlist_test_LDADD = $(AM_LDADD) $(WINSOCK_LIBS) libpolypcore.la libstrlist.la
+strlist_test_LDADD = $(AM_LDADD) $(WINSOCK_LIBS) libpulsecore.la libstrlist.la
 strlist_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
 voltest_SOURCES = tests/voltest.c
 voltest_CFLAGS = $(AM_CFLAGS)
-voltest_LDADD = $(AM_LDADD) libpolyp.la
+voltest_LDADD = $(AM_LDADD) libpulse.la
 voltest_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
 channelmap_test_SOURCES = tests/channelmap-test.c
 channelmap_test_CFLAGS = $(AM_CFLAGS)
-channelmap_test_LDADD = $(AM_LDADD) libpolyp.la
+channelmap_test_LDADD = $(AM_LDADD) libpulse.la
 channelmap_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
 cpulimit_test_SOURCES = tests/cpulimit-test.c daemon/cpulimit.c daemon/cpulimit.h
 cpulimit_test_CFLAGS = $(AM_CFLAGS)
-cpulimit_test_LDADD = $(AM_LDADD) libpolypcore.la
+cpulimit_test_LDADD = $(AM_LDADD) libpulsecore.la
 cpulimit_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
 cpulimit_test2_SOURCES = tests/cpulimit-test.c daemon/cpulimit.c daemon/cpulimit.h
 cpulimit_test2_CFLAGS = $(AM_CFLAGS) -DTEST2
-cpulimit_test2_LDADD = $(AM_LDADD) libpolypcore.la
+cpulimit_test2_LDADD = $(AM_LDADD) libpulsecore.la
 cpulimit_test2_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
 mainloop_test_glib_SOURCES = $(mainloop_test_SOURCES)
 mainloop_test_glib_CFLAGS = $(mainloop_test_CFLAGS) $(GLIB20_CFLAGS) -DGLIB_MAIN_LOOP
-mainloop_test_glib_LDADD = $(mainloop_test_LDADD) $(GLIB20_LIBS) libpolyp-mainloop-glib.la
+mainloop_test_glib_LDADD = $(mainloop_test_LDADD) $(GLIB20_LIBS) libpulse-mainloop-glib.la
 mainloop_test_glib_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
 mainloop_test_glib12_SOURCES = $(mainloop_test_SOURCES)
 mainloop_test_glib12_CFLAGS = $(mainloop_test_CFLAGS) $(GLIB12_CFLAGS) -DGLIB_MAIN_LOOP
-mainloop_test_glib12_LDADD = $(mainloop_test_LDADD) $(GLIB12_LIBS) libpolyp-mainloop-glib12.la
+mainloop_test_glib12_LDADD = $(mainloop_test_LDADD) $(GLIB12_LIBS) libpulse-mainloop-glib12.la
 mainloop_test_glib12_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
 memblockq_test_SOURCES = tests/memblockq-test.c
 memblockq_test_CFLAGS = $(AM_CFLAGS)
-memblockq_test_LDADD = $(AM_LDADD) $(WINSOCK_LIBS) libpolypcore.la
+memblockq_test_LDADD = $(AM_LDADD) $(WINSOCK_LIBS) libpulsecore.la
 memblockq_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
 sync_playback_SOURCES = tests/sync-playback.c
-sync_playback_LDADD = $(AM_LDADD) libpolyp.la
+sync_playback_LDADD = $(AM_LDADD) libpulse.la
 sync_playback_CFLAGS = $(AM_CFLAGS) 
 sync_playback_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
 interpol_test_SOURCES = tests/interpol-test.c
-interpol_test_LDADD = $(AM_LDADD) libpolyp.la
+interpol_test_LDADD = $(AM_LDADD) libpulse.la
 interpol_test_CFLAGS = $(AM_CFLAGS) 
 interpol_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
@@ -294,170 +294,170 @@
 #         Client library          #
 ###################################
 
-polypinclude_HEADERS = \
-		polyp/cdecl.h \
-		polyp/channelmap.h \
-		polyp/context.h \
-		polyp/def.h \
-		polyp/error.h \
-		polyp/introspect.h \
-		polyp/mainloop.h \
-		polyp/mainloop-api.h \
-		polyp/mainloop-signal.h \
-		polyp/operation.h \
-		polyp/polypaudio.h \
-		polyp/sample.h \
-		polyp/scache.h \
-		polyp/simple.h \
-		polyp/stream.h \
-		polyp/subscribe.h \
-		polyp/thread-mainloop.h \
-		polyp/timeval.h \
-		polyp/utf8.h \
-		polyp/util.h \
-		polyp/version.h \
-		polyp/volume.h \
-		polyp/xmalloc.h
+pulseinclude_HEADERS = \
+		pulse/cdecl.h \
+		pulse/channelmap.h \
+		pulse/context.h \
+		pulse/def.h \
+		pulse/error.h \
+		pulse/introspect.h \
+		pulse/mainloop.h \
+		pulse/mainloop-api.h \
+		pulse/mainloop-signal.h \
+		pulse/operation.h \
+		pulse/pulseaudio.h \
+		pulse/sample.h \
+		pulse/scache.h \
+		pulse/simple.h \
+		pulse/stream.h \
+		pulse/subscribe.h \
+		pulse/thread-mainloop.h \
+		pulse/timeval.h \
+		pulse/utf8.h \
+		pulse/util.h \
+		pulse/version.h \
+		pulse/volume.h \
+		pulse/xmalloc.h
 
 if HAVE_HOWL
-polypinclude_HEADERS += \
-		polyp/browser.h
+pulseinclude_HEADERS += \
+		pulse/browser.h
 endif
 
 if HAVE_GLIB20
-polypinclude_HEADERS += \
-		polyp/glib-mainloop.h
+pulseinclude_HEADERS += \
+		pulse/glib-mainloop.h
 else
 if HAVE_GLIB12
-polypinclude_HEADERS += \
-		polyp/glib-mainloop.h
+pulseinclude_HEADERS += \
+		pulse/glib-mainloop.h
 endif
 endif
 
 lib_LTLIBRARIES = \
-		libpolyp.la \
-		libpolyp-simple.la
+		libpulse.la \
+		libpulse-simple.la
 
 if HAVE_HOWL
 lib_LTLIBRARIES += \
-		libpolyp-browse.la
+		libpulse-browse.la
 endif
 
 if HAVE_GLIB20
 lib_LTLIBRARIES += \
-		libpolyp-mainloop-glib.la
+		libpulse-mainloop-glib.la
 endif
 
 if HAVE_GLIB12
 lib_LTLIBRARIES += \
-		libpolyp-mainloop-glib12.la
+		libpulse-mainloop-glib12.la
 endif
 
 # Public interface
-libpolyp_la_SOURCES = \
-		polyp/cdecl.h \
-		polyp/channelmap.c polyp/channelmap.h \
-		polyp/client-conf.c polyp/client-conf.h \
-		polyp/context.c polyp/context.h \
-		polyp/def.h \
-		polyp/error.c polyp/error.h \
-		polyp/internal.h \
-		polyp/introspect.c polyp/introspect.h \
-		polyp/mainloop.c polyp/mainloop.h \
-		polyp/mainloop-api.c polyp/mainloop-api.h \
-		polyp/mainloop-signal.c polyp/mainloop-signal.h \
-		polyp/operation.c polyp/operation.h \
-		polyp/polypaudio.h \
-		polyp/sample.c polyp/sample.h \
-		polyp/scache.c polyp/scache.h \
-		polyp/stream.c polyp/stream.h \
-		polyp/subscribe.c polyp/subscribe.h \
-		polyp/thread-mainloop.c polyp/thread-mainloop.h \
-		polyp/timeval.c polyp/timeval.h \
-		polyp/utf8.c polyp/utf8.h \
-		polyp/util.c polyp/util.h \
-		polyp/volume.c polyp/volume.h \
-		polyp/xmalloc.c polyp/xmalloc.h
-
-# Internal stuff that is shared with libpolypcore
-libpolyp_la_SOURCES += \
-		polypcore/authkey.c polypcore/authkey.h \
-		polypcore/conf-parser.c polypcore/conf-parser.h \
-		polypcore/core-util.c polypcore/core-util.h \
-		polypcore/dynarray.c polypcore/dynarray.h \
-		polypcore/gccmacro.h \
-		polypcore/hashmap.c polypcore/hashmap.h \
-		polypcore/idxset.c polypcore/idxset.h \
-		polypcore/inet_ntop.c polypcore/inet_ntop.h \
-		polypcore/iochannel.c polypcore/iochannel.h \
-		polypcore/llist.h \
-		polypcore/log.c polypcore/log.h \
-		polypcore/mcalign.c polypcore/mcalign.h \
-		polypcore/memblock.c polypcore/memblock.h \
-		polypcore/memblockq.c polypcore/memblockq.h \
-		polypcore/memchunk.c polypcore/memchunk.h \
-		polypcore/native-common.h \
-		polypcore/packet.c polypcore/packet.h \
-		polypcore/parseaddr.c polypcore/parseaddr.h \
-		polypcore/pdispatch.c polypcore/pdispatch.h \
-		polypcore/pipe.c polypcore/pipe.h \
-		polypcore/poll.c polypcore/poll.h \
-		polypcore/pstream.c polypcore/pstream.h \
-		polypcore/pstream-util.c polypcore/pstream-util.h \
-		polypcore/queue.c polypcore/queue.h \
-		polypcore/random.c polypcore/random.h \
-		polypcore/socket-client.c polypcore/socket-client.h \
-		polypcore/socket-util.c polypcore/socket-util.h \
-		polypcore/strbuf.c polypcore/strbuf.h \
-		polypcore/strlist.c polypcore/strlist.h \
-		polypcore/tagstruct.c polypcore/tagstruct.h \
-		polypcore/core-error.c polypcore/core-error.h \
-		polypcore/winsock.h
+libpulse_la_SOURCES = \
+		pulse/cdecl.h \
+		pulse/channelmap.c pulse/channelmap.h \
+		pulse/client-conf.c pulse/client-conf.h \
+		pulse/context.c pulse/context.h \
+		pulse/def.h \
+		pulse/error.c pulse/error.h \
+		pulse/internal.h \
+		pulse/introspect.c pulse/introspect.h \
+		pulse/mainloop.c pulse/mainloop.h \
+		pulse/mainloop-api.c pulse/mainloop-api.h \
+		pulse/mainloop-signal.c pulse/mainloop-signal.h \
+		pulse/operation.c pulse/operation.h \
+		pulse/pulseaudio.h \
+		pulse/sample.c pulse/sample.h \
+		pulse/scache.c pulse/scache.h \
+		pulse/stream.c pulse/stream.h \
+		pulse/subscribe.c pulse/subscribe.h \
+		pulse/thread-mainloop.c pulse/thread-mainloop.h \
+		pulse/timeval.c pulse/timeval.h \
+		pulse/utf8.c pulse/utf8.h \
+		pulse/util.c pulse/util.h \
+		pulse/volume.c pulse/volume.h \
+		pulse/xmalloc.c pulse/xmalloc.h
+
+# Internal stuff that is shared with libpulsecore
+libpulse_la_SOURCES += \
+		pulsecore/authkey.c pulsecore/authkey.h \
+		pulsecore/conf-parser.c pulsecore/conf-parser.h \
+		pulsecore/core-util.c pulsecore/core-util.h \
+		pulsecore/dynarray.c pulsecore/dynarray.h \
+		pulsecore/gccmacro.h \
+		pulsecore/hashmap.c pulsecore/hashmap.h \
+		pulsecore/idxset.c pulsecore/idxset.h \
+		pulsecore/inet_ntop.c pulsecore/inet_ntop.h \
+		pulsecore/iochannel.c pulsecore/iochannel.h \
+		pulsecore/llist.h \
+		pulsecore/log.c pulsecore/log.h \
+		pulsecore/mcalign.c pulsecore/mcalign.h \
+		pulsecore/memblock.c pulsecore/memblock.h \
+		pulsecore/memblockq.c pulsecore/memblockq.h \
+		pulsecore/memchunk.c pulsecore/memchunk.h \
+		pulsecore/native-common.h \
+		pulsecore/packet.c pulsecore/packet.h \
+		pulsecore/parseaddr.c pulsecore/parseaddr.h \
+		pulsecore/pdispatch.c pulsecore/pdispatch.h \
+		pulsecore/pipe.c pulsecore/pipe.h \
+		pulsecore/poll.c pulsecore/poll.h \
+		pulsecore/pstream.c pulsecore/pstream.h \
+		pulsecore/pstream-util.c pulsecore/pstream-util.h \
+		pulsecore/queue.c pulsecore/queue.h \
+		pulsecore/random.c pulsecore/random.h \
+		pulsecore/socket-client.c pulsecore/socket-client.h \
+		pulsecore/socket-util.c pulsecore/socket-util.h \
+		pulsecore/strbuf.c pulsecore/strbuf.h \
+		pulsecore/strlist.c pulsecore/strlist.h \
+		pulsecore/tagstruct.c pulsecore/tagstruct.h \
+		pulsecore/core-error.c pulsecore/core-error.h \
+		pulsecore/winsock.h
 
 if OS_IS_WIN32
-libpolyp_la_SOURCES += \
-		polypcore/dllmain.c 
+libpulse_la_SOURCES += \
+		pulsecore/dllmain.c 
 endif
 
 if HAVE_X11
-libpolyp_la_SOURCES += \
-		polyp/client-conf-x11.c polyp/client-conf-x11.h \
-		polypcore/x11prop.c polypcore/x11prop.h
-endif
-
-libpolyp_la_CFLAGS = $(AM_CFLAGS)
-libpolyp_la_LDFLAGS = -version-info $(LIBPOLYP_VERSION_INFO)
-libpolyp_la_LIBADD = $(AM_LIBADD) $(WINSOCK_LIBS) $(LIBICONV)
+libpulse_la_SOURCES += \
+		pulse/client-conf-x11.c pulse/client-conf-x11.h \
+		pulsecore/x11prop.c pulsecore/x11prop.h
+endif
+
+libpulse_la_CFLAGS = $(AM_CFLAGS)
+libpulse_la_LDFLAGS = -version-info $(LIBPOLYP_VERSION_INFO)
+libpulse_la_LIBADD = $(AM_LIBADD) $(WINSOCK_LIBS) $(LIBICONV)
 
 if HAVE_X11
-libpolyp_la_CFLAGS += $(X_CFLAGS)
-libpolyp_la_LDFLAGS += $(X_PRE_LIBS) -lX11 $(X_LIBS) $(X_EXTRA_LIBS)
+libpulse_la_CFLAGS += $(X_CFLAGS)
+libpulse_la_LDFLAGS += $(X_PRE_LIBS) -lX11 $(X_LIBS) $(X_EXTRA_LIBS)
 endif
 
 if HAVE_LIBASYNCNS
-libpolyp_la_CFLAGS += $(LIBASYNCNS_CFLAGS)
-libpolyp_la_LIBADD += $(LIBASYNCNS_LIBS)
-endif
-
-libpolyp_simple_la_SOURCES = polyp/simple.c polyp/simple.h 
-libpolyp_simple_la_CFLAGS = $(AM_CFLAGS)
-libpolyp_simple_la_LIBADD = $(AM_LIBADD) libpolyp.la
-libpolyp_simple_la_LDFLAGS = -version-info $(LIBPOLYP_SIMPLE_VERSION_INFO)
-
-libpolyp_browse_la_SOURCES = polyp/browser.c polyp/browser.h 
-libpolyp_browse_la_CFLAGS = $(AM_CFLAGS) $(HOWL_CFLAGS)
-libpolyp_browse_la_LIBADD = $(AM_LIBADD) libpolyp.la $(HOWL_LIBS)
-libpolyp_browse_la_LDFLAGS = -version-info $(LIBPOLYP_BROWSE_VERSION_INFO)
-
-libpolyp_mainloop_glib_la_SOURCES = polyp/glib-mainloop.h polyp/glib-mainloop.c
-libpolyp_mainloop_glib_la_CFLAGS = $(AM_CFLAGS) $(GLIB20_CFLAGS)
-libpolyp_mainloop_glib_la_LIBADD = $(AM_LIBADD) libpolyp.la $(GLIB20_LIBS)
-libpolyp_mainloop_glib_la_LDFLAGS = -version-info $(LIBPOLYP_MAINLOOP_GLIB_VERSION_INFO)
-
-libpolyp_mainloop_glib12_la_SOURCES = polyp/glib-mainloop.h polyp/glib12-mainloop.c
-libpolyp_mainloop_glib12_la_CFLAGS = $(AM_CFLAGS) $(GLIB12_CFLAGS)
-libpolyp_mainloop_glib12_la_LIBADD = $(AM_LIBADD) libpolyp.la $(GLIB12_LIBS)
-libpolyp_mainloop_glib12_la_LDFLAGS = -version-info $(LIBPOLYP_MAINLOOP_GLIB_VERSION_INFO)
+libpulse_la_CFLAGS += $(LIBASYNCNS_CFLAGS)
+libpulse_la_LIBADD += $(LIBASYNCNS_LIBS)
+endif
+
+libpulse_simple_la_SOURCES = pulse/simple.c pulse/simple.h 
+libpulse_simple_la_CFLAGS = $(AM_CFLAGS)
+libpulse_simple_la_LIBADD = $(AM_LIBADD) libpulse.la
+libpulse_simple_la_LDFLAGS = -version-info $(LIBPOLYP_SIMPLE_VERSION_INFO)
+
+libpulse_browse_la_SOURCES = pulse/browser.c pulse/browser.h 
+libpulse_browse_la_CFLAGS = $(AM_CFLAGS) $(HOWL_CFLAGS)
+libpulse_browse_la_LIBADD = $(AM_LIBADD) libpulse.la $(HOWL_LIBS)
+libpulse_browse_la_LDFLAGS = -version-info $(LIBPOLYP_BROWSE_VERSION_INFO)
+
+libpulse_mainloop_glib_la_SOURCES = pulse/glib-mainloop.h pulse/glib-mainloop.c
+libpulse_mainloop_glib_la_CFLAGS = $(AM_CFLAGS) $(GLIB20_CFLAGS)
+libpulse_mainloop_glib_la_LIBADD = $(AM_LIBADD) libpulse.la $(GLIB20_LIBS)
+libpulse_mainloop_glib_la_LDFLAGS = -version-info $(LIBPOLYP_MAINLOOP_GLIB_VERSION_INFO)
+
+libpulse_mainloop_glib12_la_SOURCES = pulse/glib-mainloop.h pulse/glib12-mainloop.c
+libpulse_mainloop_glib12_la_CFLAGS = $(AM_CFLAGS) $(GLIB12_CFLAGS)
+libpulse_mainloop_glib12_la_LIBADD = $(AM_LIBADD) libpulse.la $(GLIB12_LIBS)
+libpulse_mainloop_glib12_la_LDFLAGS = -version-info $(LIBPOLYP_MAINLOOP_GLIB_VERSION_INFO)
 
 ###################################
 #         OSS emulation           #
@@ -465,164 +465,164 @@
 
 if HAVE_OSS
 
-lib_LTLIBRARIES += libpolypdsp.la
+lib_LTLIBRARIES += libpulsedsp.la
 
 bin_SCRIPTS += utils/padsp
 
 endif
 
-libpolypdsp_la_SOURCES = utils/padsp.c
-libpolypdsp_la_CFLAGS = $(AM_CFLAGS)
-libpolypdsp_la_LIBADD = $(AM_LIBADD) libpolyp.la
-libpolypdsp_la_LDFLAGS = -avoid-version
+libpulsedsp_la_SOURCES = utils/padsp.c
+libpulsedsp_la_CFLAGS = $(AM_CFLAGS)
+libpulsedsp_la_LIBADD = $(AM_LIBADD) libpulse.la
+libpulsedsp_la_LDFLAGS = -avoid-version
 
 ###################################
 #      Daemon core library        #
 ###################################
 
-polypcoreinclude_HEADERS = \
-		polypcore/autoload.h \
-		polypcore/cli-command.h \
-		polypcore/cli-text.h \
-		polypcore/client.h \
-		polypcore/core.h \
-		polypcore/core-def.h \
-		polypcore/core-scache.h \
-		polypcore/core-subscribe.h \
-		polypcore/conf-parser.h \
-		polypcore/core-util.h \
-		polypcore/dynarray.h \
-		polypcore/g711.h \
-		polypcore/hashmap.h \
-		polypcore/idxset.h \
-		polypcore/log.h \
-		polypcore/mcalign.h \
-		polypcore/memblock.h \
-		polypcore/memblockq.h \
-		polypcore/memchunk.h \
-		polypcore/modargs.h \
-		polypcore/modinfo.h \
-		polypcore/module.h \
-		polypcore/namereg.h \
-		polypcore/pid.h \
-		polypcore/play-memchunk.h \
-		polypcore/props.h \
-		polypcore/queue.h \
-		polypcore/random.h \
-		polypcore/resampler.h \
-		polypcore/sample-util.h \
-		polypcore/sconv.h \
-		polypcore/sink.h \
-		polypcore/sink-input.h \
-		polypcore/sioman.h \
-		polypcore/sound-file.h \
-		polypcore/sound-file-stream.h \
-		polypcore/source.h \
-		polypcore/source-output.h \
-		polypcore/strbuf.h \
-		polypcore/tokenizer.h
-
-lib_LTLIBRARIES += libpolypcore.la
+pulsecoreinclude_HEADERS = \
+		pulsecore/autoload.h \
+		pulsecore/cli-command.h \
+		pulsecore/cli-text.h \
+		pulsecore/client.h \
+		pulsecore/core.h \
+		pulsecore/core-def.h \
+		pulsecore/core-scache.h \
+		pulsecore/core-subscribe.h \
+		pulsecore/conf-parser.h \
+		pulsecore/core-util.h \
+		pulsecore/dynarray.h \
+		pulsecore/g711.h \
+		pulsecore/hashmap.h \
+		pulsecore/idxset.h \
+		pulsecore/log.h \
+		pulsecore/mcalign.h \
+		pulsecore/memblock.h \
+		pulsecore/memblockq.h \
+		pulsecore/memchunk.h \
+		pulsecore/modargs.h \
+		pulsecore/modinfo.h \
+		pulsecore/module.h \
+		pulsecore/namereg.h \
+		pulsecore/pid.h \
+		pulsecore/play-memchunk.h \
+		pulsecore/props.h \
+		pulsecore/queue.h \
+		pulsecore/random.h \
+		pulsecore/resampler.h \
+		pulsecore/sample-util.h \
+		pulsecore/sconv.h \
+		pulsecore/sink.h \
+		pulsecore/sink-input.h \
+		pulsecore/sioman.h \
+		pulsecore/sound-file.h \
+		pulsecore/sound-file-stream.h \
+		pulsecore/source.h \
+		pulsecore/source-output.h \
+		pulsecore/strbuf.h \
+		pulsecore/tokenizer.h
+
+lib_LTLIBRARIES += libpulsecore.la
 
 # Some public stuff is used even in the core.
-libpolypcore_la_SOURCES = \
-		polyp/channelmap.c polyp/channelmap.h \
-		polyp/error.c polyp/error.h \
-		polyp/mainloop.c polyp/mainloop.h \
-		polyp/mainloop-api.c polyp/mainloop-api.h \
-		polyp/mainloop-signal.c polyp/mainloop-signal.h \
-		polyp/sample.c polyp/sample.h \
-		polyp/timeval.c polyp/timeval.h \
-		polyp/utf8.c polyp/utf8.h \
-		polyp/util.c polyp/util.h \
-		polyp/volume.c polyp/volume.h \
-		polyp/xmalloc.c polyp/xmalloc.h
-
-# Pure core stuff (some are shared in libpolyp though).
-libpolypcore_la_SOURCES += \
-		polypcore/autoload.c polypcore/autoload.h \
-		polypcore/cli-command.c polypcore/cli-command.h \
-		polypcore/cli-text.c polypcore/cli-text.h \
-		polypcore/client.c polypcore/client.h \
-		polypcore/conf-parser.c polypcore/conf-parser.h \
-		polypcore/core.c polypcore/core.h \
-		polypcore/core-scache.c polypcore/core-scache.h \
-		polypcore/core-subscribe.c polypcore/core-subscribe.h \
-		polypcore/core-util.c polypcore/core-util.h \
-		polypcore/dynarray.c polypcore/dynarray.h \
-		polypcore/endianmacros.h \
-		polypcore/g711.c polypcore/g711.h \
-		polypcore/hashmap.c polypcore/hashmap.h \
-		polypcore/idxset.c polypcore/idxset.h \
-		polypcore/log.c polypcore/log.h \
-		polypcore/mcalign.c polypcore/mcalign.h \
-		polypcore/memblock.c polypcore/memblock.h \
-		polypcore/memblockq.c polypcore/memblockq.h \
-		polypcore/memchunk.c polypcore/memchunk.h \
-		polypcore/modargs.c polypcore/modargs.h \
-		polypcore/modinfo.c polypcore/modinfo.h \
-		polypcore/module.c polypcore/module.h \
-		polypcore/namereg.c polypcore/namereg.h \
-		polypcore/pid.c polypcore/pid.h \
-		polypcore/pipe.c polypcore/pipe.h \
-		polypcore/play-memchunk.c polypcore/play-memchunk.h \
-		polypcore/poll.c polypcore/poll.h \
-		polypcore/props.c polypcore/props.h \
-		polypcore/queue.c polypcore/queue.h \
-		polypcore/random.c polypcore/random.h \
-		polypcore/resampler.c polypcore/resampler.h \
-		polypcore/sample-util.c polypcore/sample-util.h \
-		polypcore/sconv.c polypcore/sconv.h \
-		polypcore/sconv-s16be.c polypcore/sconv-s16be.h \
-		polypcore/sconv-s16le.c polypcore/sconv-s16le.h \
-		polypcore/sink.c polypcore/sink.h \
-		polypcore/sink-input.c polypcore/sink-input.h \
-		polypcore/sioman.c polypcore/sioman.h \
-		polypcore/sound-file.c polypcore/sound-file.h \
-		polypcore/sound-file-stream.c polypcore/sound-file-stream.h \
-		polypcore/source.c polypcore/source.h \
-		polypcore/source-output.c polypcore/source-output.h \
-		polypcore/strbuf.c polypcore/strbuf.h \
-		polypcore/tokenizer.c polypcore/tokenizer.h \
-		polypcore/winsock.h \
-		polypcore/core-error.c polypcore/core-error.h
+libpulsecore_la_SOURCES = \
+		pulse/channelmap.c pulse/channelmap.h \
+		pulse/error.c pulse/error.h \
+		pulse/mainloop.c pulse/mainloop.h \
+		pulse/mainloop-api.c pulse/mainloop-api.h \
+		pulse/mainloop-signal.c pulse/mainloop-signal.h \
+		pulse/sample.c pulse/sample.h \
+		pulse/timeval.c pulse/timeval.h \
+		pulse/utf8.c pulse/utf8.h \
+		pulse/util.c pulse/util.h \
+		pulse/volume.c pulse/volume.h \
+		pulse/xmalloc.c pulse/xmalloc.h
+
+# Pure core stuff (some are shared in libpulse though).
+libpulsecore_la_SOURCES += \
+		pulsecore/autoload.c pulsecore/autoload.h \
+		pulsecore/cli-command.c pulsecore/cli-command.h \
+		pulsecore/cli-text.c pulsecore/cli-text.h \
+		pulsecore/client.c pulsecore/client.h \
+		pulsecore/conf-parser.c pulsecore/conf-parser.h \
+		pulsecore/core.c pulsecore/core.h \
+		pulsecore/core-scache.c pulsecore/core-scache.h \
+		pulsecore/core-subscribe.c pulsecore/core-subscribe.h \
+		pulsecore/core-util.c pulsecore/core-util.h \
+		pulsecore/dynarray.c pulsecore/dynarray.h \
+		pulsecore/endianmacros.h \
+		pulsecore/g711.c pulsecore/g711.h \
+		pulsecore/hashmap.c pulsecore/hashmap.h \
+		pulsecore/idxset.c pulsecore/idxset.h \
+		pulsecore/log.c pulsecore/log.h \
+		pulsecore/mcalign.c pulsecore/mcalign.h \
+		pulsecore/memblock.c pulsecore/memblock.h \
+		pulsecore/memblockq.c pulsecore/memblockq.h \
+		pulsecore/memchunk.c pulsecore/memchunk.h \
+		pulsecore/modargs.c pulsecore/modargs.h \
+		pulsecore/modinfo.c pulsecore/modinfo.h \
+		pulsecore/module.c pulsecore/module.h \
+		pulsecore/namereg.c pulsecore/namereg.h \
+		pulsecore/pid.c pulsecore/pid.h \
+		pulsecore/pipe.c pulsecore/pipe.h \
+		pulsecore/play-memchunk.c pulsecore/play-memchunk.h \
+		pulsecore/poll.c pulsecore/poll.h \
+		pulsecore/props.c pulsecore/props.h \
+		pulsecore/queue.c pulsecore/queue.h \
+		pulsecore/random.c pulsecore/random.h \
+		pulsecore/resampler.c pulsecore/resampler.h \
+		pulsecore/sample-util.c pulsecore/sample-util.h \
+		pulsecore/sconv.c pulsecore/sconv.h \
+		pulsecore/sconv-s16be.c pulsecore/sconv-s16be.h \
+		pulsecore/sconv-s16le.c pulsecore/sconv-s16le.h \
+		pulsecore/sink.c pulsecore/sink.h \
+		pulsecore/sink-input.c pulsecore/sink-input.h \
+		pulsecore/sioman.c pulsecore/sioman.h \
+		pulsecore/sound-file.c pulsecore/sound-file.h \
+		pulsecore/sound-file-stream.c pulsecore/sound-file-stream.h \
+		pulsecore/source.c pulsecore/source.h \
+		pulsecore/source-output.c pulsecore/source-output.h \
+		pulsecore/strbuf.c pulsecore/strbuf.h \
+		pulsecore/tokenizer.c pulsecore/tokenizer.h \
+		pulsecore/winsock.h \
+		pulsecore/core-error.c pulsecore/core-error.h
 
 if OS_IS_WIN32
-libpolypcore_la_SOURCES += \
-		polypcore/dllmain.c 
-endif
-
-libpolypcore_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBOIL_CFLAGS)
-libpolypcore_la_LDFLAGS = -version-info $(LIBPOLYPCORE_VERSION_INFO)
-libpolypcore_la_LIBADD = $(AM_LIBADD) $(LIBLTDL) $(LIBSAMPLERATE_LIBS) $(LIBSNDFILE_LIBS) $(WINSOCK_LIBS) $(LIBOIL_LIBS) $(LIBICONV)
+libpulsecore_la_SOURCES += \
+		pulsecore/dllmain.c 
+endif
+
+libpulsecore_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBOIL_CFLAGS)
+libpulsecore_la_LDFLAGS = -version-info $(LIBPOLYPCORE_VERSION_INFO)
+libpulsecore_la_LIBADD = $(AM_LIBADD) $(LIBLTDL) $(LIBSAMPLERATE_LIBS) $(LIBSNDFILE_LIBS) $(WINSOCK_LIBS) $(LIBOIL_LIBS) $(LIBICONV)
 
 ###################################
 #   Plug-in support libraries     #
 ###################################
 
-polypcoreinclude_HEADERS += \
-		polypcore/socket-util.h \
-		polypcore/iochannel.h \
-		polypcore/socket-server.h \
-		polypcore/socket-client.h \
-		polypcore/parseaddr.h \
-		polypcore/packet.h \
-		polypcore/pstream.h \
-		polypcore/ioline.h \
-		polypcore/cli.h \
-		polypcore/protocol-cli.h \
-		polypcore/tagstruct.h \
-		polypcore/pstream-util.h \
-		polypcore/pdispatch.h \
-		polypcore/authkey.h \
-		polypcore/authkey-prop.h \
-		polypcore/strlist.h \
-		polypcore/protocol-simple.h \
-		polypcore/esound.h \
-		polypcore/protocol-esound.h \
-		polypcore/native-common.h \
-		polypcore/protocol-native.h \
-		polypcore/protocol-http.h
+pulsecoreinclude_HEADERS += \
+		pulsecore/socket-util.h \
+		pulsecore/iochannel.h \
+		pulsecore/socket-server.h \
+		pulsecore/socket-client.h \
+		pulsecore/parseaddr.h \
+		pulsecore/packet.h \
+		pulsecore/pstream.h \
+		pulsecore/ioline.h \
+		pulsecore/cli.h \
+		pulsecore/protocol-cli.h \
+		pulsecore/tagstruct.h \
+		pulsecore/pstream-util.h \
+		pulsecore/pdispatch.h \
+		pulsecore/authkey.h \
+		pulsecore/authkey-prop.h \
+		pulsecore/strlist.h \
+		pulsecore/protocol-simple.h \
+		pulsecore/esound.h \
+		pulsecore/protocol-esound.h \
+		pulsecore/native-common.h \
+		pulsecore/protocol-native.h \
+		pulsecore/protocol-http.h
 
 ### Warning! Due to an obscure bug in libtool/automake it is required
 ### that the libraries in modlibexec_LTLIBRARIES are specified in-order,
@@ -658,114 +658,114 @@
 endif
 
 if HAVE_X11
-polypcoreinclude_HEADERS += \
-		polypcore/x11wrap.h \
-		polypcore/x11prop.h
+pulsecoreinclude_HEADERS += \
+		pulsecore/x11wrap.h \
+		pulsecore/x11prop.h
 
 modlibexec_LTLIBRARIES += \
 		libx11wrap.la \
 		libx11prop.la
 endif
 
-libprotocol_simple_la_SOURCES = polypcore/protocol-simple.c polypcore/protocol-simple.h
+libprotocol_simple_la_SOURCES = pulsecore/protocol-simple.c pulsecore/protocol-simple.h
 libprotocol_simple_la_LDFLAGS = -avoid-version
-libprotocol_simple_la_LIBADD = $(AM_LIBADD) libpolypcore.la libsocket-server.la libiochannel.la
+libprotocol_simple_la_LIBADD = $(AM_LIBADD) libpulsecore.la libsocket-server.la libiochannel.la
 
 libsocket_server_la_SOURCES = \
-		polypcore/inet_ntop.c polypcore/inet_ntop.h \
-		polypcore/inet_pton.c polypcore/inet_pton.h \
-		polypcore/socket-server.c polypcore/socket-server.h
+		pulsecore/inet_ntop.c pulsecore/inet_ntop.h \
+		pulsecore/inet_pton.c pulsecore/inet_pton.h \
+		pulsecore/socket-server.c pulsecore/socket-server.h
 libsocket_server_la_LDFLAGS = -avoid-version
-libsocket_server_la_LIBADD = $(AM_LIBADD) libpolypcore.la libiochannel.la libsocket-util.la $(LIBWRAP_LIBS) $(WINSOCK_LIBS)
-
-libsocket_client_la_SOURCES = polypcore/socket-client.c polypcore/socket-client.h
+libsocket_server_la_LIBADD = $(AM_LIBADD) libpulsecore.la libiochannel.la libsocket-util.la $(LIBWRAP_LIBS) $(WINSOCK_LIBS)
+
+libsocket_client_la_SOURCES = pulsecore/socket-client.c pulsecore/socket-client.h
 libsocket_client_la_LDFLAGS = -avoid-version
-libsocket_client_la_LIBADD = $(AM_LIBADD) libpolypcore.la libiochannel.la libsocket-util.la libparseaddr.la $(LIBASYNCNS_LIBS) $(WINSOCK_LIBS)
+libsocket_client_la_LIBADD = $(AM_LIBADD) libpulsecore.la libiochannel.la libsocket-util.la libparseaddr.la $(LIBASYNCNS_LIBS) $(WINSOCK_LIBS)
 libsocket_client_la_CFLAGS = $(AM_CFLAGS) $(LIBASYNCNS_CFLAGS)
 
-libparseaddr_la_SOURCES = polypcore/parseaddr.c polypcore/parseaddr.h
+libparseaddr_la_SOURCES = pulsecore/parseaddr.c pulsecore/parseaddr.h
 libparseaddr_la_LDFLAGS = -avoid-version
-libparseaddr_la_LIBADD = $(AM_LIBADD) libpolypcore.la
-
-libpstream_la_SOURCES = polypcore/pstream.c polypcore/pstream.h
+libparseaddr_la_LIBADD = $(AM_LIBADD) libpulsecore.la
+
+libpstream_la_SOURCES = pulsecore/pstream.c pulsecore/pstream.h
 libpstream_la_LDFLAGS = -avoid-version
-libpstream_la_LIBADD = $(AM_LIBADD) libpolypcore.la libpacket.la libiochannel.la $(WINSOCK_LIBS)
-
-libpstream_util_la_SOURCES = polypcore/pstream-util.c polypcore/pstream-util.h
+libpstream_la_LIBADD = $(AM_LIBADD) libpulsecore.la libpacket.la libiochannel.la $(WINSOCK_LIBS)
+
+libpstream_util_la_SOURCES = pulsecore/pstream-util.c pulsecore/pstream-util.h
 libpstream_util_la_LDFLAGS = -avoid-version
 libpstream_util_la_LIBADD = $(AM_LIBADD) libpacket.la libpstream.la libtagstruct.la
 
-libpdispatch_la_SOURCES = polypcore/pdispatch.c polypcore/pdispatch.h
+libpdispatch_la_SOURCES = pulsecore/pdispatch.c pulsecore/pdispatch.h
 libpdispatch_la_LDFLAGS = -avoid-version
-libpdispatch_la_LIBADD = $(AM_LIBADD) libtagstruct.la libpolypcore.la
-
-libiochannel_la_SOURCES = polypcore/iochannel.c polypcore/iochannel.h
+libpdispatch_la_LIBADD = $(AM_LIBADD) libtagstruct.la libpulsecore.la
+
+libiochannel_la_SOURCES = pulsecore/iochannel.c pulsecore/iochannel.h
 libiochannel_la_LDFLAGS = -avoid-version
-libiochannel_la_LIBADD = $(AM_LIBADD) libsocket-util.la libpolypcore.la $(WINSOCK_LIBS)
-
-libpacket_la_SOURCES = polypcore/packet.c polypcore/packet.h
+libiochannel_la_LIBADD = $(AM_LIBADD) libsocket-util.la libpulsecore.la $(WINSOCK_LIBS)
+
+libpacket_la_SOURCES = pulsecore/packet.c pulsecore/packet.h
 libpacket_la_LDFLAGS = -avoid-version
-libpacket_la_LIBADD = $(AM_LIBADD) libpolypcore.la
-
-libioline_la_SOURCES = polypcore/ioline.c polypcore/ioline.h
+libpacket_la_LIBADD = $(AM_LIBADD) libpulsecore.la
+
+libioline_la_SOURCES = pulsecore/ioline.c pulsecore/ioline.h
 libioline_la_LDFLAGS = -avoid-version
-libioline_la_LIBADD = $(AM_LIBADD) libiochannel.la libpolypcore.la
-
-libcli_la_SOURCES = polypcore/cli.c polypcore/cli.h
+libioline_la_LIBADD = $(AM_LIBADD) libiochannel.la libpulsecore.la
+
+libcli_la_SOURCES = pulsecore/cli.c pulsecore/cli.h
 libcli_la_CPPFLAGS = $(AM_CPPFLAGS)
 libcli_la_LDFLAGS = -avoid-version
-libcli_la_LIBADD = $(AM_LIBADD) libiochannel.la libioline.la libpolypcore.la
-
-libstrlist_la_SOURCES = polypcore/strlist.c polypcore/strlist.h
+libcli_la_LIBADD = $(AM_LIBADD) libiochannel.la libioline.la libpulsecore.la
+
+libstrlist_la_SOURCES = pulsecore/strlist.c pulsecore/strlist.h
 libstrlist_la_LDFLAGS = -avoid-version
-libstrlist_la_LIBADD = $(AM_LIBADD) libpolypcore.la
-
-libprotocol_cli_la_SOURCES = polypcore/protocol-cli.c polypcore/protocol-cli.h
+libstrlist_la_LIBADD = $(AM_LIBADD) libpulsecore.la
+
+libprotocol_cli_la_SOURCES = pulsecore/protocol-cli.c pulsecore/protocol-cli.h
 libprotocol_cli_la_LDFLAGS = -avoid-version
-libprotocol_cli_la_LIBADD = $(AM_LIBADD) libsocket-server.la libiochannel.la libcli.la libpolypcore.la
-
-libprotocol_http_la_SOURCES = polypcore/protocol-http.c polypcore/protocol-http.h
+libprotocol_cli_la_LIBADD = $(AM_LIBADD) libsocket-server.la libiochannel.la libcli.la libpulsecore.la
+
+libprotocol_http_la_SOURCES = pulsecore/protocol-http.c pulsecore/protocol-http.h
 libprotocol_http_la_LDFLAGS = -avoid-version
-libprotocol_http_la_LIBADD = $(AM_LIBADD) libsocket-server.la libioline.la libpolypcore.la libiochannel.la
-
-libprotocol_native_la_SOURCES = polypcore/protocol-native.c polypcore/protocol-native.h polypcore/native-common.h
+libprotocol_http_la_LIBADD = $(AM_LIBADD) libsocket-server.la libioline.la libpulsecore.la libiochannel.la
+
+libprotocol_native_la_SOURCES = pulsecore/protocol-native.c pulsecore/protocol-native.h pulsecore/native-common.h
 libprotocol_native_la_LDFLAGS = -avoid-version
-libprotocol_native_la_LIBADD = $(AM_LIBADD) libsocket-server.la libpstream.la libpstream-util.la libpdispatch.la libtagstruct.la libauthkey.la libauthkey-prop.la libstrlist.la libpolypcore.la libiochannel.la
-
-libtagstruct_la_SOURCES = polypcore/tagstruct.c polypcore/tagstruct.h
+libprotocol_native_la_LIBADD = $(AM_LIBADD) libsocket-server.la libpstream.la libpstream-util.la libpdispatch.la libtagstruct.la libauthkey.la libauthkey-prop.la libstrlist.la libpulsecore.la libiochannel.la
+
+libtagstruct_la_SOURCES = pulsecore/tagstruct.c pulsecore/tagstruct.h
 libtagstruct_la_LDFLAGS = -avoid-version
-libtagstruct_la_LIBADD = $(AM_LIBADD) libpolypcore.la $(WINSOCK_LIBS)
-
-libprotocol_esound_la_SOURCES = polypcore/protocol-esound.c polypcore/protocol-esound.h polypcore/esound.h
+libtagstruct_la_LIBADD = $(AM_LIBADD) libpulsecore.la $(WINSOCK_LIBS)
+
+libprotocol_esound_la_SOURCES = pulsecore/protocol-esound.c pulsecore/protocol-esound.h pulsecore/esound.h
 libprotocol_esound_la_LDFLAGS = -avoid-version
-libprotocol_esound_la_LIBADD = $(AM_LIBADD) libsocket-server.la libiochannel.la libauthkey.la libpolypcore.la
-
-libauthkey_la_SOURCES = polypcore/authkey.c polypcore/authkey.h
+libprotocol_esound_la_LIBADD = $(AM_LIBADD) libsocket-server.la libiochannel.la libauthkey.la libpulsecore.la
+
+libauthkey_la_SOURCES = pulsecore/authkey.c pulsecore/authkey.h
 libauthkey_la_LDFLAGS = -avoid-version
-libauthkey_la_LIBADD = $(AM_LIBADD) libpolypcore.la
-
-libauthkey_prop_la_SOURCES = polypcore/authkey-prop.c polypcore/authkey-prop.h
+libauthkey_la_LIBADD = $(AM_LIBADD) libpulsecore.la
+
+libauthkey_prop_la_SOURCES = pulsecore/authkey-prop.c pulsecore/authkey-prop.h
 libauthkey_prop_la_LDFLAGS = -avoid-version
-libauthkey_prop_la_LIBADD = $(AM_LIBADD) libpolypcore.la
+libauthkey_prop_la_LIBADD = $(AM_LIBADD) libpulsecore.la
 
 libsocket_util_la_SOURCES = \
-		polypcore/inet_ntop.c polypcor/inet_ntop.h \
-		polypcore/socket-util.c polypcore/socket-util.h
+		pulsecore/inet_ntop.c pulsecor/inet_ntop.h \
+		pulsecore/socket-util.c pulsecore/socket-util.h
 libsocket_util_la_LDFLAGS = -avoid-version
-libsocket_util_la_LIBADD = $(AM_LIBADD) $(WINSOCK_LIBS) libpolypcore.la
+libsocket_util_la_LIBADD = $(AM_LIBADD) $(WINSOCK_LIBS) libpulsecore.la
 
 librtp_la_SOURCES = modules/rtp/rtp.c modules/rtp/rtp.h modules/rtp/sdp.c modules/rtp/sdp.h modules/rtp/sap.c modules/rtp/sap.h 
 librtp_la_LDFLAGS = -avoid-version
-librtp_la_LIBADD = $(AM_LIBADD) libpolypcore.la
+librtp_la_LIBADD = $(AM_LIBADD) libpulsecore.la
 
 # X11
 
-libx11wrap_la_SOURCES = polypcore/x11wrap.c polypcore/x11wrap.h
+libx11wrap_la_SOURCES = pulsecore/x11wrap.c pulsecore/x11wrap.h
 libx11wrap_la_LDFLAGS = -avoid-version
 libx11wrap_la_CFLAGS = $(AM_CFLAGS) $(X_CFLAGS)
-libx11wrap_la_LIBADD = $(AM_LIBADD) $(X_PRE_LIBS) -lX11 $(X_LIBS) $(X_EXTRA_LIBS) libpolypcore.la
-
-libx11prop_la_SOURCES = polypcore/x11prop.c polypcore/x11prop.h
+libx11wrap_la_LIBADD = $(AM_LIBADD) $(X_PRE_LIBS) -lX11 $(X_LIBS) $(X_EXTRA_LIBS) libpulsecore.la
+
+libx11prop_la_SOURCES = pulsecore/x11prop.c pulsecore/x11prop.h
 libx11prop_la_LDFLAGS = -avoid-version
 libx11prop_la_CFLAGS = $(AM_CFLAGS) $(X_CFLAGS)
 libx11prop_la_LIBADD = $(AM_LIBADD) $(X_PRE_LIBS) -lX11 $(X_LIBS) $(X_EXTRA_LIBS)
@@ -932,127 +932,127 @@
 module_simple_protocol_tcp_la_SOURCES = modules/module-protocol-stub.c
 module_simple_protocol_tcp_la_CFLAGS = -DUSE_TCP_SOCKETS -DUSE_PROTOCOL_SIMPLE $(AM_CFLAGS)
 module_simple_protocol_tcp_la_LDFLAGS = -module -avoid-version
-module_simple_protocol_tcp_la_LIBADD = $(AM_LIBADD) libpolypcore.la libprotocol-simple.la libsocket-server.la
+module_simple_protocol_tcp_la_LIBADD = $(AM_LIBADD) libpulsecore.la libprotocol-simple.la libsocket-server.la
 
 module_simple_protocol_unix_la_SOURCES = modules/module-protocol-stub.c
 module_simple_protocol_unix_la_CFLAGS = -DUSE_UNIX_SOCKETS -DUSE_PROTOCOL_SIMPLE $(AM_CFLAGS)
 module_simple_protocol_unix_la_LDFLAGS = -module -avoid-version
-module_simple_protocol_unix_la_LIBADD = $(AM_LIBADD) libpolypcore.la libprotocol-simple.la libsocket-server.la libsocket-util.la
+module_simple_protocol_unix_la_LIBADD = $(AM_LIBADD) libpulsecore.la libprotocol-simple.la libsocket-server.la libsocket-util.la
 
 # CLI protocol
 
 module_cli_la_SOURCES = modules/module-cli.c
 module_cli_la_LDFLAGS = -module -avoid-version
-module_cli_la_LIBADD = $(AM_LIBADD) libcli.la libiochannel.la libpolypcore.la
+module_cli_la_LIBADD = $(AM_LIBADD) libcli.la libiochannel.la libpulsecore.la
 
 module_cli_protocol_tcp_la_SOURCES = modules/module-protocol-stub.c
 module_cli_protocol_tcp_la_CFLAGS = -DUSE_TCP_SOCKETS -DUSE_PROTOCOL_CLI $(AM_CFLAGS)
 module_cli_protocol_tcp_la_LDFLAGS = -module -avoid-version
-module_cli_protocol_tcp_la_LIBADD = $(AM_LIBADD) libpolypcore.la libprotocol-cli.la libsocket-server.la
+module_cli_protocol_tcp_la_LIBADD = $(AM_LIBADD) libpulsecore.la libprotocol-cli.la libsocket-server.la
 
 module_cli_protocol_unix_la_SOURCES = modules/module-protocol-stub.c
 module_cli_protocol_unix_la_CFLAGS = -DUSE_UNIX_SOCKETS -DUSE_PROTOCOL_CLI $(AM_CFLAGS)
 module_cli_protocol_unix_la_LDFLAGS = -module -avoid-version
-module_cli_protocol_unix_la_LIBADD = $(AM_LIBADD) libpolypcore.la libprotocol-cli.la libsocket-server.la libsocket-util.la
+module_cli_protocol_unix_la_LIBADD = $(AM_LIBADD) libpulsecore.la libprotocol-cli.la libsocket-server.la libsocket-util.la
 
 # HTTP protocol
 
 module_http_protocol_tcp_la_SOURCES = modules/module-protocol-stub.c
 module_http_protocol_tcp_la_CFLAGS = -DUSE_TCP_SOCKETS -DUSE_PROTOCOL_HTTP $(AM_CFLAGS)
 module_http_protocol_tcp_la_LDFLAGS = -module -avoid-version
-module_http_protocol_tcp_la_LIBADD = $(AM_LIBADD) libpolypcore.la libprotocol-http.la libsocket-server.la
+module_http_protocol_tcp_la_LIBADD = $(AM_LIBADD) libpulsecore.la libprotocol-http.la libsocket-server.la
 
 module_http_protocol_unix_la_SOURCES = modules/module-protocol-stub.c
 module_http_protocol_unix_la_CFLAGS = -DUSE_UNIX_SOCKETS -DUSE_PROTOCOL_HTTP $(AM_CFLAGS)
 module_http_protocol_unix_la_LDFLAGS = -module -avoid-version
-module_http_protocol_unix_la_LIBADD = $(AM_LIBADD) libpolypcore.la libprotocol-http.la libsocket-server.la libsocket-util.la
+module_http_protocol_unix_la_LIBADD = $(AM_LIBADD) libpulsecore.la libprotocol-http.la libsocket-server.la libsocket-util.la
 
 # Native protocol
 
 module_native_protocol_tcp_la_SOURCES = modules/module-protocol-stub.c
 module_native_protocol_tcp_la_CFLAGS = -DUSE_TCP_SOCKETS -DUSE_PROTOCOL_NATIVE $(AM_CFLAGS)
 module_native_protocol_tcp_la_LDFLAGS = -module -avoid-version
-module_native_protocol_tcp_la_LIBADD = $(AM_LIBADD) libpolypcore.la libprotocol-native.la libsocket-server.la
+module_native_protocol_tcp_la_LIBADD = $(AM_LIBADD) libpulsecore.la libprotocol-native.la libsocket-server.la
 
 module_native_protocol_unix_la_SOURCES = modules/module-protocol-stub.c
 module_native_protocol_unix_la_CFLAGS = -DUSE_UNIX_SOCKETS -DUSE_PROTOCOL_NATIVE $(AM_CFLAGS)
 module_native_protocol_unix_la_LDFLAGS = -module -avoid-version
-module_native_protocol_unix_la_LIBADD = $(AM_LIBADD) libpolypcore.la libprotocol-native.la libsocket-server.la libsocket-util.la
+module_native_protocol_unix_la_LIBADD = $(AM_LIBADD) libpulsecore.la libprotocol-native.la libsocket-server.la libsocket-util.la
 
 module_native_protocol_fd_la_SOURCES = modules/module-native-protocol-fd.c
 module_native_protocol_fd_la_CFLAGS = $(AM_CFLAGS)
 module_native_protocol_fd_la_LDFLAGS = -module -avoid-version
-module_native_protocol_fd_la_LIBADD = $(AM_LIBADD) libpolypcore.la libprotocol-native.la libsocket-server.la libsocket-util.la libiochannel.la
+module_native_protocol_fd_la_LIBADD = $(AM_LIBADD) libpulsecore.la libprotocol-native.la libsocket-server.la libsocket-util.la libiochannel.la
 
 # EsounD protocol
 
 module_esound_protocol_tcp_la_SOURCES = modules/module-protocol-stub.c
 module_esound_protocol_tcp_la_CFLAGS = -DUSE_TCP_SOCKETS -DUSE_PROTOCOL_ESOUND $(AM_CFLAGS)
 module_esound_protocol_tcp_la_LDFLAGS = -module -avoid-version
-module_esound_protocol_tcp_la_LIBADD = $(AM_LIBADD) libpolypcore.la libprotocol-esound.la libsocket-server.la
+module_esound_protocol_tcp_la_LIBADD = $(AM_LIBADD) libpulsecore.la libprotocol-esound.la libsocket-server.la
 
 module_esound_protocol_unix_la_SOURCES = modules/module-protocol-stub.c
 module_esound_protocol_unix_la_CFLAGS = -DUSE_UNIX_SOCKETS -DUSE_PROTOCOL_ESOUND $(AM_CFLAGS)
 module_esound_protocol_unix_la_LDFLAGS = -module -avoid-version
-module_esound_protocol_unix_la_LIBADD = $(AM_LIBADD) libpolypcore.la libprotocol-esound.la libsocket-server.la libsocket-util.la
+module_esound_protocol_unix_la_LIBADD = $(AM_LIBADD) libpulsecore.la libprotocol-esound.la libsocket-server.la libsocket-util.la
 
 module_esound_compat_spawnfd_la_SOURCES = modules/module-esound-compat-spawnfd.c
 module_esound_compat_spawnfd_la_LDFLAGS = -module -avoid-version
-module_esound_compat_spawnfd_la_LIBADD = $(AM_LIBADD) libpolypcore.la
+module_esound_compat_spawnfd_la_LIBADD = $(AM_LIBADD) libpulsecore.la
 
 module_esound_compat_spawnpid_la_SOURCES = modules/module-esound-compat-spawnpid.c
 module_esound_compat_spawnpid_la_LDFLAGS = -module -avoid-version
-module_esound_compat_spawnpid_la_LIBADD = $(AM_LIBADD) libpolypcore.la
+module_esound_compat_spawnpid_la_LIBADD = $(AM_LIBADD) libpulsecore.la
 
 module_esound_sink_la_SOURCES = modules/module-esound-sink.c
 module_esound_sink_la_LDFLAGS = -module -avoid-version
-module_esound_sink_la_LIBADD = $(AM_LIBADD) libpolypcore.la libiochannel.la libsocket-client.la libauthkey.la
+module_esound_sink_la_LIBADD = $(AM_LIBADD) libpulsecore.la libiochannel.la libsocket-client.la libauthkey.la
 
 # Pipes
 
 module_pipe_sink_la_SOURCES = modules/module-pipe-sink.c
 module_pipe_sink_la_LDFLAGS = -module -avoid-version
-module_pipe_sink_la_LIBADD = $(AM_LIBADD) libpolypcore.la libiochannel.la
+module_pipe_sink_la_LIBADD = $(AM_LIBADD) libpulsecore.la libiochannel.la
 
 module_pipe_source_la_SOURCES = modules/module-pipe-source.c
 module_pipe_source_la_LDFLAGS = -module -avoid-version
-module_pipe_source_la_LIBADD = $(AM_LIBADD) libpolypcore.la libiochannel.la
+module_pipe_source_la_LIBADD = $(AM_LIBADD) libpulsecore.la libiochannel.la
 
 # Fake sources/sinks
 
 module_sine_la_SOURCES = modules/module-sine.c
 module_sine_la_LDFLAGS = -module -avoid-version
-module_sine_la_LIBADD = $(AM_LIBADD) libpolypcore.la
+module_sine_la_LIBADD = $(AM_LIBADD) libpulsecore.la
 
 module_null_sink_la_SOURCES = modules/module-null-sink.c
 module_null_sink_la_LDFLAGS = -module -avoid-version
-module_null_sink_la_LIBADD = $(AM_LIBADD) libpolypcore.la
+module_null_sink_la_LIBADD = $(AM_LIBADD) libpulsecore.la
 
 # Couplings
 
 module_combine_la_SOURCES = modules/module-combine.c
 module_combine_la_LDFLAGS = -module -avoid-version
-module_combine_la_LIBADD = $(AM_LIBADD) libpolypcore.la
+module_combine_la_LIBADD = $(AM_LIBADD) libpulsecore.la
 
 module_match_la_SOURCES = modules/module-match.c
 module_match_la_LDFLAGS = -module -avoid-version
-module_match_la_LIBADD = $(AM_LIBADD) libpolypcore.la
+module_match_la_LIBADD = $(AM_LIBADD) libpulsecore.la
 
 module_tunnel_sink_la_SOURCES = modules/module-tunnel.c
 module_tunnel_sink_la_CFLAGS = -DTUNNEL_SINK=1 $(AM_CFLAGS)
 module_tunnel_sink_la_LDFLAGS = -module -avoid-version
-module_tunnel_sink_la_LIBADD = $(AM_LIBADD) libpolypcore.la libsocket-client.la libpstream.la libpstream-util.la libpdispatch.la libtagstruct.la libauthkey.la libauthkey-prop.la libsocket-util.la libiochannel.la
+module_tunnel_sink_la_LIBADD = $(AM_LIBADD) libpulsecore.la libsocket-client.la libpstream.la libpstream-util.la libpdispatch.la libtagstruct.la libauthkey.la libauthkey-prop.la libsocket-util.la libiochannel.la
 
 module_tunnel_source_la_SOURCES = modules/module-tunnel.c
 module_tunnel_source_la_LDFLAGS = -module -avoid-version
-module_tunnel_source_la_LIBADD = $(AM_LIBADD) libpolypcore.la libsocket-client.la libpstream.la libpstream-util.la libpdispatch.la libtagstruct.la libauthkey.la libauthkey-prop.la libsocket-util.la libiochannel.la
+module_tunnel_source_la_LIBADD = $(AM_LIBADD) libpulsecore.la libsocket-client.la libpstream.la libpstream-util.la libpdispatch.la libtagstruct.la libauthkey.la libauthkey-prop.la libsocket-util.la libiochannel.la
 
 # X11
 
 module_x11_bell_la_SOURCES = modules/module-x11-bell.c
 module_x11_bell_la_CFLAGS = $(AM_CFLAGS) $(X_CFLAGS)
 module_x11_bell_la_LDFLAGS = -module -avoid-version
-module_x11_bell_la_LIBADD = $(AM_LIBADD) $(X_PRE_LIBS) -lX11 $(X_LIBS) $(X_EXTRA_LIBS) libx11wrap.la libpolypcore.la
+module_x11_bell_la_LIBADD = $(AM_LIBADD) $(X_PRE_LIBS) -lX11 $(X_LIBS) $(X_EXTRA_LIBS) libx11wrap.la libpulsecore.la
 
 module_x11_publish_la_SOURCES = modules/module-x11-publish.c
 module_x11_publish_la_CFLAGS = $(AM_CFLAGS) $(X_CFLAGS)
@@ -1063,7 +1063,7 @@
 
 liboss_util_la_SOURCES = modules/oss-util.c modules/oss-util.h
 liboss_util_la_LDFLAGS = -avoid-version
-liboss_util_la_LIBADD = libpolypcore.la
+liboss_util_la_LIBADD = libpulsecore.la
 
 module_oss_la_SOURCES = modules/module-oss.c
 module_oss_la_LDFLAGS = -module -avoid-version
@@ -1071,23 +1071,23 @@
 
 module_oss_mmap_la_SOURCES = modules/module-oss-mmap.c
 module_oss_mmap_la_LDFLAGS = -module -avoid-version
-module_oss_mmap_la_LIBADD = $(AM_LIBADD) liboss-util.la libpolypcore.la
+module_oss_mmap_la_LIBADD = $(AM_LIBADD) liboss-util.la libpulsecore.la
 
 # ALSA
 
 libalsa_util_la_SOURCES = modules/alsa-util.c modules/alsa-util.h
 libalsa_util_la_LDFLAGS = -avoid-version
-libalsa_util_la_LIBADD = $(AM_LIBADD) $(ASOUNDLIB_LIBS) libpolypcore.la
+libalsa_util_la_LIBADD = $(AM_LIBADD) $(ASOUNDLIB_LIBS) libpulsecore.la
 libalsa_util_la_CFLAGS = $(AM_CFLAGS) $(ASOUNDLIB_CFLAGS)
 
 module_alsa_sink_la_SOURCES = modules/module-alsa-sink.c
 module_alsa_sink_la_LDFLAGS = -module -avoid-version
-module_alsa_sink_la_LIBADD = $(AM_LIBADD) $(ASOUNDLIB_LIBS) libalsa-util.la libpolypcore.la
+module_alsa_sink_la_LIBADD = $(AM_LIBADD) $(ASOUNDLIB_LIBS) libalsa-util.la libpulsecore.la
 module_alsa_sink_la_CFLAGS = $(AM_CFLAGS) $(ASOUNDLIB_CFLAGS)
 
 module_alsa_source_la_SOURCES = modules/module-alsa-source.c
 module_alsa_source_la_LDFLAGS = -module -avoid-version
-module_alsa_source_la_LIBADD = $(AM_LIBADD) $(ASOUNDLIB_LIBS) libalsa-util.la libpolypcore.la
+module_alsa_source_la_LIBADD = $(AM_LIBADD) $(ASOUNDLIB_LIBS) libalsa-util.la libpulsecore.la
 module_alsa_source_la_CFLAGS = $(AM_CFLAGS) $(ASOUNDLIB_CFLAGS)
 
 # Solaris
@@ -1100,75 +1100,75 @@
 
 libhowl_wrap_la_SOURCES = modules/howl-wrap.c modules/howl-wrap.h
 libhowl_wrap_la_LDFLAGS = -avoid-version
-libhowl_wrap_la_LIBADD = $(AM_LIBADD) $(HOWL_LIBS) libpolypcore.la
+libhowl_wrap_la_LIBADD = $(AM_LIBADD) $(HOWL_LIBS) libpulsecore.la
 libhowl_wrap_la_CFLAGS = $(AM_CFLAGS) $(HOWL_CFLAGS)
 
 module_zeroconf_publish_la_SOURCES = modules/module-zeroconf-publish.c
 module_zeroconf_publish_la_LDFLAGS = -module -avoid-version
-module_zeroconf_publish_la_LIBADD = $(AM_LIBADD) $(HOWL_LIBS) libhowl-wrap.la libpolypcore.la
+module_zeroconf_publish_la_LIBADD = $(AM_LIBADD) $(HOWL_LIBS) libhowl-wrap.la libpulsecore.la
 module_zeroconf_publish_la_CFLAGS = $(AM_CFLAGS) $(HOWL_CFLAGS)
 
 # LIRC
 
 module_lirc_la_SOURCES = modules/module-lirc.c
 module_lirc_la_LDFLAGS = -module -avoid-version
-module_lirc_la_LIBADD = $(AM_LIBADD) $(LIRC_LIBS) libpolypcore.la
+module_lirc_la_LIBADD = $(AM_LIBADD) $(LIRC_LIBS) libpulsecore.la
 module_lirc_la_CFLAGS = $(AM_CFLAGS) $(LIRC_CFLAGS)
 
 # Linux evdev
 
 module_mmkbd_evdev_la_SOURCES = modules/module-mmkbd-evdev.c
 module_mmkbd_evdev_la_LDFLAGS = -module -avoid-version
-module_mmkbd_evdev_la_LIBADD = $(AM_LIBADD) libpolypcore.la
+module_mmkbd_evdev_la_LIBADD = $(AM_LIBADD) libpulsecore.la
 module_mmkbd_evdev_la_CFLAGS = $(AM_CFLAGS)
 
 # Windows waveout
 
 module_waveout_la_SOURCES = modules/module-waveout.c
 module_waveout_la_LDFLAGS = -module -avoid-version
-module_waveout_la_LIBADD = $(AM_LIBADD) libpolypcore.la -lwinmm
+module_waveout_la_LIBADD = $(AM_LIBADD) libpulsecore.la -lwinmm
 module_waveout_la_CFLAGS = $(AM_CFLAGS)
 
 # Hardware autodetection module
 module_detect_la_SOURCES = modules/module-detect.c
 module_detect_la_LDFLAGS = -module -avoid-version
-module_detect_la_LIBADD = $(AM_LIBADD) libpolypcore.la
+module_detect_la_LIBADD = $(AM_LIBADD) libpulsecore.la
 module_detect_la_CFLAGS = $(AM_CFLAGS)
 
 # Volume restore module
 module_volume_restore_la_SOURCES = modules/module-volume-restore.c
 module_volume_restore_la_LDFLAGS = -module -avoid-version
-module_volume_restore_la_LIBADD = $(AM_LIBADD) libpolypcore.la
+module_volume_restore_la_LIBADD = $(AM_LIBADD) libpulsecore.la
 module_volume_restore_la_CFLAGS = $(AM_CFLAGS)
 
 # RTP modules
 module_rtp_send_la_SOURCES = modules/rtp/module-rtp-send.c
 module_rtp_send_la_LDFLAGS = -module -avoid-version
-module_rtp_send_la_LIBADD = $(AM_LIBADD) libpolypcore.la librtp.la
+module_rtp_send_la_LIBADD = $(AM_LIBADD) libpulsecore.la librtp.la
 module_rtp_send_la_CFLAGS = $(AM_CFLAGS)
 
 module_rtp_recv_la_SOURCES = modules/rtp/module-rtp-recv.c
 module_rtp_recv_la_LDFLAGS = -module -avoid-version
-module_rtp_recv_la_LIBADD = $(AM_LIBADD) libpolypcore.la librtp.la
+module_rtp_recv_la_LIBADD = $(AM_LIBADD) libpulsecore.la librtp.la
 module_rtp_recv_la_CFLAGS = $(AM_CFLAGS)
 
 # JACK
 
 module_jack_sink_la_SOURCES = modules/module-jack-sink.c
 module_jack_sink_la_LDFLAGS = -module -avoid-version
-module_jack_sink_la_LIBADD = $(AM_LIBADD) libpolypcore.la $(JACK_LIBS)
+module_jack_sink_la_LIBADD = $(AM_LIBADD) libpulsecore.la $(JACK_LIBS)
 module_jack_sink_la_CFLAGS = $(AM_LIBADD) $(JACK_CFLAGS)
 
 module_jack_source_la_SOURCES = modules/module-jack-source.c
 module_jack_source_la_LDFLAGS = -module -avoid-version
-module_jack_source_la_LIBADD = $(AM_LIBADD) libpolypcore.la $(JACK_LIBS)
+module_jack_source_la_LIBADD = $(AM_LIBADD) libpulsecore.la $(JACK_LIBS)
 module_jack_source_la_CFLAGS = $(AM_LIBADD) $(JACK_CFLAGS)
 
 ###################################
 #        Some minor stuff         #
 ###################################
 
-suid: polypaudio
+suid: pulse
 	chown root $<
 	chmod u+s $<
 
@@ -1179,7 +1179,7 @@
 		-e 's, at PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
 		-e 's, at POLYPAUDIO_BINARY\@,$(POLYPAUDIO_BINARY),g' < $< > $@
 
-client.conf: polyp/client.conf.in Makefile
+client.conf: pulse/client.conf.in Makefile
 	sed -e 's, at POLYPAUDIO_BINARY\@,$(POLYPAUDIO_BINARY),g' < $< > $@
 
 if OS_IS_WIN32    
@@ -1195,11 +1195,11 @@
 		-e 's, at DEFAULT_CONFIG_FILE\@,$(DEFAULT_CONFIG_DIR),g' < $< > $@
 
 install-exec-hook:
-	chown root $(DESTDIR)$(bindir)/polypaudio ; true
-	chmod u+s $(DESTDIR)$(bindir)/polypaudio
+	chown root $(DESTDIR)$(bindir)/pulseaudio ; true
+	chmod u+s $(DESTDIR)$(bindir)/pulseaudio
 	ln -sf pacat $(DESTDIR)$(bindir)/parec
 	rm -f $(DESTDIR)$(modlibexecdir)/*.a
-	rm -f $(DESTDIR)$(libdir)/libpolypdsp.a
-	rm -f $(DESTDIR)$(libdir)/libpolypdsp.la
+	rm -f $(DESTDIR)$(libdir)/libpulsedsp.a
+	rm -f $(DESTDIR)$(libdir)/libpulsedsp.la
 
 .PHONY: utils/padsp

Modified: trunk/src/daemon/Makefile
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/daemon/Makefile?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/daemon/Makefile (original)
+++ trunk/src/daemon/Makefile Mon Jun 19 23:53:48 2006
@@ -1,1 +1,1 @@
-link ../polyp/Makefile
+link ../pulse/Makefile

Modified: trunk/src/daemon/caps.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/daemon/caps.c?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/daemon/caps.c (original)
+++ trunk/src/daemon/caps.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -32,9 +32,9 @@
 #include <sys/capability.h>
 #endif
 
-#include <polypcore/core-error.h>
+#include <pulsecore/core-error.h>
 
-#include <polypcore/log.h>
+#include <pulsecore/log.h>
 
 #include "caps.h"
 

Modified: trunk/src/daemon/caps.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/daemon/caps.h?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/daemon/caps.h (original)
+++ trunk/src/daemon/caps.h Mon Jun 19 23:53:48 2006
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/

Modified: trunk/src/daemon/cmdline.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/daemon/cmdline.c?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/daemon/cmdline.c (original)
+++ trunk/src/daemon/cmdline.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -30,10 +30,10 @@
 #include <getopt.h>
 #include <sys/stat.h>
 
-#include <polyp/xmalloc.h>
-
-#include <polypcore/core-util.h>
-#include <polypcore/strbuf.h>
+#include <pulse/xmalloc.h>
+
+#include <pulsecore/core-util.h>
+#include <pulsecore/strbuf.h>
 
 #include "cmdline.h"
 

Modified: trunk/src/daemon/cmdline.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/daemon/cmdline.h?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/daemon/cmdline.h (original)
+++ trunk/src/daemon/cmdline.h Mon Jun 19 23:53:48 2006
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/

Modified: trunk/src/daemon/cpulimit.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/daemon/cpulimit.c?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/daemon/cpulimit.c (original)
+++ trunk/src/daemon/cpulimit.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -23,11 +23,11 @@
 #include <config.h>
 #endif
 
-#include <polyp/error.h>
-
-#include <polypcore/core-util.h>
-#include <polypcore/core-error.h>
-#include <polypcore/log.h>
+#include <pulse/error.h>
+
+#include <pulsecore/core-util.h>
+#include <pulsecore/core-error.h>
+#include <pulsecore/log.h>
 
 #include "cpulimit.h"
 

Modified: trunk/src/daemon/cpulimit.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/daemon/cpulimit.h?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/daemon/cpulimit.h (original)
+++ trunk/src/daemon/cpulimit.h Mon Jun 19 23:53:48 2006
@@ -4,27 +4,27 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include <polyp/mainloop-api.h>
+#include <pulse/mainloop-api.h>
 
-/* This kills the polypaudio process if it eats more than 70% of the
+/* This kills the pulseaudio process if it eats more than 70% of the
  * CPU time. This is build around setrlimit() and SIGXCPU. It is handy
  * in case of using SCHED_FIFO which may freeze the whole machine  */
 

Modified: trunk/src/daemon/daemon-conf.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/daemon/daemon-conf.c?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/daemon/daemon-conf.c (original)
+++ trunk/src/daemon/daemon-conf.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
-
-  polypaudio is free software; you can redistribute it and/or modify
+  This file is part of PulseAudio.
+
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
 
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -29,19 +29,19 @@
 #include <assert.h>
 #include <unistd.h>
 
-#include <polyp/xmalloc.h>
-
-#include <polypcore/core-error.h>
-#include <polypcore/core-util.h>
-#include <polypcore/strbuf.h>
-#include <polypcore/conf-parser.h>
-#include <polypcore/resampler.h>
+#include <pulse/xmalloc.h>
+
+#include <pulsecore/core-error.h>
+#include <pulsecore/core-util.h>
+#include <pulsecore/strbuf.h>
+#include <pulsecore/conf-parser.h>
+#include <pulsecore/resampler.h>
 
 #include "daemon-conf.h"
 
 #ifndef DEFAULT_CONFIG_DIR
 # ifndef OS_IS_WIN32
-#  define DEFAULT_CONFIG_DIR "/etc/polypaudio"
+#  define DEFAULT_CONFIG_DIR "/etc/pulseaudio"
 # else
 #  define DEFAULT_CONFIG_DIR "%POLYP_ROOT%"
 # endif
@@ -54,9 +54,9 @@
 #endif
 
 #define DEFAULT_SCRIPT_FILE DEFAULT_CONFIG_DIR PATH_SEP "default.pa"
-#define DEFAULT_SCRIPT_FILE_USER ".polypaudio" PATH_SEP "default.pa"
+#define DEFAULT_SCRIPT_FILE_USER ".pulseaudio" PATH_SEP "default.pa"
 #define DEFAULT_CONFIG_FILE DEFAULT_CONFIG_DIR PATH_SEP "daemon.conf"
-#define DEFAULT_CONFIG_FILE_USER ".polypaudio" PATH_SEP "daemon.conf"
+#define DEFAULT_CONFIG_FILE_USER ".pulseaudio" PATH_SEP "daemon.conf"
 
 #define ENV_SCRIPT_FILE "POLYP_SCRIPT"
 #define ENV_CONFIG_FILE "POLYP_CONFIG"

Modified: trunk/src/daemon/daemon-conf.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/daemon/daemon-conf.h?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/daemon/daemon-conf.h (original)
+++ trunk/src/daemon/daemon-conf.h Mon Jun 19 23:53:48 2006
@@ -4,25 +4,25 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
 
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
 
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include <polypcore/log.h>
+#include <pulsecore/log.h>
 
 /* The actual command to execute */
 typedef enum pa_daemon_conf_cmd {

Modified: trunk/src/daemon/daemon.conf.in
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/daemon/daemon.conf.in?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/daemon/daemon.conf.in (original)
+++ trunk/src/daemon/daemon.conf.in Mon Jun 19 23:53:48 2006
@@ -1,23 +1,23 @@
 # $Id$
 #
-# This file is part of polypaudio.
+# This file is part of PulseAudio.
 #
-# polypaudio is free software; you can redistribute it and/or modify
+# PulseAudio is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 #
-# polypaudio is distributed in the hope that it will be useful, but
+# PulseAudio 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 Lesser General Public License
-# along with polypaudio; if not, write to the Free Software
+# along with PulseAudio; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 
-## Configuration file for the polypaudio daemon. Default values are
+## Configuration file for the pulseaudio daemon. Default values are
 ## commented out.  Use either ; or # for commenting
 
 # Extra verbositiy
@@ -69,9 +69,9 @@
 ## hand it has the worst quality of all.
 ; resample-method = sinc-fastest
 
-## Create a PID file in /tmp/polypaudio-$USER/pid. Of this is enabled
-## you may use commands like "polypaudio --kill" or "polypaudio
-## --check". If you are planning to start more than one polypaudio
+## Create a PID file in /tmp/pulseaudio-$USER/pid. Of this is enabled
+## you may use commands like "pulseaudio --kill" or "pulseaudio
+## --check". If you are planning to start more than one pulseaudio
 ## process per user, you better disable this option since it
 ## effectively disables multiple instances.
 ; use-pid-file = 1

Modified: trunk/src/daemon/default.pa.in
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/daemon/default.pa.in?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/daemon/default.pa.in (original)
+++ trunk/src/daemon/default.pa.in Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 #!@POLYPAUDIO_BINARY@ -nF 
 
 #
-# This file is part of polypaudio.
+# This file is part of PulseAudio.
 #
-# polypaudio is free software; you can redistribute it and/or modify it
+# PulseAudio is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 #
-# polypaudio is distributed in the hope that it will be useful, but
+# PulseAudio 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 Lesser General Public License
-# along with polypaudio; if not, write to the Free Software Foundation,
+# along with PulseAudio; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
 
 

Modified: trunk/src/daemon/default.pa.win32
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/daemon/default.pa.win32?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/daemon/default.pa.win32 (original)
+++ trunk/src/daemon/default.pa.win32 Mon Jun 19 23:53:48 2006
@@ -1,18 +1,18 @@
 #
-# This file is part of polypaudio.
+# This file is part of PulseAudio.
 #
-# polypaudio is free software; you can redistribute it and/or modify it
+# PulseAudio is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 #
-# polypaudio is distributed in the hope that it will be useful, but
+# PulseAudio 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 Lesser General Public License
-# along with polypaudio; if not, write to the Free Software Foundation,
+# along with PulseAudio; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
 
 

Modified: trunk/src/daemon/dumpmodules.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/daemon/dumpmodules.c?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/daemon/dumpmodules.c (original)
+++ trunk/src/daemon/dumpmodules.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
 
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
 
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -29,9 +29,9 @@
 #include <stdio.h>
 #include <ltdl.h>
 
-#include <polyp/util.h>
+#include <pulse/util.h>
 
-#include <polypcore/modinfo.h>
+#include <pulsecore/modinfo.h>
 
 #include "dumpmodules.h"
 

Modified: trunk/src/daemon/dumpmodules.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/daemon/dumpmodules.h?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/daemon/dumpmodules.h (original)
+++ trunk/src/daemon/dumpmodules.h Mon Jun 19 23:53:48 2006
@@ -4,20 +4,20 @@
 /* $Id*/
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
 
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
 
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/

Modified: trunk/src/daemon/esdcompat.in
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/daemon/esdcompat.in?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/daemon/esdcompat.in (original)
+++ trunk/src/daemon/esdcompat.in Mon Jun 19 23:53:48 2006
@@ -2,20 +2,20 @@
 
 # $Id$
 #
-# This file is part of polypaudio.
+# This file is part of PulseAudio.
 #
-# polypaudio is free software; you can redistribute it and/or modify
+# PulseAudio is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 #
-# polypaudio is distributed in the hope that it will be useful, but
+# PulseAudio 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 Lesser General Public License
-# along with polypaudio; if not, write to the Free Software
+# along with PulseAudio; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 

Modified: trunk/src/daemon/main.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/daemon/main.c?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/daemon/main.c (original)
+++ trunk/src/daemon/main.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -48,24 +48,24 @@
 #include <tcpd.h>
 #endif
 
-#include "../polypcore/winsock.h"
-
-#include <polyp/mainloop.h>
-#include <polyp/mainloop-signal.h>
-#include <polyp/xmalloc.h>
-
-#include <polypcore/core-error.h>
-#include <polypcore/core.h>
-#include <polypcore/memblock.h>
-#include <polypcore/module.h>
-#include <polypcore/cli-command.h>
-#include <polypcore/log.h>
-#include <polypcore/core-util.h>
-#include <polypcore/sioman.h>
-#include <polypcore/cli-text.h>
-#include <polypcore/pid.h>
-#include <polypcore/namereg.h>
-#include <polypcore/random.h>
+#include "../pulsecore/winsock.h"
+
+#include <pulse/mainloop.h>
+#include <pulse/mainloop-signal.h>
+#include <pulse/xmalloc.h>
+
+#include <pulsecore/core-error.h>
+#include <pulsecore/core.h>
+#include <pulsecore/memblock.h>
+#include <pulsecore/module.h>
+#include <pulsecore/cli-command.h>
+#include <pulsecore/log.h>
+#include <pulsecore/core-util.h>
+#include <pulsecore/sioman.h>
+#include <pulsecore/cli-text.h>
+#include <pulsecore/pid.h>
+#include <pulsecore/namereg.h>
+#include <pulsecore/random.h>
 
 #include "cmdline.h"
 #include "cpulimit.h"
@@ -199,7 +199,7 @@
 
     pa_random_seed();
     
-    pa_log_set_ident("polypaudio");
+    pa_log_set_ident("pulseaudio");
     
     conf = pa_daemon_conf_new();
     

Modified: trunk/src/depmod.py
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/depmod.py?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/depmod.py (original)
+++ trunk/src/depmod.py Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 #!/usr/bin/python
 # $Id$
 #
-# This file is part of polypaudio.
+# This file is part of PulseAudio.
 #
-# polypaudio is free software; you can redistribute it and/or modify
+# PulseAudio is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 #
-# polypaudio is distributed in the hope that it will be useful, but
+# PulseAudio 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 Lesser General Public License
-# along with polypaudio; if not, write to the Free Software
+# along with PulseAudio; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 

Modified: trunk/src/modules/Makefile
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/Makefile?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/modules/Makefile (original)
+++ trunk/src/modules/Makefile Mon Jun 19 23:53:48 2006
@@ -1,1 +1,1 @@
-link ../polyp/Makefile
+link ../pulse/Makefile

Modified: trunk/src/modules/alsa-util.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/alsa-util.c?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/modules/alsa-util.c (original)
+++ trunk/src/modules/alsa-util.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -26,10 +26,10 @@
 #include <sys/types.h>
 #include <asoundlib.h>
 
-#include <polyp/sample.h>
-#include <polyp/xmalloc.h>
-
-#include <polypcore/log.h>
+#include <pulse/sample.h>
+#include <pulse/xmalloc.h>
+
+#include <pulsecore/log.h>
 
 #include "alsa-util.h"
 

Modified: trunk/src/modules/alsa-util.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/alsa-util.h?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/modules/alsa-util.h (original)
+++ trunk/src/modules/alsa-util.h Mon Jun 19 23:53:48 2006
@@ -4,30 +4,30 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
 #include <asoundlib.h>
 
-#include <polyp/sample.h>
-#include <polyp/mainloop-api.h>
+#include <pulse/sample.h>
+#include <pulse/mainloop-api.h>
 
-#include <polyp/channelmap.h>
+#include <pulse/channelmap.h>
 
 struct pa_alsa_fdlist;
 

Modified: trunk/src/modules/howl-wrap.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/howl-wrap.c?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/modules/howl-wrap.c (original)
+++ trunk/src/modules/howl-wrap.c Mon Jun 19 23:53:48 2006
@@ -1,30 +1,30 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
 #include <assert.h>
 
-#include <polyp/xmalloc.h>
+#include <pulse/xmalloc.h>
 
-#include <polypcore/log.h>
-#include <polypcore/props.h>
+#include <pulsecore/log.h>
+#include <pulsecore/props.h>
 
 #include "howl-wrap.h"
 

Modified: trunk/src/modules/howl-wrap.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/howl-wrap.h?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/modules/howl-wrap.h (original)
+++ trunk/src/modules/howl-wrap.h Mon Jun 19 23:53:48 2006
@@ -4,27 +4,27 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
 #include <howl.h>
 
-#include <polypcore/core.h>
+#include <pulsecore/core.h>
 
 typedef struct pa_howl_wrapper pa_howl_wrapper;
 

Modified: trunk/src/modules/module-alsa-sink.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-alsa-sink.c?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/modules/module-alsa-sink.c (original)
+++ trunk/src/modules/module-alsa-sink.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -34,16 +34,16 @@
 
 #include <asoundlib.h>
 
-#include <polyp/xmalloc.h>
-
-#include <polypcore/core.h>
-#include <polypcore/module.h>
-#include <polypcore/memchunk.h>
-#include <polypcore/sink.h>
-#include <polypcore/modargs.h>
-#include <polypcore/core-util.h>
-#include <polypcore/sample-util.h>
-#include <polypcore/log.h>
+#include <pulse/xmalloc.h>
+
+#include <pulsecore/core.h>
+#include <pulsecore/module.h>
+#include <pulsecore/memchunk.h>
+#include <pulsecore/sink.h>
+#include <pulsecore/modargs.h>
+#include <pulsecore/core-util.h>
+#include <pulsecore/sample-util.h>
+#include <pulsecore/log.h>
 
 #include "alsa-util.h"
 #include "module-alsa-sink-symdef.h"

Modified: trunk/src/modules/module-alsa-source.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-alsa-source.c?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/modules/module-alsa-source.c (original)
+++ trunk/src/modules/module-alsa-source.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -34,17 +34,17 @@
 
 #include <asoundlib.h>
 
-#include <polyp/xmalloc.h>
-
-#include <polypcore/core-error.h>
-#include <polypcore/core.h>
-#include <polypcore/module.h>
-#include <polypcore/memchunk.h>
-#include <polypcore/sink.h>
-#include <polypcore/modargs.h>
-#include <polypcore/core-util.h>
-#include <polypcore/sample-util.h>
-#include <polypcore/log.h>
+#include <pulse/xmalloc.h>
+
+#include <pulsecore/core-error.h>
+#include <pulsecore/core.h>
+#include <pulsecore/module.h>
+#include <pulsecore/memchunk.h>
+#include <pulsecore/sink.h>
+#include <pulsecore/modargs.h>
+#include <pulsecore/core-util.h>
+#include <pulsecore/sample-util.h>
+#include <pulsecore/log.h>
 
 #include "alsa-util.h"
 #include "module-alsa-source-symdef.h"

Modified: trunk/src/modules/module-cli.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-cli.c?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/modules/module-cli.c (original)
+++ trunk/src/modules/module-cli.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -27,12 +27,12 @@
 #include <assert.h>
 #include <unistd.h>
 
-#include <polypcore/module.h>
-#include <polypcore/iochannel.h>
-#include <polypcore/cli.h>
-#include <polypcore/sioman.h>
-#include <polypcore/log.h>
-#include <polypcore/modargs.h>
+#include <pulsecore/module.h>
+#include <pulsecore/iochannel.h>
+#include <pulsecore/cli.h>
+#include <pulsecore/sioman.h>
+#include <pulsecore/log.h>
+#include <pulsecore/modargs.h>
 
 #include "module-cli-symdef.h"
 

Modified: trunk/src/modules/module-combine.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-combine.c?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/modules/module-combine.c (original)
+++ trunk/src/modules/module-combine.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -26,18 +26,18 @@
 #include <assert.h>
 #include <stdio.h>
 
-#include <polyp/timeval.h>
-#include <polyp/xmalloc.h>
-
-#include <polypcore/module.h>
-#include <polypcore/llist.h>
-#include <polypcore/sink.h>
-#include <polypcore/sink-input.h>
-#include <polypcore/memblockq.h>
-#include <polypcore/log.h>
-#include <polypcore/core-util.h>
-#include <polypcore/modargs.h>
-#include <polypcore/namereg.h>
+#include <pulse/timeval.h>
+#include <pulse/xmalloc.h>
+
+#include <pulsecore/module.h>
+#include <pulsecore/llist.h>
+#include <pulsecore/sink.h>
+#include <pulsecore/sink-input.h>
+#include <pulsecore/memblockq.h>
+#include <pulsecore/log.h>
+#include <pulsecore/core-util.h>
+#include <pulsecore/modargs.h>
+#include <pulsecore/namereg.h>
 
 #include "module-combine-symdef.h"
 

Modified: trunk/src/modules/module-defs.h.m4
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-defs.h.m4?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/modules/module-defs.h.m4 (original)
+++ trunk/src/modules/module-defs.h.m4 Mon Jun 19 23:53:48 2006
@@ -8,8 +8,8 @@
 #ifndef incmacro
 #define incmacro
 
-#include <polypcore/core.h>
-#include <polypcore/module.h>
+#include <pulsecore/core.h>
+#include <pulsecore/module.h>
 
 gen_symbol(pa__init)
 gen_symbol(pa__done)

Modified: trunk/src/modules/module-detect.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-detect.c?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/modules/module-detect.c (original)
+++ trunk/src/modules/module-detect.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -33,13 +33,13 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include <polyp/xmalloc.h>
-
-#include <polypcore/core-error.h>
-#include <polypcore/module.h>
-#include <polypcore/modargs.h>
-#include <polypcore/log.h>
-#include <polypcore/core-util.h>
+#include <pulse/xmalloc.h>
+
+#include <pulsecore/core-error.h>
+#include <pulsecore/module.h>
+#include <pulsecore/modargs.h>
+#include <pulsecore/log.h>
+#include <pulsecore/core-util.h>
 
 #include "module-detect-symdef.h"
 

Modified: trunk/src/modules/module-esound-compat-spawnfd.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-esound-compat-spawnfd.c?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/modules/module-esound-compat-spawnfd.c (original)
+++ trunk/src/modules/module-esound-compat-spawnfd.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -28,11 +28,11 @@
 #include <string.h>
 #include <errno.h>
 
-#include <polypcore/core-error.h>
-#include <polypcore/module.h>
-#include <polypcore/modargs.h>
-#include <polypcore/core-util.h>
-#include <polypcore/log.h>
+#include <pulsecore/core-error.h>
+#include <pulsecore/module.h>
+#include <pulsecore/modargs.h>
+#include <pulsecore/core-util.h>
+#include <pulsecore/log.h>
 
 #include "module-esound-compat-spawnfd-symdef.h"
 

Modified: trunk/src/modules/module-esound-compat-spawnpid.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-esound-compat-spawnpid.c?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/modules/module-esound-compat-spawnpid.c (original)
+++ trunk/src/modules/module-esound-compat-spawnpid.c Mon Jun 19 23:53:48 2006
@@ -1,19 +1,19 @@
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -28,11 +28,11 @@
 #include <errno.h>
 #include <signal.h>
 
-#include <polypcore/core-error.h>
-#include <polypcore/module.h>
-#include <polypcore/core-util.h>
-#include <polypcore/modargs.h>
-#include <polypcore/log.h>
+#include <pulsecore/core-error.h>
+#include <pulsecore/module.h>
+#include <pulsecore/core-util.h>
+#include <pulsecore/modargs.h>
+#include <pulsecore/log.h>
 
 #include "module-esound-compat-spawnpid-symdef.h"
 

Modified: trunk/src/modules/module-esound-sink.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-esound-sink.c?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/modules/module-esound-sink.c (original)
+++ trunk/src/modules/module-esound-sink.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -33,18 +33,18 @@
 #include <unistd.h>
 #include <limits.h>
 
-#include <polyp/xmalloc.h>
-
-#include <polypcore/core-error.h>
-#include <polypcore/iochannel.h>
-#include <polypcore/sink.h>
-#include <polypcore/module.h>
-#include <polypcore/core-util.h>
-#include <polypcore/modargs.h>
-#include <polypcore/log.h>
-#include <polypcore/socket-client.h>
-#include <polypcore/esound.h>
-#include <polypcore/authkey.h>
+#include <pulse/xmalloc.h>
+
+#include <pulsecore/core-error.h>
+#include <pulsecore/iochannel.h>
+#include <pulsecore/sink.h>
+#include <pulsecore/module.h>
+#include <pulsecore/core-util.h>
+#include <pulsecore/modargs.h>
+#include <pulsecore/log.h>
+#include <pulsecore/socket-client.h>
+#include <pulsecore/esound.h>
+#include <pulsecore/authkey.h>
 
 #include "module-esound-sink-symdef.h"
 

Modified: trunk/src/modules/module-jack-sink.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-jack-sink.c?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/modules/module-jack-sink.c (original)
+++ trunk/src/modules/module-jack-sink.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -36,16 +36,16 @@
 
 #include <jack/jack.h>
 
-#include <polyp/xmalloc.h>
-
-#include <polypcore/core-error.h>
-#include <polypcore/iochannel.h>
-#include <polypcore/sink.h>
-#include <polypcore/module.h>
-#include <polypcore/core-util.h>
-#include <polypcore/modargs.h>
-#include <polypcore/log.h>
-#include <polyp/mainloop-api.h>
+#include <pulse/xmalloc.h>
+
+#include <pulsecore/core-error.h>
+#include <pulsecore/iochannel.h>
+#include <pulsecore/sink.h>
+#include <pulsecore/module.h>
+#include <pulsecore/core-util.h>
+#include <pulsecore/modargs.h>
+#include <pulsecore/log.h>
+#include <pulse/mainloop-api.h>
 
 #include "module-jack-sink-symdef.h"
 
@@ -261,7 +261,7 @@
     }
         
     server_name = pa_modargs_get_value(ma, "server_name", NULL);
-    client_name = pa_modargs_get_value(ma, "client_name", "polypaudio");
+    client_name = pa_modargs_get_value(ma, "client_name", "pulseaudio");
 
     u = pa_xnew0(struct userdata, 1);
     m->userdata = u;

Modified: trunk/src/modules/module-jack-source.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-jack-source.c?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/modules/module-jack-source.c (original)
+++ trunk/src/modules/module-jack-source.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -36,16 +36,16 @@
 
 #include <jack/jack.h>
 
-#include <polyp/xmalloc.h>
-
-#include <polypcore/core-error.h>
-#include <polypcore/iochannel.h>
-#include <polypcore/source.h>
-#include <polypcore/module.h>
-#include <polypcore/core-util.h>
-#include <polypcore/modargs.h>
-#include <polypcore/log.h>
-#include <polyp/mainloop-api.h>
+#include <pulse/xmalloc.h>
+
+#include <pulsecore/core-error.h>
+#include <pulsecore/iochannel.h>
+#include <pulsecore/source.h>
+#include <pulsecore/module.h>
+#include <pulsecore/core-util.h>
+#include <pulsecore/modargs.h>
+#include <pulsecore/log.h>
+#include <pulse/mainloop-api.h>
 
 #include "module-jack-source-symdef.h"
 
@@ -259,7 +259,7 @@
     }
         
     server_name = pa_modargs_get_value(ma, "server_name", NULL);
-    client_name = pa_modargs_get_value(ma, "client_name", "polypaudio");
+    client_name = pa_modargs_get_value(ma, "client_name", "pulseaudio");
 
     u = pa_xnew0(struct userdata, 1);
     m->userdata = u;

Modified: trunk/src/modules/module-lirc.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-lirc.c?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/modules/module-lirc.c (original)
+++ trunk/src/modules/module-lirc.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -30,13 +30,13 @@
 #include <lirc/lirc_client.h>
 #include <stdlib.h>
 
-#include <polyp/xmalloc.h>
-
-#include <polypcore/module.h>
-#include <polypcore/log.h>
-#include <polypcore/namereg.h>
-#include <polypcore/sink.h>
-#include <polypcore/modargs.h>
+#include <pulse/xmalloc.h>
+
+#include <pulsecore/module.h>
+#include <pulsecore/log.h>
+#include <pulsecore/namereg.h>
+#include <pulsecore/sink.h>
+#include <pulsecore/modargs.h>
 
 #include "module-lirc-symdef.h"
 
@@ -203,7 +203,7 @@
     u->lirc_fd = -1;
     u->mute_toggle_save = 0;
 
-    if ((u->lirc_fd = lirc_init((char*) pa_modargs_get_value(ma, "appname", "polypaudio"), 1)) < 0) {
+    if ((u->lirc_fd = lirc_init((char*) pa_modargs_get_value(ma, "appname", "pulseaudio"), 1)) < 0) {
         pa_log(__FILE__": lirc_init() failed.");
         goto fail;
     }

Modified: trunk/src/modules/module-match.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-match.c?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/modules/module-match.c (original)
+++ trunk/src/modules/module-match.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -32,16 +32,16 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <polyp/xmalloc.h>
-
-#include <polypcore/core-error.h>
-#include <polypcore/module.h>
-#include <polypcore/core-util.h>
-#include <polypcore/modargs.h>
-#include <polypcore/log.h>
-#include <polypcore/core-subscribe.h>
-#include <polypcore/sink-input.h>
-#include <polypcore/core-util.h>
+#include <pulse/xmalloc.h>
+
+#include <pulsecore/core-error.h>
+#include <pulsecore/module.h>
+#include <pulsecore/core-util.h>
+#include <pulsecore/modargs.h>
+#include <pulsecore/log.h>
+#include <pulsecore/core-subscribe.h>
+#include <pulsecore/sink-input.h>
+#include <pulsecore/core-util.h>
 
 #include "module-match-symdef.h"
 
@@ -53,11 +53,11 @@
 #define WHITESPACE "\n\r \t"
 
 #ifndef DEFAULT_CONFIG_DIR
-#define DEFAULT_CONFIG_DIR "/etc/polypaudio"
+#define DEFAULT_CONFIG_DIR "/etc/pulseaudio"
 #endif
 
 #define DEFAULT_MATCH_TABLE_FILE DEFAULT_CONFIG_DIR"/match.table"
-#define DEFAULT_MATCH_TABLE_FILE_USER ".polypaudio/match.table"
+#define DEFAULT_MATCH_TABLE_FILE_USER ".pulseaudio/match.table"
 
 static const char* const valid_modargs[] = {
     "table",

Modified: trunk/src/modules/module-mmkbd-evdev.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-mmkbd-evdev.c?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/modules/module-mmkbd-evdev.c (original)
+++ trunk/src/modules/module-mmkbd-evdev.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -33,15 +33,15 @@
 
 #include <linux/input.h>
 
-#include <polyp/xmalloc.h>
-
-#include <polypcore/core-error.h>
-#include <polypcore/module.h>
-#include <polypcore/log.h>
-#include <polypcore/namereg.h>
-#include <polypcore/sink.h>
-#include <polypcore/modargs.h>
-#include <polypcore/core-util.h>
+#include <pulse/xmalloc.h>
+
+#include <pulsecore/core-error.h>
+#include <pulsecore/module.h>
+#include <pulsecore/log.h>
+#include <pulsecore/namereg.h>
+#include <pulsecore/sink.h>
+#include <pulsecore/modargs.h>
+#include <pulsecore/core-util.h>
 
 #include "module-mmkbd-evdev-symdef.h"
 

Modified: trunk/src/modules/module-native-protocol-fd.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-native-protocol-fd.c?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/modules/module-native-protocol-fd.c (original)
+++ trunk/src/modules/module-native-protocol-fd.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -27,11 +27,11 @@
 #include <assert.h>
 #include <unistd.h>
 
-#include <polypcore/module.h>
-#include <polypcore/iochannel.h>
-#include <polypcore/modargs.h>
-#include <polypcore/protocol-native.h>
-#include <polypcore/log.h>
+#include <pulsecore/module.h>
+#include <pulsecore/iochannel.h>
+#include <pulsecore/modargs.h>
+#include <pulsecore/protocol-native.h>
+#include <pulsecore/log.h>
 
 #include "module-native-protocol-fd-symdef.h"
 

Modified: trunk/src/modules/module-null-sink.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-null-sink.c?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/modules/module-null-sink.c (original)
+++ trunk/src/modules/module-null-sink.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -33,15 +33,15 @@
 #include <unistd.h>
 #include <limits.h>
 
-#include <polyp/timeval.h>
-#include <polyp/xmalloc.h>
+#include <pulse/timeval.h>
+#include <pulse/xmalloc.h>
 
-#include <polypcore/iochannel.h>
-#include <polypcore/sink.h>
-#include <polypcore/module.h>
-#include <polypcore/core-util.h>
-#include <polypcore/modargs.h>
-#include <polypcore/log.h>
+#include <pulsecore/iochannel.h>
+#include <pulsecore/sink.h>
+#include <pulsecore/module.h>
+#include <pulsecore/core-util.h>
+#include <pulsecore/modargs.h>
+#include <pulsecore/log.h>
 
 #include "module-null-sink-symdef.h"
 

Modified: trunk/src/modules/module-oss-mmap.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-oss-mmap.c?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/modules/module-oss-mmap.c (original)
+++ trunk/src/modules/module-oss-mmap.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -36,17 +36,17 @@
 #include <limits.h>
 #include <sys/mman.h>
 
-#include <polyp/xmalloc.h>
-
-#include <polypcore/core-error.h>
-#include <polypcore/iochannel.h>
-#include <polypcore/sink.h>
-#include <polypcore/source.h>
-#include <polypcore/module.h>
-#include <polypcore/sample-util.h>
-#include <polypcore/core-util.h>
-#include <polypcore/modargs.h>
-#include <polypcore/log.h>
+#include <pulse/xmalloc.h>
+
+#include <pulsecore/core-error.h>
+#include <pulsecore/iochannel.h>
+#include <pulsecore/sink.h>
+#include <pulsecore/source.h>
+#include <pulsecore/module.h>
+#include <pulsecore/sample-util.h>
+#include <pulsecore/core-util.h>
+#include <pulsecore/modargs.h>
+#include <pulsecore/log.h>
 
 #include "oss-util.h"
 #include "module-oss-mmap-symdef.h"

Modified: trunk/src/modules/module-oss.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-oss.c?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/modules/module-oss.c (original)
+++ trunk/src/modules/module-oss.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -35,17 +35,17 @@
 #include <unistd.h>
 #include <limits.h>
 
-#include <polyp/xmalloc.h>
-
-#include <polypcore/core-error.h>
-#include <polypcore/iochannel.h>
-#include <polypcore/sink.h>
-#include <polypcore/source.h>
-#include <polypcore/module.h>
-#include <polypcore/sample-util.h>
-#include <polypcore/core-util.h>
-#include <polypcore/modargs.h>
-#include <polypcore/log.h>
+#include <pulse/xmalloc.h>
+
+#include <pulsecore/core-error.h>
+#include <pulsecore/iochannel.h>
+#include <pulsecore/sink.h>
+#include <pulsecore/source.h>
+#include <pulsecore/module.h>
+#include <pulsecore/sample-util.h>
+#include <pulsecore/core-util.h>
+#include <pulsecore/modargs.h>
+#include <pulsecore/log.h>
 
 #include "oss-util.h"
 #include "module-oss-symdef.h"

Modified: trunk/src/modules/module-pipe-sink.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-pipe-sink.c?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/modules/module-pipe-sink.c (original)
+++ trunk/src/modules/module-pipe-sink.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -33,15 +33,15 @@
 #include <unistd.h>
 #include <limits.h>
 
-#include <polyp/xmalloc.h>
-
-#include <polypcore/core-error.h>
-#include <polypcore/iochannel.h>
-#include <polypcore/sink.h>
-#include <polypcore/module.h>
-#include <polypcore/core-util.h>
-#include <polypcore/modargs.h>
-#include <polypcore/log.h>
+#include <pulse/xmalloc.h>
+
+#include <pulsecore/core-error.h>
+#include <pulsecore/iochannel.h>
+#include <pulsecore/sink.h>
+#include <pulsecore/module.h>
+#include <pulsecore/core-util.h>
+#include <pulsecore/modargs.h>
+#include <pulsecore/log.h>
 
 #include "module-pipe-sink-symdef.h"
 

Modified: trunk/src/modules/module-pipe-source.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-pipe-source.c?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/modules/module-pipe-source.c (original)
+++ trunk/src/modules/module-pipe-source.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -33,15 +33,15 @@
 #include <unistd.h>
 #include <limits.h>
 
-#include <polyp/xmalloc.h>
-
-#include <polypcore/core-error.h>
-#include <polypcore/iochannel.h>
-#include <polypcore/source.h>
-#include <polypcore/module.h>
-#include <polypcore/core-util.h>
-#include <polypcore/modargs.h>
-#include <polypcore/log.h>
+#include <pulse/xmalloc.h>
+
+#include <pulsecore/core-error.h>
+#include <pulsecore/iochannel.h>
+#include <pulsecore/source.h>
+#include <pulsecore/module.h>
+#include <pulsecore/core-util.h>
+#include <pulsecore/modargs.h>
+#include <pulsecore/log.h>
 
 #include "module-pipe-source-symdef.h"
 

Modified: trunk/src/modules/module-protocol-stub.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-protocol-stub.c?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/modules/module-protocol-stub.c (original)
+++ trunk/src/modules/module-protocol-stub.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -40,18 +40,18 @@
 #include <netinet/in.h>
 #endif
 
-#include "../polypcore/winsock.h"
-
-#include <polyp/xmalloc.h>
-
-#include <polypcore/core-error.h>
-#include <polypcore/module.h>
-#include <polypcore/socket-server.h>
-#include <polypcore/socket-util.h>
-#include <polypcore/core-util.h>
-#include <polypcore/modargs.h>
-#include <polypcore/log.h>
-#include <polypcore/native-common.h>
+#include "../pulsecore/winsock.h"
+
+#include <pulse/xmalloc.h>
+
+#include <pulsecore/core-error.h>
+#include <pulsecore/module.h>
+#include <pulsecore/socket-server.h>
+#include <pulsecore/socket-util.h>
+#include <pulsecore/core-util.h>
+#include <pulsecore/modargs.h>
+#include <pulsecore/log.h>
+#include <pulsecore/native-common.h>
 
 #ifdef USE_TCP_SOCKETS
 #define SOCKET_DESCRIPTION "(TCP sockets)"
@@ -62,10 +62,10 @@
 #endif
 
 #if defined(USE_PROTOCOL_SIMPLE)
-  #include <polypcore/protocol-simple.h>
+  #include <pulsecore/protocol-simple.h>
   #define protocol_new pa_protocol_simple_new
   #define protocol_free pa_protocol_simple_free
-  #define TCPWRAP_SERVICE "polypaudio-simple"
+  #define TCPWRAP_SERVICE "pulseaudio-simple"
   #define IPV4_PORT 4711
   #define UNIX_SOCKET "simple"
   #define MODULE_ARGUMENTS "rate", "format", "channels", "sink", "source", "playback", "record",
@@ -77,10 +77,10 @@
   PA_MODULE_DESCRIPTION("Simple protocol "SOCKET_DESCRIPTION)
   PA_MODULE_USAGE("rate=<sample rate> format=<sample format> channels=<number of channels> sink=<sink to connect to> source=<source to connect to> playback=<enable playback?> record=<enable record?> "SOCKET_USAGE)
 #elif defined(USE_PROTOCOL_CLI)
-  #include <polypcore/protocol-cli.h> 
+  #include <pulsecore/protocol-cli.h> 
   #define protocol_new pa_protocol_cli_new
   #define protocol_free pa_protocol_cli_free
-  #define TCPWRAP_SERVICE "polypaudio-cli"
+  #define TCPWRAP_SERVICE "pulseaudio-cli"
   #define IPV4_PORT 4712
   #define UNIX_SOCKET "cli"
   #define MODULE_ARGUMENTS 
@@ -92,10 +92,10 @@
   PA_MODULE_DESCRIPTION("Command line interface protocol "SOCKET_DESCRIPTION)
   PA_MODULE_USAGE(SOCKET_USAGE)
 #elif defined(USE_PROTOCOL_HTTP)
-  #include <polypcore/protocol-http.h>
+  #include <pulsecore/protocol-http.h>
   #define protocol_new pa_protocol_http_new
   #define protocol_free pa_protocol_http_free
-  #define TCPWRAP_SERVICE "polypaudio-http"
+  #define TCPWRAP_SERVICE "pulseaudio-http"
   #define IPV4_PORT 4714
   #define UNIX_SOCKET "http"
   #define MODULE_ARGUMENTS 
@@ -107,10 +107,10 @@
   PA_MODULE_DESCRIPTION("HTTP "SOCKET_DESCRIPTION)
   PA_MODULE_USAGE(SOCKET_USAGE)
 #elif defined(USE_PROTOCOL_NATIVE)
-  #include <polypcore/protocol-native.h>
+  #include <pulsecore/protocol-native.h>
   #define protocol_new pa_protocol_native_new
   #define protocol_free pa_protocol_native_free
-  #define TCPWRAP_SERVICE "polypaudio-native"
+  #define TCPWRAP_SERVICE "pulseaudio-native"
   #define IPV4_PORT PA_NATIVE_DEFAULT_PORT
   #define UNIX_SOCKET PA_NATIVE_DEFAULT_UNIX_SOCKET
   #define MODULE_ARGUMENTS_COMMON "cookie", "auth-anonymous",
@@ -131,8 +131,8 @@
   PA_MODULE_DESCRIPTION("Native protocol "SOCKET_DESCRIPTION)
   PA_MODULE_USAGE("auth-anonymous=<don't check for cookies?> cookie=<path to cookie file> "AUTH_USAGE SOCKET_USAGE)
 #elif defined(USE_PROTOCOL_ESOUND)
-  #include <polypcore/protocol-esound.h>
-  #include <polypcore/esound.h>
+  #include <pulsecore/protocol-esound.h>
+  #include <pulsecore/esound.h>
   #define protocol_new pa_protocol_esound_new
   #define protocol_free pa_protocol_esound_free
   #define TCPWRAP_SERVICE "esound"

Modified: trunk/src/modules/module-sine.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-sine.c?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/modules/module-sine.c (original)
+++ trunk/src/modules/module-sine.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -27,13 +27,13 @@
 #include <assert.h>
 #include <math.h>
 
-#include <polyp/xmalloc.h>
+#include <pulse/xmalloc.h>
 
-#include <polypcore/sink-input.h>
-#include <polypcore/module.h>
-#include <polypcore/modargs.h>
-#include <polypcore/namereg.h>
-#include <polypcore/log.h>
+#include <pulsecore/sink-input.h>
+#include <pulsecore/module.h>
+#include <pulsecore/modargs.h>
+#include <pulsecore/namereg.h>
+#include <pulsecore/log.h>
 
 #include "module-sine-symdef.h"
 

Modified: trunk/src/modules/module-solaris.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-solaris.c?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/modules/module-solaris.c (original)
+++ trunk/src/modules/module-solaris.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -40,18 +40,18 @@
 #include <sys/conf.h>
 #include <sys/audio.h>
 
-#include <polyp/error.h>
-#include <polyp/mainloop-signal.h>
-#include <polyp/xmalloc.h>
-
-#include <polypcore/iochannel.h>
-#include <polypcore/sink.h>
-#include <polypcore/source.h>
-#include <polypcore/module.h>
-#include <polypcore/sample-util.h>
-#include <polypcore/core-util.h>
-#include <polypcore/modargs.h>
-#include <polypcore/log.h>
+#include <pulse/error.h>
+#include <pulse/mainloop-signal.h>
+#include <pulse/xmalloc.h>
+
+#include <pulsecore/iochannel.h>
+#include <pulsecore/sink.h>
+#include <pulsecore/source.h>
+#include <pulsecore/module.h>
+#include <pulsecore/sample-util.h>
+#include <pulsecore/core-util.h>
+#include <pulsecore/modargs.h>
+#include <pulsecore/log.h>
 
 #include "module-solaris-symdef.h"
 

Modified: trunk/src/modules/module-tunnel.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-tunnel.c?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/modules/module-tunnel.c (original)
+++ trunk/src/modules/module-tunnel.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -31,24 +31,24 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <polyp/timeval.h>
-#include <polyp/util.h>
-#include <polyp/version.h>
-#include <polyp/xmalloc.h>
-
-#include <polypcore/module.h>
-#include <polypcore/core-util.h>
-#include <polypcore/modargs.h>
-#include <polypcore/log.h>
-#include <polypcore/core-subscribe.h>
-#include <polypcore/sink-input.h>
-#include <polypcore/pdispatch.h>
-#include <polypcore/pstream.h>
-#include <polypcore/pstream-util.h>
-#include <polypcore/authkey.h>
-#include <polypcore/socket-client.h>
-#include <polypcore/socket-util.h>
-#include <polypcore/authkey-prop.h>
+#include <pulse/timeval.h>
+#include <pulse/util.h>
+#include <pulse/version.h>
+#include <pulse/xmalloc.h>
+
+#include <pulsecore/module.h>
+#include <pulsecore/core-util.h>
+#include <pulsecore/modargs.h>
+#include <pulsecore/log.h>
+#include <pulsecore/core-subscribe.h>
+#include <pulsecore/sink-input.h>
+#include <pulsecore/pdispatch.h>
+#include <pulsecore/pstream.h>
+#include <pulsecore/pstream-util.h>
+#include <pulsecore/authkey.h>
+#include <pulsecore/socket-client.h>
+#include <pulsecore/socket-util.h>
+#include <pulsecore/authkey-prop.h>
 
 #ifdef TUNNEL_SINK
 #include "module-tunnel-sink-symdef.h"

Modified: trunk/src/modules/module-volume-restore.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-volume-restore.c?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/modules/module-volume-restore.c (original)
+++ trunk/src/modules/module-volume-restore.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -32,17 +32,17 @@
 #include <stdlib.h>
 #include <ctype.h>
 
-#include <polyp/xmalloc.h>
-
-#include <polypcore/core-error.h>
-#include <polypcore/module.h>
-#include <polypcore/core-util.h>
-#include <polypcore/modargs.h>
-#include <polypcore/log.h>
-#include <polypcore/core-subscribe.h>
-#include <polypcore/sink-input.h>
-#include <polypcore/core-util.h>
-#include <polyp/volume.h>
+#include <pulse/xmalloc.h>
+
+#include <pulsecore/core-error.h>
+#include <pulsecore/module.h>
+#include <pulsecore/core-util.h>
+#include <pulsecore/modargs.h>
+#include <pulsecore/log.h>
+#include <pulsecore/core-subscribe.h>
+#include <pulsecore/sink-input.h>
+#include <pulsecore/core-util.h>
+#include <pulse/volume.h>
 
 #include "module-volume-restore-symdef.h"
 
@@ -53,7 +53,7 @@
 
 #define WHITESPACE "\n\r \t"
 
-#define DEFAULT_VOLUME_TABLE_FILE ".polypaudio/volume.table"
+#define DEFAULT_VOLUME_TABLE_FILE ".pulseaudio/volume.table"
 
 static const char* const valid_modargs[] = {
     "table",

Modified: trunk/src/modules/module-waveout.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-waveout.c?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/modules/module-waveout.c (original)
+++ trunk/src/modules/module-waveout.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -27,17 +27,17 @@
 #include <mmsystem.h>
 #include <assert.h>
 
-#include <polyp/mainloop-api.h>
-
-#include <polyp/xmalloc.h>
-
-#include <polypcore/sink.h>
-#include <polypcore/source.h>
-#include <polypcore/module.h>
-#include <polypcore/modargs.h>
-#include <polypcore/sample-util.h>
-#include <polypcore/core-util.h>
-#include <polypcore/log.h>
+#include <pulse/mainloop-api.h>
+
+#include <pulse/xmalloc.h>
+
+#include <pulsecore/sink.h>
+#include <pulsecore/source.h>
+#include <pulsecore/module.h>
+#include <pulsecore/modargs.h>
+#include <pulsecore/sample-util.h>
+#include <pulsecore/core-util.h>
+#include <pulsecore/log.h>
 
 #include "module-waveout-symdef.h"
 

Modified: trunk/src/modules/module-x11-bell.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-x11-bell.c?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/modules/module-x11-bell.c (original)
+++ trunk/src/modules/module-x11-bell.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -31,15 +31,15 @@
 #include <X11/Xlib.h>
 #include <X11/XKBlib.h>
 
-#include <polyp/xmalloc.h>
+#include <pulse/xmalloc.h>
 
-#include <polypcore/iochannel.h>
-#include <polypcore/sink.h>
-#include <polypcore/core-scache.h>
-#include <polypcore/modargs.h>
-#include <polypcore/namereg.h>
-#include <polypcore/log.h>
-#include <polypcore/x11wrap.h>
+#include <pulsecore/iochannel.h>
+#include <pulsecore/sink.h>
+#include <pulsecore/core-scache.h>
+#include <pulsecore/modargs.h>
+#include <pulsecore/namereg.h>
+#include <pulsecore/log.h>
+#include <pulsecore/x11wrap.h>
 
 #include "module-x11-bell-symdef.h"
 

Modified: trunk/src/modules/module-x11-publish.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-x11-publish.c?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/modules/module-x11-publish.c (original)
+++ trunk/src/modules/module-x11-publish.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -32,23 +32,23 @@
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 
-#include <polyp/util.h>
-#include <polyp/xmalloc.h>
+#include <pulse/util.h>
+#include <pulse/xmalloc.h>
 
-#include <polypcore/module.h>
-#include <polypcore/sink.h>
-#include <polypcore/core-scache.h>
-#include <polypcore/modargs.h>
-#include <polypcore/namereg.h>
-#include <polypcore/log.h>
-#include <polypcore/x11wrap.h>
-#include <polypcore/core-util.h>
-#include <polypcore/native-common.h>
-#include <polypcore/authkey-prop.h>
-#include <polypcore/authkey.h>
-#include <polypcore/x11prop.h>
-#include <polypcore/strlist.h>
-#include <polypcore/props.h>
+#include <pulsecore/module.h>
+#include <pulsecore/sink.h>
+#include <pulsecore/core-scache.h>
+#include <pulsecore/modargs.h>
+#include <pulsecore/namereg.h>
+#include <pulsecore/log.h>
+#include <pulsecore/x11wrap.h>
+#include <pulsecore/core-util.h>
+#include <pulsecore/native-common.h>
+#include <pulsecore/authkey-prop.h>
+#include <pulsecore/authkey.h>
+#include <pulsecore/x11prop.h>
+#include <pulsecore/strlist.h>
+#include <pulsecore/props.h>
 
 #include "module-x11-publish-symdef.h"
 

Modified: trunk/src/modules/module-zeroconf-publish.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-zeroconf-publish.c?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/modules/module-zeroconf-publish.c (original)
+++ trunk/src/modules/module-zeroconf-publish.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -29,20 +29,20 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <polyp/xmalloc.h>
-#include <polyp/util.h>
-
-#include <polypcore/autoload.h>
-#include <polypcore/sink.h>
-#include <polypcore/source.h>
-#include <polypcore/native-common.h>
-#include <polypcore/core-util.h>
-#include <polypcore/log.h>
-#include <polypcore/core-subscribe.h>
-#include <polypcore/dynarray.h>
-#include <polypcore/modargs.h>
-
-#include "../polypcore/endianmacros.h"
+#include <pulse/xmalloc.h>
+#include <pulse/util.h>
+
+#include <pulsecore/autoload.h>
+#include <pulsecore/sink.h>
+#include <pulsecore/source.h>
+#include <pulsecore/native-common.h>
+#include <pulsecore/core-util.h>
+#include <pulsecore/log.h>
+#include <pulsecore/core-subscribe.h>
+#include <pulsecore/dynarray.h>
+#include <pulsecore/modargs.h>
+
+#include "../pulsecore/endianmacros.h"
 
 #include "howl-wrap.h"
 
@@ -53,9 +53,9 @@
 PA_MODULE_VERSION(PACKAGE_VERSION)
 PA_MODULE_USAGE("port=<IP port number>")
 
-#define SERVICE_NAME_SINK "_polypaudio-sink._tcp"
-#define SERVICE_NAME_SOURCE "_polypaudio-source._tcp"
-#define SERVICE_NAME_SERVER "_polypaudio-server._tcp"
+#define SERVICE_NAME_SINK "_pulseaudio-sink._tcp"
+#define SERVICE_NAME_SOURCE "_pulseaudio-source._tcp"
+#define SERVICE_NAME_SERVER "_pulseaudio-server._tcp"
 
 static const char* const valid_modargs[] = {
     "port",

Modified: trunk/src/modules/oss-util.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/oss-util.c?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/modules/oss-util.c (original)
+++ trunk/src/modules/oss-util.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -34,9 +34,9 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
-#include <polypcore/core-error.h>
-#include <polypcore/core-util.h>
-#include <polypcore/log.h>
+#include <pulsecore/core-error.h>
+#include <pulsecore/core-util.h>
+#include <pulsecore/log.h>
 
 #include "oss-util.h"
 

Modified: trunk/src/modules/oss-util.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/oss-util.h?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/modules/oss-util.h (original)
+++ trunk/src/modules/oss-util.h Mon Jun 19 23:53:48 2006
@@ -4,26 +4,26 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include <polyp/sample.h>
-#include <polyp/volume.h>
+#include <pulse/sample.h>
+#include <pulse/volume.h>
 
 int pa_oss_open(const char *device, int *mode, int* pcaps);
 int pa_oss_auto_format(int fd, pa_sample_spec *ss);

Modified: trunk/src/modules/rtp/module-rtp-recv.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/rtp/module-rtp-recv.c?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/modules/rtp/module-rtp-recv.c (original)
+++ trunk/src/modules/rtp/module-rtp-recv.c Mon Jun 19 23:53:48 2006
@@ -1,19 +1,19 @@
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -31,20 +31,20 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <polyp/timeval.h>
-#include <polyp/xmalloc.h>
-
-#include <polypcore/core-error.h>
-#include <polypcore/module.h>
-#include <polypcore/llist.h>
-#include <polypcore/sink.h>
-#include <polypcore/sink-input.h>
-#include <polypcore/memblockq.h>
-#include <polypcore/log.h>
-#include <polypcore/core-util.h>
-#include <polypcore/modargs.h>
-#include <polypcore/namereg.h>
-#include <polypcore/sample-util.h>
+#include <pulse/timeval.h>
+#include <pulse/xmalloc.h>
+
+#include <pulsecore/core-error.h>
+#include <pulsecore/module.h>
+#include <pulsecore/llist.h>
+#include <pulsecore/sink.h>
+#include <pulsecore/sink-input.h>
+#include <pulsecore/memblockq.h>
+#include <pulsecore/log.h>
+#include <pulsecore/core-util.h>
+#include <pulsecore/modargs.h>
+#include <pulsecore/namereg.h>
+#include <pulsecore/sample-util.h>
 
 #include "module-rtp-recv-symdef.h"
 

Modified: trunk/src/modules/rtp/module-rtp-send.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/rtp/module-rtp-send.c?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/modules/rtp/module-rtp-send.c (original)
+++ trunk/src/modules/rtp/module-rtp-send.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -32,20 +32,20 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <polyp/timeval.h>
-#include <polyp/util.h>
-#include <polyp/xmalloc.h>
-
-#include <polypcore/core-error.h>
-#include <polypcore/module.h>
-#include <polypcore/llist.h>
-#include <polypcore/source.h>
-#include <polypcore/source-output.h>
-#include <polypcore/memblockq.h>
-#include <polypcore/log.h>
-#include <polypcore/core-util.h>
-#include <polypcore/modargs.h>
-#include <polypcore/namereg.h>
+#include <pulse/timeval.h>
+#include <pulse/util.h>
+#include <pulse/xmalloc.h>
+
+#include <pulsecore/core-error.h>
+#include <pulsecore/module.h>
+#include <pulsecore/llist.h>
+#include <pulsecore/source.h>
+#include <pulsecore/source-output.h>
+#include <pulsecore/memblockq.h>
+#include <pulsecore/log.h>
+#include <pulsecore/core-util.h>
+#include <pulsecore/modargs.h>
+#include <pulsecore/namereg.h>
 
 #include "module-rtp-send-symdef.h"
 

Modified: trunk/src/modules/rtp/rtp.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/rtp/rtp.c?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/modules/rtp/rtp.c (original)
+++ trunk/src/modules/rtp/rtp.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -36,8 +36,8 @@
 #include <sys/filio.h>
 #endif
 
-#include <polypcore/core-error.h>
-#include <polypcore/log.h>
+#include <pulsecore/core-error.h>
+#include <pulsecore/log.h>
 
 #include "rtp.h"
 

Modified: trunk/src/modules/rtp/rtp.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/rtp/rtp.h?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/modules/rtp/rtp.h (original)
+++ trunk/src/modules/rtp/rtp.h Mon Jun 19 23:53:48 2006
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -25,8 +25,8 @@
 #include <inttypes.h>
 #include <sys/socket.h>
 #include <sys/types.h>
-#include <polypcore/memblockq.h>
-#include <polypcore/memchunk.h>
+#include <pulsecore/memblockq.h>
+#include <pulsecore/memchunk.h>
 
 typedef struct pa_rtp_context {
     int fd;

Modified: trunk/src/modules/rtp/sap.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/rtp/sap.c?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/modules/rtp/sap.c (original)
+++ trunk/src/modules/rtp/sap.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -38,11 +38,11 @@
 #include <sys/filio.h>
 #endif
 
-#include <polyp/xmalloc.h>
-
-#include <polypcore/core-error.h>
-#include <polypcore/core-util.h>
-#include <polypcore/log.h>
+#include <pulse/xmalloc.h>
+
+#include <pulsecore/core-error.h>
+#include <pulsecore/core-util.h>
+#include <pulsecore/log.h>
 
 #include "sap.h"
 #include "sdp.h"

Modified: trunk/src/modules/rtp/sap.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/rtp/sap.h?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/modules/rtp/sap.h (original)
+++ trunk/src/modules/rtp/sap.h Mon Jun 19 23:53:48 2006
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -25,8 +25,8 @@
 #include <inttypes.h>
 #include <sys/socket.h>
 #include <sys/types.h>
-#include <polypcore/memblockq.h>
-#include <polypcore/memchunk.h>
+#include <pulsecore/memblockq.h>
+#include <pulsecore/memchunk.h>
 
 typedef struct pa_sap_context {
     int fd;

Modified: trunk/src/modules/rtp/sdp.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/rtp/sdp.c?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/modules/rtp/sdp.c (original)
+++ trunk/src/modules/rtp/sdp.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -31,10 +31,10 @@
 #include <arpa/inet.h>
 #include <string.h>
 
-#include <polyp/xmalloc.h>
-
-#include <polypcore/core-util.h>
-#include <polypcore/log.h>
+#include <pulse/xmalloc.h>
+
+#include <pulsecore/core-util.h>
+#include <pulsecore/log.h>
 
 #include "sdp.h"
 #include "rtp.h"

Modified: trunk/src/modules/rtp/sdp.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/rtp/sdp.h?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/modules/rtp/sdp.h (original)
+++ trunk/src/modules/rtp/sdp.h Mon Jun 19 23:53:48 2006
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -26,7 +26,7 @@
 #include <sys/socket.h>
 #include <sys/types.h>
 
-#include <polyp/sample.h>
+#include <pulse/sample.h>
 
 #define PA_SDP_HEADER "v=0\n"
 

Modified: trunk/src/pulse/browser.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/browser.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulse/browser.c (original)
+++ trunk/src/pulse/browser.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -22,16 +22,16 @@
 #include <assert.h>
 #include <howl.h>
 
-#include <polyp/xmalloc.h>
-
-#include <polypcore/log.h>
-#include <polypcore/core-util.h>
+#include <pulse/xmalloc.h>
+
+#include <pulsecore/log.h>
+#include <pulsecore/core-util.h>
 
 #include "browser.h"
 
-#define SERVICE_NAME_SINK "_polypaudio-sink._tcp."
-#define SERVICE_NAME_SOURCE "_polypaudio-source._tcp."
-#define SERVICE_NAME_SERVER "_polypaudio-server._tcp."
+#define SERVICE_NAME_SINK "_pulseaudio-sink._tcp."
+#define SERVICE_NAME_SOURCE "_pulseaudio-source._tcp."
+#define SERVICE_NAME_SERVER "_pulseaudio-server._tcp."
 
 struct pa_browser {
     int ref;

Modified: trunk/src/pulse/browser.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/browser.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulse/browser.h (original)
+++ trunk/src/pulse/browser.h Mon Jun 19 23:53:48 2006
@@ -4,28 +4,28 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include <polyp/mainloop-api.h>
-#include <polyp/sample.h>
-#include <polyp/channelmap.h>
-#include <polyp/cdecl.h>
+#include <pulse/mainloop-api.h>
+#include <pulse/sample.h>
+#include <pulse/channelmap.h>
+#include <pulse/cdecl.h>
 
 PA_C_DECL_BEGIN
 

Modified: trunk/src/pulse/cdecl.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/cdecl.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulse/cdecl.h (original)
+++ trunk/src/pulse/cdecl.h Mon Jun 19 23:53:48 2006
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/

Modified: trunk/src/pulse/channelmap.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/channelmap.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulse/channelmap.c (original)
+++ trunk/src/pulse/channelmap.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -28,8 +28,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <polyp/xmalloc.h>
-#include <polypcore/core-util.h>
+#include <pulse/xmalloc.h>
+#include <pulsecore/core-util.h>
 
 #include "channelmap.h"
 

Modified: trunk/src/pulse/channelmap.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/channelmap.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulse/channelmap.h (original)
+++ trunk/src/pulse/channelmap.h Mon Jun 19 23:53:48 2006
@@ -4,26 +4,26 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include <polyp/sample.h>
-#include <polyp/cdecl.h>
+#include <pulse/sample.h>
+#include <pulse/cdecl.h>
 
 /** \page channelmap Channel Maps
  *

Modified: trunk/src/pulse/client-conf-x11.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/client-conf-x11.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulse/client-conf-x11.c (original)
+++ trunk/src/pulse/client-conf-x11.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
 
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
 
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-13071
   USA.
 ***/
@@ -29,11 +29,11 @@
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 
-#include <polyp/xmalloc.h>
+#include <pulse/xmalloc.h>
 
-#include <polypcore/x11prop.h>
-#include <polypcore/log.h>
-#include <polypcore/core-util.h>
+#include <pulsecore/x11prop.h>
+#include <pulsecore/log.h>
+#include <pulsecore/core-util.h>
 
 #include "client-conf-x11.h"
 

Modified: trunk/src/pulse/client-conf-x11.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/client-conf-x11.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulse/client-conf-x11.h (original)
+++ trunk/src/pulse/client-conf-x11.h Mon Jun 19 23:53:48 2006
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
 
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
 
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/

Modified: trunk/src/pulse/client-conf.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/client-conf.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulse/client-conf.c (original)
+++ trunk/src/pulse/client-conf.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
 
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
 
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -29,19 +29,19 @@
 #include <errno.h>
 #include <string.h>
 
-#include <polypcore/core-error.h>
-#include <polyp/xmalloc.h>
+#include <pulsecore/core-error.h>
+#include <pulse/xmalloc.h>
 
-#include <polypcore/log.h>
-#include <polypcore/conf-parser.h>
-#include <polypcore/core-util.h>
-#include <polypcore/authkey.h>
+#include <pulsecore/log.h>
+#include <pulsecore/conf-parser.h>
+#include <pulsecore/core-util.h>
+#include <pulsecore/authkey.h>
 
 #include "client-conf.h"
 
 #ifndef DEFAULT_CONFIG_DIR
 # ifndef OS_IS_WIN32
-#  define DEFAULT_CONFIG_DIR "/etc/polypaudio"
+#  define DEFAULT_CONFIG_DIR "/etc/pulseaudio"
 # else
 #  define DEFAULT_CONFIG_DIR "%POLYP_ROOT%"
 # endif
@@ -54,7 +54,7 @@
 #endif
 
 #define DEFAULT_CLIENT_CONFIG_FILE DEFAULT_CONFIG_DIR PATH_SEP "client.conf"
-#define DEFAULT_CLIENT_CONFIG_FILE_USER ".polypaudio" PATH_SEP "client.conf"
+#define DEFAULT_CLIENT_CONFIG_FILE_USER ".pulseaudio" PATH_SEP "client.conf"
 
 #define ENV_CLIENT_CONFIG_FILE "POLYP_CLIENTCONFIG"
 #define ENV_DEFAULT_SINK "POLYP_SINK"

Modified: trunk/src/pulse/client-conf.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/client-conf.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulse/client-conf.h (original)
+++ trunk/src/pulse/client-conf.h Mon Jun 19 23:53:48 2006
@@ -4,27 +4,27 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
 
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
 
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include <polypcore/native-common.h>
+#include <pulsecore/native-common.h>
 
-/* A structure containing configuration data for polypaudio clients. */
+/* A structure containing configuration data for pulseaudio clients. */
 
 typedef struct pa_client_conf {
     char *daemon_binary, *extra_arguments, *default_sink, *default_source, *default_server, *cookie_file;

Modified: trunk/src/pulse/client.conf.in
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/client.conf.in?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulse/client.conf.in (original)
+++ trunk/src/pulse/client.conf.in Mon Jun 19 23:53:48 2006
@@ -1,29 +1,29 @@
 # $Id$
 #
-# This file is part of polypaudio.
+# This file is part of PulseAudio.
 #
-# polypaudio is free software; you can redistribute it and/or modify
+# PulseAudio is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 #
-# polypaudio is distributed in the hope that it will be useful, but
+# PulseAudio 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 Lesser General Public License
-# along with polypaudio; if not, write to the Free Software
+# along with PulseAudio; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 
-## Configuration file for polypaudio clients. Default values are
+## Configuration file for pulseaudio clients. Default values are
 ## commented out.  Use either ; or # for commenting
 
-## Path to the polypaudio daemon to run when autospawning.
+## Path to the pulseaudio daemon to run when autospawning.
 ; daemon-binary = @POLYPAUDIO_BINARY@
 
-## Extra arguments to pass to the polypaudio daemon
+## Extra arguments to pass to the pulseaudio daemon
 ; extra-arguments = --log-target=syslog --exit-idle-time=5
 
 ## The default sink to connect to

Modified: trunk/src/pulse/context.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/context.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulse/context.c (original)
+++ trunk/src/pulse/context.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -45,21 +45,21 @@
 #include <netdb.h>
 #endif
 
-#include "../polypcore/winsock.h"
-
-#include <polypcore/core-error.h>
-#include <polyp/version.h>
-#include <polyp/xmalloc.h>
-
-#include <polypcore/native-common.h>
-#include <polypcore/pdispatch.h>
-#include <polypcore/pstream.h>
-#include <polypcore/dynarray.h>
-#include <polypcore/socket-client.h>
-#include <polypcore/pstream-util.h>
-#include <polypcore/core-util.h>
-#include <polypcore/log.h>
-#include <polypcore/socket-util.h>
+#include "../pulsecore/winsock.h"
+
+#include <pulsecore/core-error.h>
+#include <pulse/version.h>
+#include <pulse/xmalloc.h>
+
+#include <pulsecore/native-common.h>
+#include <pulsecore/pdispatch.h>
+#include <pulsecore/pstream.h>
+#include <pulsecore/dynarray.h>
+#include <pulsecore/socket-client.h>
+#include <pulsecore/pstream-util.h>
+#include <pulsecore/core-util.h>
+#include <pulsecore/log.h>
+#include <pulsecore/socket-util.h>
 
 #include "internal.h"
 

Modified: trunk/src/pulse/context.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/context.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulse/context.h (original)
+++ trunk/src/pulse/context.h Mon Jun 19 23:53:48 2006
@@ -4,35 +4,35 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include <polyp/sample.h>
-#include <polyp/def.h>
-#include <polyp/mainloop-api.h>
-#include <polyp/cdecl.h>
-#include <polyp/operation.h>
+#include <pulse/sample.h>
+#include <pulse/def.h>
+#include <pulse/mainloop-api.h>
+#include <pulse/cdecl.h>
+#include <pulse/operation.h>
 
 /** \page async Asynchronous API
  *
  * \section overv_sec Overview
  *
- * The asynchronous API is the native interface to the polypaudio library.
+ * The asynchronous API is the native interface to the pulseaudio library.
  * It allows full access to all available functions. This also means that
  * it is rather complex and can take some time to fully master.
  *
@@ -52,10 +52,10 @@
  *
  * To actually be able to use these functions, an implementation needs to 
  * be coupled to the abstraction. There are three of these shipped with
- * polypaudio, but any other can be used with a minimal ammount of work,
+ * pulseaudio, but any other can be used with a minimal ammount of work,
  * provided it supports the three basic events listed above.
  *
- * The implementations shipped with polypaudio are:
+ * The implementations shipped with pulseaudio are:
  *
  * \li \subpage mainloop - A minimal but fast implementation based on poll().
  * \li \subpage threaded_mainloop - A special version of the previous
@@ -71,7 +71,7 @@
  *
  * \section refcnt_sec Reference Counting
  *
- * Almost all objects in polypaudio are reference counted. What that means
+ * Almost all objects in pulseaudio are reference counted. What that means
  * is that you rarely malloc() or free() any objects. Instead you increase
  * and decrease their reference counts. Whenever an object's reference
  * count reaches zero, that object gets destroy and any resources it uses
@@ -89,7 +89,7 @@
  *
  * \section context_sec Context
  *
- * A context is the basic object for a connection to a polypaudio server.
+ * A context is the basic object for a connection to a pulseaudio server.
  * It multiplexes commands, data streams and events through a single
  * channel.
  *
@@ -142,7 +142,7 @@
 
 /** \file
  * Connection contexts for asynchrononous communication with a
- * server. A pa_context object wraps a connection to a polypaudio
+ * server. A pa_context object wraps a connection to a pulseaudio
  * server using its native protocol. */
 
 /** \example pacat.c

Modified: trunk/src/pulse/def.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/def.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulse/def.h (original)
+++ trunk/src/pulse/def.h Mon Jun 19 23:53:48 2006
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -26,8 +26,8 @@
 #include <sys/time.h>
 #include <time.h>
 
-#include <polyp/cdecl.h>
-#include <polyp/sample.h>
+#include <pulse/cdecl.h>
+#include <pulse/sample.h>
 
 /** \file
  * Global definitions */
@@ -66,7 +66,7 @@
 
 /** Some special flags for contexts. \since 0.8 */
 typedef enum pa_context_flags {
-    PA_CONTEXT_NOAUTOSPAWN = 1 /**< Disabled autospawning of the polypaudio daemon if required */
+    PA_CONTEXT_NOAUTOSPAWN = 1 /**< Disabled autospawning of the pulseaudio daemon if required */
 } pa_context_flags_t;
 
 /** The direction of a pa_stream object */ 

Modified: trunk/src/pulse/error.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/error.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulse/error.c (original)
+++ trunk/src/pulse/error.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -28,10 +28,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <polyp/xmalloc.h>
+#include <pulse/xmalloc.h>
 
-#include <polypcore/core-util.h>
-#include <polypcore/native-common.h>
+#include <pulsecore/core-util.h>
+#include <pulsecore/native-common.h>
 
 #include "error.h"
 

Modified: trunk/src/pulse/error.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/error.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulse/error.h (original)
+++ trunk/src/pulse/error.h Mon Jun 19 23:53:48 2006
@@ -4,26 +4,26 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
 #include <inttypes.h>
-#include <polyp/cdecl.h>
+#include <pulse/cdecl.h>
 
 /** \file
  * Error management */

Modified: trunk/src/pulse/glib-mainloop.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/glib-mainloop.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulse/glib-mainloop.c (original)
+++ trunk/src/pulse/glib-mainloop.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -25,11 +25,11 @@
 
 #include <assert.h>
 
-#include <polyp/xmalloc.h>
-#include <polyp/timeval.h>
-
-#include <polypcore/idxset.h>
-#include <polypcore/core-util.h>
+#include <pulse/xmalloc.h>
+#include <pulse/timeval.h>
+
+#include <pulsecore/idxset.h>
+#include <pulsecore/core-util.h>
 
 #include "glib.h"
 #include "glib-mainloop.h"

Modified: trunk/src/pulse/glib-mainloop.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/glib-mainloop.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulse/glib-mainloop.h (original)
+++ trunk/src/pulse/glib-mainloop.h Mon Jun 19 23:53:48 2006
@@ -4,28 +4,28 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
 #include <glib.h>
 
-#include <polyp/mainloop-api.h>
-#include <polyp/cdecl.h>
+#include <pulse/mainloop-api.h>
+#include <pulse/cdecl.h>
 
 /** \page glib-mainloop GLIB Main Loop Bindings
  *

Modified: trunk/src/pulse/glib12-mainloop.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/glib12-mainloop.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulse/glib12-mainloop.c (original)
+++ trunk/src/pulse/glib12-mainloop.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -25,11 +25,11 @@
 
 #include <assert.h>
 
-#include <polyp/timeval.h>
-#include <polyp/xmalloc.h>
-
-#include <polypcore/idxset.h>
-#include <polypcore/core-util.h>
+#include <pulse/timeval.h>
+#include <pulse/xmalloc.h>
+
+#include <pulsecore/idxset.h>
+#include <pulsecore/core-util.h>
 
 #include "glib-mainloop.h"
 

Modified: trunk/src/pulse/internal.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/internal.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulse/internal.h (original)
+++ trunk/src/pulse/internal.h Mon Jun 19 23:53:48 2006
@@ -4,40 +4,40 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include <polyp/mainloop-api.h>
-#include <polyp/context.h>
-#include <polyp/stream.h>
-#include <polyp/operation.h>
-#include <polyp/subscribe.h>
-
-#include <polypcore/socket-client.h>
-#include <polypcore/pstream.h>
-#include <polypcore/pdispatch.h>
-#include <polypcore/dynarray.h>
-#include <polypcore/llist.h>
-#include <polypcore/native-common.h>
-#include <polypcore/strlist.h>
-#include <polypcore/mcalign.h>
-#include <polypcore/memblockq.h>
-#include <polypcore/hashmap.h>
+#include <pulse/mainloop-api.h>
+#include <pulse/context.h>
+#include <pulse/stream.h>
+#include <pulse/operation.h>
+#include <pulse/subscribe.h>
+
+#include <pulsecore/socket-client.h>
+#include <pulsecore/pstream.h>
+#include <pulsecore/pdispatch.h>
+#include <pulsecore/dynarray.h>
+#include <pulsecore/llist.h>
+#include <pulsecore/native-common.h>
+#include <pulsecore/strlist.h>
+#include <pulsecore/mcalign.h>
+#include <pulsecore/memblockq.h>
+#include <pulsecore/hashmap.h>
 
 #include "client-conf.h"
 

Modified: trunk/src/pulse/introspect.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/introspect.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulse/introspect.c (original)
+++ trunk/src/pulse/introspect.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -25,10 +25,10 @@
 
 #include <assert.h>
 
-#include <polyp/context.h>
-
-#include <polypcore/gccmacro.h>
-#include <polypcore/pstream-util.h>
+#include <pulse/context.h>
+
+#include <pulsecore/gccmacro.h>
+#include <pulsecore/pstream-util.h>
 
 #include "internal.h"
 

Modified: trunk/src/pulse/introspect.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/introspect.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulse/introspect.h (original)
+++ trunk/src/pulse/introspect.h Mon Jun 19 23:53:48 2006
@@ -4,31 +4,31 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
 #include <inttypes.h>
 
-#include <polyp/operation.h>
-#include <polyp/context.h>
-#include <polyp/cdecl.h>
-#include <polyp/channelmap.h>
-#include <polyp/volume.h>
+#include <pulse/operation.h>
+#include <pulse/context.h>
+#include <pulse/cdecl.h>
+#include <pulse/channelmap.h>
+#include <pulse/volume.h>
 
 /** \page introspect Server Query and Control
  *
@@ -266,11 +266,11 @@
     const char *user_name;              /**< User name of the daemon process */
     const char *host_name;              /**< Host name the daemon is running on */
     const char *server_version;         /**< Version string of the daemon */
-    const char *server_name;            /**< Server package name (usually "polypaudio") */
+    const char *server_name;            /**< Server package name (usually "pulseaudio") */
     pa_sample_spec sample_spec;         /**< Default sample specification */
     const char *default_sink_name;      /**< Name of default sink. \since 0.4 */
     const char *default_source_name;    /**< Name of default sink. \since 0.4*/
-    uint32_t cookie;                    /**< A random cookie for identifying this instance of polypaudio. \since 0.8 */
+    uint32_t cookie;                    /**< A random cookie for identifying this instance of pulseaudio. \since 0.8 */
 } pa_server_info;
 
 /** Callback prototype for pa_context_get_server_info() */

Modified: trunk/src/pulse/mainloop-api.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/mainloop-api.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulse/mainloop-api.c (original)
+++ trunk/src/pulse/mainloop-api.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -26,9 +26,9 @@
 #include <assert.h>
 #include <stdlib.h>
 
-#include <polyp/xmalloc.h>
+#include <pulse/xmalloc.h>
 
-#include <polypcore/gccmacro.h>
+#include <pulsecore/gccmacro.h>
 
 #include "mainloop-api.h"
 

Modified: trunk/src/pulse/mainloop-api.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/mainloop-api.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulse/mainloop-api.h (original)
+++ trunk/src/pulse/mainloop-api.h Mon Jun 19 23:53:48 2006
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -25,17 +25,17 @@
 #include <sys/time.h>
 #include <time.h>
 
-#include <polyp/cdecl.h>
+#include <pulse/cdecl.h>
 
 /** \file
  * 
- * Main loop abstraction layer. Both the polypaudio core and the
- * polypaudio client library use a main loop abstraction layer. Due to
- * this it is possible to embed polypaudio into other
+ * Main loop abstraction layer. Both the pulseaudio core and the
+ * pulseaudio client library use a main loop abstraction layer. Due to
+ * this it is possible to embed pulseaudio into other
  * applications easily. Two main loop implemenations are
  * currently available:
  * \li A minimal implementation based on the C library's poll() function (See \ref mainloop.h)
- * \li A wrapper around the GLIB main loop. Use this to embed polypaudio into your GLIB/GTK+/GNOME programs (See \ref glib-mainloop.h)
+ * \li A wrapper around the GLIB main loop. Use this to embed pulseaudio into your GLIB/GTK+/GNOME programs (See \ref glib-mainloop.h)
  *
  * The structure pa_mainloop_api is used as vtable for the main loop abstraction.
  *

Modified: trunk/src/pulse/mainloop-signal.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/mainloop-signal.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulse/mainloop-signal.c (original)
+++ trunk/src/pulse/mainloop-signal.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -36,12 +36,12 @@
 #include <windows.h>
 #endif
 
-#include <polypcore/core-error.h>
-#include <polyp/xmalloc.h>
-
-#include <polypcore/core-util.h>
-#include <polypcore/log.h>
-#include <polypcore/gccmacro.h>
+#include <pulsecore/core-error.h>
+#include <pulse/xmalloc.h>
+
+#include <pulsecore/core-util.h>
+#include <pulsecore/log.h>
+#include <pulsecore/gccmacro.h>
 
 #include "mainloop-signal.h"
 

Modified: trunk/src/pulse/mainloop-signal.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/mainloop-signal.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulse/mainloop-signal.h (original)
+++ trunk/src/pulse/mainloop-signal.h Mon Jun 19 23:53:48 2006
@@ -4,26 +4,26 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include <polyp/mainloop-api.h>
-#include <polyp/cdecl.h>
+#include <pulse/mainloop-api.h>
+#include <pulse/cdecl.h>
 
 PA_C_DECL_BEGIN
 

Modified: trunk/src/pulse/mainloop.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/mainloop.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulse/mainloop.c (original)
+++ trunk/src/pulse/mainloop.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -35,22 +35,22 @@
 #ifdef HAVE_SYS_POLL_H
 #include <sys/poll.h>
 #else
-#include "../polypcore/poll.h"
+#include "../pulsecore/poll.h"
 #endif
 
-#include "../polypcore/winsock.h"
+#include "../pulsecore/winsock.h"
 
 #ifndef HAVE_PIPE
-#include "../polypcore/pipe.h"
+#include "../pulsecore/pipe.h"
 #endif
 
-#include <polypcore/core-error.h>
-#include <polyp/timeval.h>
-#include <polyp/xmalloc.h>
-
-#include <polypcore/core-util.h>
-#include <polypcore/idxset.h>
-#include <polypcore/log.h>
+#include <pulsecore/core-error.h>
+#include <pulse/timeval.h>
+#include <pulse/xmalloc.h>
+
+#include <pulsecore/core-util.h>
+#include <pulsecore/idxset.h>
+#include <pulsecore/log.h>
 
 #include "mainloop.h"
 

Modified: trunk/src/pulse/mainloop.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/mainloop.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulse/mainloop.h (original)
+++ trunk/src/pulse/mainloop.h Mon Jun 19 23:53:48 2006
@@ -4,26 +4,26 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include <polyp/mainloop-api.h>
-#include <polyp/cdecl.h>
+#include <pulse/mainloop-api.h>
+#include <pulse/cdecl.h>
 
 PA_C_DECL_BEGIN
 

Modified: trunk/src/pulse/operation.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/operation.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulse/operation.c (original)
+++ trunk/src/pulse/operation.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -25,7 +25,7 @@
 
 #include <assert.h>
 
-#include <polyp/xmalloc.h>
+#include <pulse/xmalloc.h>
 
 #include "internal.h"
 #include "operation.h"

Modified: trunk/src/pulse/operation.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/operation.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulse/operation.h (original)
+++ trunk/src/pulse/operation.h Mon Jun 19 23:53:48 2006
@@ -4,26 +4,26 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include <polyp/cdecl.h>
-#include <polyp/def.h>
+#include <pulse/cdecl.h>
+#include <pulse/def.h>
 
 /** \file
  * Asynchronous operations */

Modified: trunk/src/pulse/polypaudio.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/polypaudio.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulse/polypaudio.h (original)
+++ trunk/src/pulse/polypaudio.h Mon Jun 19 23:53:48 2006
@@ -1,50 +1,50 @@
-#ifndef foopolypaudiohfoo
-#define foopolypaudiohfoo
+#ifndef foopulseaudiohfoo
+#define foopulseaudiohfoo
 
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include <polyp/mainloop-api.h>
-#include <polyp/sample.h>
-#include <polyp/def.h>
-#include <polyp/context.h>
-#include <polyp/stream.h>
-#include <polyp/introspect.h>
-#include <polyp/subscribe.h>
-#include <polyp/scache.h>
-#include <polyp/version.h>
-#include <polyp/error.h>
-#include <polyp/operation.h>
-#include <polyp/channelmap.h>
-#include <polyp/volume.h>
-#include <polyp/xmalloc.h>
-#include <polyp/utf8.h>
-#include <polyp/thread-mainloop.h>
-#include <polyp/mainloop.h>
-#include <polyp/mainloop-signal.h>
-#include <polyp/util.h>
-#include <polyp/timeval.h>
+#include <pulse/mainloop-api.h>
+#include <pulse/sample.h>
+#include <pulse/def.h>
+#include <pulse/context.h>
+#include <pulse/stream.h>
+#include <pulse/introspect.h>
+#include <pulse/subscribe.h>
+#include <pulse/scache.h>
+#include <pulse/version.h>
+#include <pulse/error.h>
+#include <pulse/operation.h>
+#include <pulse/channelmap.h>
+#include <pulse/volume.h>
+#include <pulse/xmalloc.h>
+#include <pulse/utf8.h>
+#include <pulse/thread-mainloop.h>
+#include <pulse/mainloop.h>
+#include <pulse/mainloop-signal.h>
+#include <pulse/util.h>
+#include <pulse/timeval.h>
 
 /** \file
- * Include all polyplib header files at once. The following
+ * Include all pulselib header files at once. The following
  * files are included: \ref mainloop-api.h, \ref sample.h, \ref def.h,
  * \ref context.h, \ref stream.h, \ref introspect.h, \ref subscribe.h,
  * \ref scache.h, \ref version.h, \ref error.h, \ref channelmap.h,
@@ -56,7 +56,7 @@
  *
  * \section intro_sec Introduction
  * 
- * This document describes the client API for the polypaudio sound
+ * This document describes the client API for the pulseaudio sound
  * server. The API comes in two flavours to accomodate different styles
  * of applications and different needs in complexity:
  * 
@@ -78,7 +78,7 @@
  *
  * Use this if you develop your programs in asynchronous, event loop
  * based style or if you want to use the advanced features of the
- * polypaudio API. A guide can be found in \subpage async.
+ * pulseaudio API. A guide can be found in \subpage async.
  *
  * By using the built-in threaded main loop, it is possible to acheive a
  * pseudo-synchronous API, which can be useful in synchronous applications
@@ -87,7 +87,7 @@
  *
  * \section thread_sec Threads
  *
- * The polypaudio client libraries are not designed to be used in a
+ * The pulseaudio client libraries are not designed to be used in a
  * heavily threaded environment. They are however designed to be reentrant
  * safe.
  *
@@ -102,14 +102,14 @@
  *
  * \section pkgconfig pkg-config
  *
- * The polypaudio libraries provide pkg-config snippets for the different
+ * The pulseaudio libraries provide pkg-config snippets for the different
  * modules:
  *
- * \li polyplib - The asynchronous API and the internal main loop
+ * \li pulselib - The asynchronous API and the internal main loop
  *                implementation.
- * \li polyplib-glib12-mainloop - GLIB 1.2 main loop bindings.
- * \li polyplib-glib-mainloop - GLIB 2.x main loop bindings.
- * \li polyplib-simple - The simple polypaudio API.
+ * \li pulselib-glib12-mainloop - GLIB 1.2 main loop bindings.
+ * \li pulselib-glib-mainloop - GLIB 2.x main loop bindings.
+ * \li pulselib-simple - The simple pulseaudio API.
  */
 
 #endif

Modified: trunk/src/pulse/sample.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/sample.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulse/sample.c (original)
+++ trunk/src/pulse/sample.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/

Modified: trunk/src/pulse/sample.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/sample.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulse/sample.h (original)
+++ trunk/src/pulse/sample.h Mon Jun 19 23:53:48 2006
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -26,7 +26,7 @@
 #include <sys/types.h>
 #include <math.h>
 
-#include <polyp/cdecl.h>
+#include <pulse/cdecl.h>
 
 /** \page sample Sample Format Specifications
  *

Modified: trunk/src/pulse/scache.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/scache.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulse/scache.c (original)
+++ trunk/src/pulse/scache.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -28,7 +28,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <polypcore/pstream-util.h>
+#include <pulsecore/pstream-util.h>
 
 #include "internal.h"
 

Modified: trunk/src/pulse/scache.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/scache.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulse/scache.h (original)
+++ trunk/src/pulse/scache.h Mon Jun 19 23:53:48 2006
@@ -4,29 +4,29 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
 #include <sys/types.h>
 
-#include <polyp/context.h>
-#include <polyp/stream.h>
-#include <polyp/cdecl.h>
+#include <pulse/context.h>
+#include <pulse/stream.h>
+#include <pulse/cdecl.h>
 
 /** \page scache Sample Cache
  *

Modified: trunk/src/pulse/simple.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/simple.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulse/simple.c (original)
+++ trunk/src/pulse/simple.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -28,12 +28,12 @@
 #include <assert.h>
 #include <stdlib.h>
 
-#include <polyp/polypaudio.h>
-#include <polyp/thread-mainloop.h>
-#include <polyp/xmalloc.h>
-
-#include <polypcore/native-common.h>
-#include <polypcore/log.h>
+#include <pulse/pulseaudio.h>
+#include <pulse/thread-mainloop.h>
+#include <pulse/xmalloc.h>
+
+#include <pulsecore/native-common.h>
+#include <pulsecore/log.h>
 
 #include "simple.h"
 

Modified: trunk/src/pulse/simple.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/simple.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulse/simple.h (original)
+++ trunk/src/pulse/simple.h Mon Jun 19 23:53:48 2006
@@ -4,30 +4,30 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
 #include <sys/types.h>
 
-#include <polyp/sample.h>
-#include <polyp/channelmap.h>
-#include <polyp/def.h>
-#include <polyp/cdecl.h>
+#include <pulse/sample.h>
+#include <pulse/channelmap.h>
+#include <pulse/def.h>
+#include <pulse/cdecl.h>
 
 /** \page simple Simple API
  *

Modified: trunk/src/pulse/stream.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/stream.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulse/stream.c (original)
+++ trunk/src/pulse/stream.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -28,13 +28,13 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <polyp/def.h>
-#include <polyp/timeval.h>
-#include <polyp/xmalloc.h>
-
-#include <polypcore/pstream-util.h>
-#include <polypcore/log.h>
-#include <polypcore/hashmap.h>
+#include <pulse/def.h>
+#include <pulse/timeval.h>
+#include <pulse/xmalloc.h>
+
+#include <pulsecore/pstream-util.h>
+#include <pulsecore/log.h>
+#include <pulsecore/hashmap.h>
 
 #include "internal.h"
 

Modified: trunk/src/pulse/stream.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/stream.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulse/stream.h (original)
+++ trunk/src/pulse/stream.h Mon Jun 19 23:53:48 2006
@@ -4,32 +4,32 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
 #include <sys/types.h>
 
-#include <polyp/sample.h>
-#include <polyp/channelmap.h>
-#include <polyp/volume.h>
-#include <polyp/def.h>
-#include <polyp/cdecl.h>
-#include <polyp/operation.h>
+#include <pulse/sample.h>
+#include <pulse/channelmap.h>
+#include <pulse/volume.h>
+#include <pulse/def.h>
+#include <pulse/cdecl.h>
+#include <pulse/operation.h>
 
 /** \page streams Audio Streams
  *

Modified: trunk/src/pulse/subscribe.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/subscribe.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulse/subscribe.c (original)
+++ trunk/src/pulse/subscribe.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -26,8 +26,8 @@
 #include <assert.h>
 #include <stdio.h>
 
-#include <polypcore/gccmacro.h>
-#include <polypcore/pstream-util.h>
+#include <pulsecore/gccmacro.h>
+#include <pulsecore/pstream-util.h>
 
 #include "internal.h"
 

Modified: trunk/src/pulse/subscribe.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/subscribe.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulse/subscribe.h (original)
+++ trunk/src/pulse/subscribe.h Mon Jun 19 23:53:48 2006
@@ -4,29 +4,29 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
 #include <inttypes.h>
 
-#include <polyp/def.h>
-#include <polyp/context.h>
-#include <polyp/cdecl.h>
+#include <pulse/def.h>
+#include <pulse/context.h>
+#include <pulse/cdecl.h>
 
 /** \page subscribe Event Subscription
  *

Modified: trunk/src/pulse/thread-mainloop.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/thread-mainloop.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulse/thread-mainloop.c (original)
+++ trunk/src/pulse/thread-mainloop.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -30,7 +30,7 @@
 #ifdef HAVE_SYS_POLL_H
 #include <sys/poll.h>
 #else
-#include "../polypcore/poll.h"
+#include "../pulsecore/poll.h"
 #endif
 
 #ifdef HAVE_PTHREAD
@@ -41,10 +41,10 @@
 #include <windows.h>
 #endif
 
-#include <polyp/xmalloc.h>
-
-#include <polypcore/log.h>
-#include <polypcore/hashmap.h>
+#include <pulse/xmalloc.h>
+
+#include <pulsecore/log.h>
+#include <pulsecore/hashmap.h>
 
 #include "mainloop.h"
 #include "thread-mainloop.h"

Modified: trunk/src/pulse/thread-mainloop.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/thread-mainloop.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulse/thread-mainloop.h (original)
+++ trunk/src/pulse/thread-mainloop.h Mon Jun 19 23:53:48 2006
@@ -4,26 +4,26 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include <polyp/mainloop-api.h>
-#include <polyp/cdecl.h>
+#include <pulse/mainloop-api.h>
+#include <pulse/cdecl.h>
 
 PA_C_DECL_BEGIN
 

Modified: trunk/src/pulse/timeval.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/timeval.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulse/timeval.c (original)
+++ trunk/src/pulse/timeval.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -31,7 +31,7 @@
 #include <windows.h>
 #endif
 
-#include "../polypcore/winsock.h"
+#include "../pulsecore/winsock.h"
 
 #include "timeval.h"
 

Modified: trunk/src/pulse/timeval.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/timeval.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulse/timeval.h (original)
+++ trunk/src/pulse/timeval.h Mon Jun 19 23:53:48 2006
@@ -4,26 +4,26 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include <polyp/cdecl.h>
-#include <polyp/sample.h>
+#include <pulse/cdecl.h>
+#include <pulse/sample.h>
 
 /** \file
  * Utility functions for handling timeval calculations */

Modified: trunk/src/pulse/utf8.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/utf8.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulse/utf8.h (original)
+++ trunk/src/pulse/utf8.h Mon Jun 19 23:53:48 2006
@@ -4,25 +4,25 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include <polyp/cdecl.h>
+#include <pulse/cdecl.h>
 
 /** \file
  * UTF8 Validation functions

Modified: trunk/src/pulse/util.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/util.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulse/util.c (original)
+++ trunk/src/pulse/util.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -49,11 +49,11 @@
 #include <windows.h>
 #endif
 
-#include "../polypcore/winsock.h"
-
-#include <polypcore/core-error.h>
-#include <polypcore/log.h>
-#include <polypcore/core-util.h>
+#include "../pulsecore/winsock.h"
+
+#include <pulsecore/core-error.h>
+#include <pulsecore/log.h>
+#include <pulsecore/core-util.h>
 
 #include "util.h"
 

Modified: trunk/src/pulse/util.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/util.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulse/util.h (original)
+++ trunk/src/pulse/util.h Mon Jun 19 23:53:48 2006
@@ -4,27 +4,27 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
 #include <stddef.h>
 
-#include <polyp/cdecl.h>
+#include <pulse/cdecl.h>
 
 /** \file
  * Assorted utility functions */

Modified: trunk/src/pulse/version.h.in
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/version.h.in?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulse/version.h.in (original)
+++ trunk/src/pulse/version.h.in Mon Jun 19 23:53:48 2006
@@ -4,27 +4,27 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
 /* WARNING: Make sure to edit the real source file version.h.in! */
 
-#include <polyp/cdecl.h>
+#include <pulse/cdecl.h>
 
 /** \file
  * Define header version */
@@ -39,12 +39,12 @@
 /** Return the version of the library the current application is linked to. */
 const char* pa_get_library_version(void);
 
-/** The current API version. Version 6 relates to polypaudio
+/** The current API version. Version 6 relates to pulseaudio
  * 0.6. Prior versions (i.e. Polypaudio 0.5.1 and older) have
  * PA_API_VERSION undefined.  */
 #define PA_API_VERSION @PA_API_VERSION@
 
-/** The current protocol version. Version 8 relates to polypaudio 0.8.
+/** The current protocol version. Version 8 relates to pulseaudio 0.8.
  * \since 0.8 */
 #define PA_PROTOCOL_VERSION @PA_PROTOCOL_VERSION@
 

Modified: trunk/src/pulse/volume.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/volume.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulse/volume.c (original)
+++ trunk/src/pulse/volume.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/

Modified: trunk/src/pulse/volume.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/volume.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulse/volume.h (original)
+++ trunk/src/pulse/volume.h Mon Jun 19 23:53:48 2006
@@ -4,27 +4,27 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
 #include <inttypes.h>
-#include <polyp/cdecl.h>
-#include <polyp/sample.h>
+#include <pulse/cdecl.h>
+#include <pulse/sample.h>
 
 /** \page volume Volume Control
  *

Modified: trunk/src/pulse/xmalloc.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/xmalloc.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulse/xmalloc.c (original)
+++ trunk/src/pulse/xmalloc.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -29,8 +29,8 @@
 #include <unistd.h>
 #include <string.h>
 
-#include <polypcore/core-util.h>
-#include <polypcore/gccmacro.h>
+#include <pulsecore/core-util.h>
+#include <pulsecore/gccmacro.h>
 
 #include "xmalloc.h"
 

Modified: trunk/src/pulse/xmalloc.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/xmalloc.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulse/xmalloc.h (original)
+++ trunk/src/pulse/xmalloc.h Mon Jun 19 23:53:48 2006
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -26,7 +26,7 @@
 #include <stdlib.h>
 #include <limits.h>
 #include <assert.h>
-#include <polyp/cdecl.h>
+#include <pulse/cdecl.h>
 
 /** \file
  * Memory allocation functions.

Modified: trunk/src/pulsecore/Makefile
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/Makefile?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/Makefile (original)
+++ trunk/src/pulsecore/Makefile Mon Jun 19 23:53:48 2006
@@ -1,1 +1,1 @@
-link ../polyp/Makefile
+link ../pulse/Makefile

Modified: trunk/src/pulsecore/authkey-prop.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/authkey-prop.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/authkey-prop.c (original)
+++ trunk/src/pulsecore/authkey-prop.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -22,10 +22,10 @@
 #include <assert.h>
 #include <string.h>
 
-#include <polyp/xmalloc.h>
+#include <pulse/xmalloc.h>
 
-#include <polypcore/props.h>
-#include <polypcore/log.h>
+#include <pulsecore/props.h>
+#include <pulsecore/log.h>
 
 #include "authkey-prop.h"
 

Modified: trunk/src/pulsecore/authkey-prop.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/authkey-prop.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/authkey-prop.h (original)
+++ trunk/src/pulsecore/authkey-prop.h Mon Jun 19 23:53:48 2006
@@ -4,25 +4,25 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include <polypcore/core.h>
+#include <pulsecore/core.h>
 
 /* The authkey-prop uses a central property to store a previously
  * loaded cookie in memory. Useful for sharing the same cookie between

Modified: trunk/src/pulsecore/authkey.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/authkey.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/authkey.c (original)
+++ trunk/src/pulsecore/authkey.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -35,11 +35,11 @@
 #include <limits.h>
 #include <sys/stat.h>
 
-#include <polyp/util.h>
-#include <polypcore/core-error.h>
-#include <polypcore/core-util.h>
-#include <polypcore/log.h>
-#include <polypcore/random.h>
+#include <pulse/util.h>
+#include <pulsecore/core-error.h>
+#include <pulsecore/core-util.h>
+#include <pulsecore/log.h>
+#include <pulsecore/random.h>
 
 #include "authkey.h"
 

Modified: trunk/src/pulsecore/authkey.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/authkey.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/authkey.h (original)
+++ trunk/src/pulsecore/authkey.h Mon Jun 19 23:53:48 2006
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/

Modified: trunk/src/pulsecore/autoload.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/autoload.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/autoload.c (original)
+++ trunk/src/pulsecore/autoload.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -27,14 +27,14 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <polyp/xmalloc.h>
+#include <pulse/xmalloc.h>
 
-#include <polypcore/module.h>
-#include <polypcore/memchunk.h>
-#include <polypcore/sound-file.h>
-#include <polypcore/log.h>
-#include <polypcore/core-scache.h>
-#include <polypcore/core-subscribe.h>
+#include <pulsecore/module.h>
+#include <pulsecore/memchunk.h>
+#include <pulsecore/sound-file.h>
+#include <pulsecore/log.h>
+#include <pulsecore/core-scache.h>
+#include <pulsecore/core-subscribe.h>
 
 #include "autoload.h"
 

Modified: trunk/src/pulsecore/autoload.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/autoload.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/autoload.h (original)
+++ trunk/src/pulsecore/autoload.h Mon Jun 19 23:53:48 2006
@@ -4,25 +4,25 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include <polypcore/namereg.h>
+#include <pulsecore/namereg.h>
 
 /* Using the autoloading facility, modules by be loaded on-demand and
  * synchronously. The user may register a "ghost sink" or "ghost

Modified: trunk/src/pulsecore/cli-command.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/cli-command.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/cli-command.c (original)
+++ trunk/src/pulsecore/cli-command.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -29,27 +29,27 @@
 #include <stdlib.h>
 #include <errno.h>
 
-#include <polyp/xmalloc.h>
-
-#include <polypcore/module.h>
-#include <polypcore/sink.h>
-#include <polypcore/source.h>
-#include <polypcore/client.h>
-#include <polypcore/sink-input.h>
-#include <polypcore/source-output.h>
-#include <polypcore/tokenizer.h>
-#include <polypcore/strbuf.h>
-#include <polypcore/namereg.h>
-#include <polypcore/cli-text.h>
-#include <polypcore/core-scache.h>
-#include <polypcore/sample-util.h>
-#include <polypcore/sound-file.h>
-#include <polypcore/play-memchunk.h>
-#include <polypcore/autoload.h>
-#include <polypcore/sound-file-stream.h>
-#include <polypcore/props.h>
-#include <polypcore/core-util.h>
-#include <polypcore/core-error.h>
+#include <pulse/xmalloc.h>
+
+#include <pulsecore/module.h>
+#include <pulsecore/sink.h>
+#include <pulsecore/source.h>
+#include <pulsecore/client.h>
+#include <pulsecore/sink-input.h>
+#include <pulsecore/source-output.h>
+#include <pulsecore/tokenizer.h>
+#include <pulsecore/strbuf.h>
+#include <pulsecore/namereg.h>
+#include <pulsecore/cli-text.h>
+#include <pulsecore/core-scache.h>
+#include <pulsecore/sample-util.h>
+#include <pulsecore/sound-file.h>
+#include <pulsecore/play-memchunk.h>
+#include <pulsecore/autoload.h>
+#include <pulsecore/sound-file-stream.h>
+#include <pulsecore/props.h>
+#include <pulsecore/core-util.h>
+#include <pulsecore/core-error.h>
 
 #include "cli-command.h"
 

Modified: trunk/src/pulsecore/cli-command.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/cli-command.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/cli-command.h (original)
+++ trunk/src/pulsecore/cli-command.h Mon Jun 19 23:53:48 2006
@@ -4,26 +4,26 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include <polypcore/strbuf.h>
-#include <polypcore/core.h>
+#include <pulsecore/strbuf.h>
+#include <pulsecore/core.h>
 
 /* Execute a single CLI command. Write the results to the string
  * buffer *buf. If *fail is non-zero the function will return -1 when

Modified: trunk/src/pulsecore/cli-text.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/cli-text.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/cli-text.c (original)
+++ trunk/src/pulsecore/cli-text.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -26,19 +26,19 @@
 #include <assert.h>
 #include <string.h>
 
-#include <polyp/volume.h>
-#include <polyp/xmalloc.h>
-
-#include <polypcore/module.h>
-#include <polypcore/client.h>
-#include <polypcore/sink.h>
-#include <polypcore/source.h>
-#include <polypcore/sink-input.h>
-#include <polypcore/source-output.h>
-#include <polypcore/strbuf.h>
-#include <polypcore/sample-util.h>
-#include <polypcore/core-scache.h>
-#include <polypcore/autoload.h>
+#include <pulse/volume.h>
+#include <pulse/xmalloc.h>
+
+#include <pulsecore/module.h>
+#include <pulsecore/client.h>
+#include <pulsecore/sink.h>
+#include <pulsecore/source.h>
+#include <pulsecore/sink-input.h>
+#include <pulsecore/source-output.h>
+#include <pulsecore/strbuf.h>
+#include <pulsecore/sample-util.h>
+#include <pulsecore/core-scache.h>
+#include <pulsecore/autoload.h>
 
 #include "cli-text.h"
 

Modified: trunk/src/pulsecore/cli-text.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/cli-text.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/cli-text.h (original)
+++ trunk/src/pulsecore/cli-text.h Mon Jun 19 23:53:48 2006
@@ -4,25 +4,25 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include <polypcore/core.h>
+#include <pulsecore/core.h>
 
 /* Some functions to generate pretty formatted listings of
  * entities. The returned strings have to be freed manually. */

Modified: trunk/src/pulsecore/cli.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/cli.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/cli.c (original)
+++ trunk/src/pulsecore/cli.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -28,21 +28,21 @@
 #include <assert.h>
 #include <stdlib.h>
 
-#include <polyp/xmalloc.h>
+#include <pulse/xmalloc.h>
 
-#include <polypcore/ioline.h>
-#include <polypcore/module.h>
-#include <polypcore/sink.h>
-#include <polypcore/source.h>
-#include <polypcore/client.h>
-#include <polypcore/sink-input.h>
-#include <polypcore/source-output.h>
-#include <polypcore/tokenizer.h>
-#include <polypcore/strbuf.h>
-#include <polypcore/namereg.h>
-#include <polypcore/cli-text.h>
-#include <polypcore/cli-command.h>
-#include <polypcore/log.h>
+#include <pulsecore/ioline.h>
+#include <pulsecore/module.h>
+#include <pulsecore/sink.h>
+#include <pulsecore/source.h>
+#include <pulsecore/client.h>
+#include <pulsecore/sink-input.h>
+#include <pulsecore/source-output.h>
+#include <pulsecore/tokenizer.h>
+#include <pulsecore/strbuf.h>
+#include <pulsecore/namereg.h>
+#include <pulsecore/cli-text.h>
+#include <pulsecore/cli-command.h>
+#include <pulsecore/log.h>
 
 #include "cli.h"
 
@@ -84,7 +84,7 @@
     c->client->owner = m;
     
     pa_ioline_set_callback(c->line, line_callback, c);
-    pa_ioline_puts(c->line, "Welcome to polypaudio! Use \"help\" for usage information.\n"PROMPT);
+    pa_ioline_puts(c->line, "Welcome to pulseaudio! Use \"help\" for usage information.\n"PROMPT);
 
     c->fail = c->kill_requested = c->defer_kill = 0;
     

Modified: trunk/src/pulsecore/cli.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/cli.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/cli.h (original)
+++ trunk/src/pulsecore/cli.h Mon Jun 19 23:53:48 2006
@@ -4,27 +4,27 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include <polypcore/iochannel.h>
-#include <polypcore/core.h>
-#include <polypcore/module.h>
+#include <pulsecore/iochannel.h>
+#include <pulsecore/core.h>
+#include <pulsecore/module.h>
 
 typedef struct pa_cli pa_cli;
 

Modified: trunk/src/pulsecore/client.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/client.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/client.c (original)
+++ trunk/src/pulsecore/client.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -28,10 +28,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <polyp/xmalloc.h>
+#include <pulse/xmalloc.h>
 
-#include <polypcore/core-subscribe.h>
-#include <polypcore/log.h>
+#include <pulsecore/core-subscribe.h>
+#include <pulsecore/log.h>
 
 #include "client.h"
 

Modified: trunk/src/pulsecore/client.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/client.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/client.h (original)
+++ trunk/src/pulsecore/client.h Mon Jun 19 23:53:48 2006
@@ -4,26 +4,26 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include <polypcore/core.h>
-#include <polypcore/module.h>
+#include <pulsecore/core.h>
+#include <pulsecore/module.h>
 
 /* Every connection to the server should have a pa_client
  * attached. That way the user may generate a listing of all connected

Modified: trunk/src/pulsecore/conf-parser.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/conf-parser.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/conf-parser.c (original)
+++ trunk/src/pulsecore/conf-parser.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
 
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
 
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -28,11 +28,11 @@
 #include <stdio.h>
 #include <errno.h>
 
-#include <polyp/xmalloc.h>
+#include <pulse/xmalloc.h>
 
-#include <polypcore/core-error.h>
-#include <polypcore/log.h>
-#include <polypcore/core-util.h>
+#include <pulsecore/core-error.h>
+#include <pulsecore/log.h>
+#include <pulsecore/core-util.h>
 
 #include "conf-parser.h"
 

Modified: trunk/src/pulsecore/conf-parser.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/conf-parser.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/conf-parser.h (original)
+++ trunk/src/pulsecore/conf-parser.h Mon Jun 19 23:53:48 2006
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
 
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
 
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/

Modified: trunk/src/pulsecore/core-def.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/core-def.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/core-def.h (original)
+++ trunk/src/pulsecore/core-def.h Mon Jun 19 23:53:48 2006
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/

Modified: trunk/src/pulsecore/core-error.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/core-error.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/core-error.c (original)
+++ trunk/src/pulsecore/core-error.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -36,11 +36,11 @@
 #include <windows.h>
 #endif
 
-#include <polyp/utf8.h>
-#include <polyp/xmalloc.h>
-
-#include <polypcore/core-util.h>
-#include <polypcore/native-common.h>
+#include <pulse/utf8.h>
+#include <pulse/xmalloc.h>
+
+#include <pulsecore/core-util.h>
+#include <pulsecore/native-common.h>
 
 #include "core-error.h"
 
@@ -68,7 +68,7 @@
     HANDLE mutex;
     char name[64];
 
-    sprintf(name, "polypaudio%d", (int)GetCurrentProcessId());
+    sprintf(name, "pulseaudio%d", (int)GetCurrentProcessId());
 
     mutex = CreateMutex(NULL, FALSE, name);
     if (!mutex) {

Modified: trunk/src/pulsecore/core-error.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/core-error.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/core-error.h (original)
+++ trunk/src/pulsecore/core-error.h Mon Jun 19 23:53:48 2006
@@ -4,26 +4,26 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
 #include <inttypes.h>
-#include <polyp/cdecl.h>
+#include <pulse/cdecl.h>
 
 /** \file
  * Error management */

Modified: trunk/src/pulsecore/core-scache.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/core-scache.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/core-scache.c (original)
+++ trunk/src/pulsecore/core-scache.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -41,22 +41,22 @@
 #include <windows.h>
 #endif
 
-#include <polyp/mainloop.h>
-#include <polyp/channelmap.h>
-#include <polyp/timeval.h>
-#include <polyp/util.h>
-#include <polyp/volume.h>
-#include <polyp/xmalloc.h>
-
-#include <polypcore/sink-input.h>
-#include <polypcore/sample-util.h>
-#include <polypcore/play-memchunk.h>
-#include <polypcore/core-subscribe.h>
-#include <polypcore/namereg.h>
-#include <polypcore/sound-file.h>
-#include <polypcore/core-util.h>
-#include <polypcore/log.h>
-#include <polypcore/core-error.h>
+#include <pulse/mainloop.h>
+#include <pulse/channelmap.h>
+#include <pulse/timeval.h>
+#include <pulse/util.h>
+#include <pulse/volume.h>
+#include <pulse/xmalloc.h>
+
+#include <pulsecore/sink-input.h>
+#include <pulsecore/sample-util.h>
+#include <pulsecore/play-memchunk.h>
+#include <pulsecore/core-subscribe.h>
+#include <pulsecore/namereg.h>
+#include <pulsecore/sound-file.h>
+#include <pulsecore/core-util.h>
+#include <pulsecore/log.h>
+#include <pulsecore/core-error.h>
 
 #include "core-scache.h"
 

Modified: trunk/src/pulsecore/core-scache.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/core-scache.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/core-scache.h (original)
+++ trunk/src/pulsecore/core-scache.h Mon Jun 19 23:53:48 2006
@@ -4,27 +4,27 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include <polypcore/core.h>
-#include <polypcore/memchunk.h>
-#include <polypcore/sink.h>
+#include <pulsecore/core.h>
+#include <pulsecore/memchunk.h>
+#include <pulsecore/sink.h>
 
 #define PA_SCACHE_ENTRY_SIZE_MAX (1024*1024*2)
 

Modified: trunk/src/pulsecore/core-subscribe.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/core-subscribe.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/core-subscribe.c (original)
+++ trunk/src/pulsecore/core-subscribe.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -26,10 +26,10 @@
 #include <stdio.h>
 #include <assert.h>
 
-#include <polyp/xmalloc.h>
-
-#include <polypcore/queue.h>
-#include <polypcore/log.h>
+#include <pulse/xmalloc.h>
+
+#include <pulsecore/queue.h>
+#include <pulsecore/log.h>
 
 #include "core-subscribe.h"
 

Modified: trunk/src/pulsecore/core-subscribe.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/core-subscribe.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/core-subscribe.h (original)
+++ trunk/src/pulsecore/core-subscribe.h Mon Jun 19 23:53:48 2006
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -25,8 +25,8 @@
 typedef struct pa_subscription pa_subscription;
 typedef struct pa_subscription_event pa_subscription_event;
 
-#include <polypcore/core.h>
-#include <polypcore/native-common.h>
+#include <pulsecore/core.h>
+#include <pulsecore/native-common.h>
 
 pa_subscription* pa_subscription_new(pa_core *c, pa_subscription_mask_t m,  void (*callback)(pa_core *c, pa_subscription_event_type_t t, uint32_t index, void *userdata), void *userdata);
 void pa_subscription_free(pa_subscription*s);

Modified: trunk/src/pulsecore/core-util.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/core-util.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/core-util.c (original)
+++ trunk/src/pulsecore/core-util.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -69,20 +69,20 @@
 
 #include <samplerate.h>
 
-#include <polyp/xmalloc.h>
-#include <polyp/util.h>
-
-#include <polypcore/core-error.h>
-#include <polypcore/winsock.h>
-#include <polypcore/log.h>
+#include <pulse/xmalloc.h>
+#include <pulse/util.h>
+
+#include <pulsecore/core-error.h>
+#include <pulsecore/winsock.h>
+#include <pulsecore/log.h>
 
 #include "core-util.h"
 
 #ifndef OS_IS_WIN32
-#define PA_RUNTIME_PATH_PREFIX "/tmp/polypaudio-"
+#define PA_RUNTIME_PATH_PREFIX "/tmp/pulseaudio-"
 #define PATH_SEP '/'
 #else
-#define PA_RUNTIME_PATH_PREFIX "%TEMP%\\polypaudio-"
+#define PA_RUNTIME_PATH_PREFIX "%TEMP%\\pulseaudio-"
 #define PATH_SEP '\\'
 #endif
 
@@ -961,7 +961,7 @@
     return l1 >= l2 && strcmp(s+l1-l2, sfx) == 0;
 }
 
-/* if fn is null return the polypaudio run time path in s (/tmp/polypaudio)
+/* if fn is null return the pulseaudio run time path in s (/tmp/pulseaudio)
  * if fn is non-null and starts with / return fn in s
  * otherwise append fn to the run time path and return it in s */
 char *pa_runtime_path(const char *fn, char *s, size_t l) {

Modified: trunk/src/pulsecore/core-util.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/core-util.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/core-util.h (original)
+++ trunk/src/pulsecore/core-util.h Mon Jun 19 23:53:48 2006
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -27,7 +27,7 @@
 #include <stdarg.h>
 #include <stdio.h>
 
-#include <polypcore/gccmacro.h>
+#include <pulsecore/gccmacro.h>
 
 struct timeval;
 

Modified: trunk/src/pulsecore/core.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/core.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/core.c (original)
+++ trunk/src/pulsecore/core.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -28,19 +28,19 @@
 #include <stdio.h>
 #include <signal.h>
 
-#include <polyp/timeval.h>
-#include <polyp/xmalloc.h>
+#include <pulse/timeval.h>
+#include <pulse/xmalloc.h>
 
-#include <polypcore/module.h>
-#include <polypcore/sink.h>
-#include <polypcore/source.h>
-#include <polypcore/namereg.h>
-#include <polypcore/core-util.h>
-#include <polypcore/core-scache.h>
-#include <polypcore/autoload.h>
-#include <polypcore/core-subscribe.h>
-#include <polypcore/props.h>
-#include <polypcore/random.h>
+#include <pulsecore/module.h>
+#include <pulsecore/sink.h>
+#include <pulsecore/source.h>
+#include <pulsecore/namereg.h>
+#include <pulsecore/core-util.h>
+#include <pulsecore/core-scache.h>
+#include <pulsecore/autoload.h>
+#include <pulsecore/core-subscribe.h>
+#include <pulsecore/props.h>
+#include <pulsecore/random.h>
 
 #include "core.h"
 

Modified: trunk/src/pulsecore/core.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/core.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/core.h (original)
+++ trunk/src/pulsecore/core.h Mon Jun 19 23:53:48 2006
@@ -4,42 +4,42 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
 typedef struct pa_core pa_core;
 
-#include <polypcore/idxset.h>
-#include <polypcore/hashmap.h>
-#include <polyp/mainloop-api.h>
-#include <polyp/sample.h>
-#include <polypcore/memblock.h>
-#include <polypcore/resampler.h>
-#include <polypcore/queue.h>
-#include <polypcore/core-subscribe.h>
+#include <pulsecore/idxset.h>
+#include <pulsecore/hashmap.h>
+#include <pulse/mainloop-api.h>
+#include <pulse/sample.h>
+#include <pulsecore/memblock.h>
+#include <pulsecore/resampler.h>
+#include <pulsecore/queue.h>
+#include <pulsecore/core-subscribe.h>
 
-/* The core structure of polypaudio. Every polypaudio daemon contains
+/* The core structure of pulseaudio. Every pulseaudio daemon contains
  * exactly one of these. It is used for storing kind of global
  * variables for the daemon. */
 
 struct pa_core {
     /* A random value which may be used to identify this instance of
-     * polypaudio. Not cryptographically secure in any way. */
+     * pulseaudio. Not cryptographically secure in any way. */
     uint32_t cookie;
     
     pa_mainloop_api *mainloop;

Modified: trunk/src/pulsecore/dllmain.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/dllmain.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/dllmain.c (original)
+++ trunk/src/pulsecore/dllmain.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
 
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
 
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/

Modified: trunk/src/pulsecore/dynarray.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/dynarray.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/dynarray.c (original)
+++ trunk/src/pulsecore/dynarray.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -27,7 +27,7 @@
 #include <assert.h>
 #include <stdlib.h>
 
-#include <polyp/xmalloc.h>
+#include <pulse/xmalloc.h>
 
 #include "dynarray.h"
 

Modified: trunk/src/pulsecore/dynarray.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/dynarray.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/dynarray.h (original)
+++ trunk/src/pulsecore/dynarray.h Mon Jun 19 23:53:48 2006
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/

Modified: trunk/src/pulsecore/endianmacros.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/endianmacros.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/endianmacros.h (original)
+++ trunk/src/pulsecore/endianmacros.h Mon Jun 19 23:53:48 2006
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/

Modified: trunk/src/pulsecore/esound.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/esound.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/esound.h (original)
+++ trunk/src/pulsecore/esound.h Mon Jun 19 23:53:48 2006
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/

Modified: trunk/src/pulsecore/gccmacro.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/gccmacro.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/gccmacro.h (original)
+++ trunk/src/pulsecore/gccmacro.h Mon Jun 19 23:53:48 2006
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/

Modified: trunk/src/pulsecore/hashmap.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/hashmap.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/hashmap.c (original)
+++ trunk/src/pulsecore/hashmap.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -27,10 +27,10 @@
 #include <assert.h>
 #include <string.h>
 
-#include <polyp/xmalloc.h>
+#include <pulse/xmalloc.h>
 
-#include <polypcore/idxset.h>
-#include <polypcore/log.h>
+#include <pulsecore/idxset.h>
+#include <pulsecore/log.h>
 
 #include "hashmap.h"
 

Modified: trunk/src/pulsecore/hashmap.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/hashmap.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/hashmap.h (original)
+++ trunk/src/pulsecore/hashmap.h Mon Jun 19 23:53:48 2006
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/

Modified: trunk/src/pulsecore/idxset.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/idxset.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/idxset.c (original)
+++ trunk/src/pulsecore/idxset.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -28,7 +28,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <polyp/xmalloc.h>
+#include <pulse/xmalloc.h>
 
 #include "idxset.h"
 

Modified: trunk/src/pulsecore/idxset.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/idxset.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/idxset.h (original)
+++ trunk/src/pulsecore/idxset.h Mon Jun 19 23:53:48 2006
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/

Modified: trunk/src/pulsecore/inet_ntop.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/inet_ntop.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/inet_ntop.c (original)
+++ trunk/src/pulsecore/inet_ntop.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/

Modified: trunk/src/pulsecore/inet_pton.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/inet_pton.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/inet_pton.c (original)
+++ trunk/src/pulsecore/inet_pton.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/

Modified: trunk/src/pulsecore/iochannel.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/iochannel.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/iochannel.c (original)
+++ trunk/src/pulsecore/iochannel.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -38,12 +38,12 @@
 
 #include "winsock.h"
 
-#include <polyp/xmalloc.h>
-
-#include <polypcore/core-error.h>
-#include <polypcore/core-util.h>
-#include <polypcore/socket-util.h>
-#include <polypcore/log.h>
+#include <pulse/xmalloc.h>
+
+#include <pulsecore/core-error.h>
+#include <pulsecore/core-util.h>
+#include <pulsecore/socket-util.h>
+#include <pulsecore/log.h>
 
 #include "iochannel.h"
 

Modified: trunk/src/pulsecore/iochannel.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/iochannel.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/iochannel.h (original)
+++ trunk/src/pulsecore/iochannel.h Mon Jun 19 23:53:48 2006
@@ -4,27 +4,27 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
 #include <sys/types.h>
 
-#include <polyp/mainloop-api.h>
+#include <pulse/mainloop-api.h>
 
 /* A wrapper around UNIX file descriptors for attaching them to the a
    main event loop. Everytime new data may be read or be written to

Modified: trunk/src/pulsecore/ioline.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/ioline.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/ioline.c (original)
+++ trunk/src/pulsecore/ioline.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -29,10 +29,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <polyp/xmalloc.h>
-
-#include <polypcore/core-error.h>
-#include <polypcore/log.h>
+#include <pulse/xmalloc.h>
+
+#include <pulsecore/core-error.h>
+#include <pulsecore/log.h>
 
 #include "ioline.h"
 

Modified: trunk/src/pulsecore/ioline.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/ioline.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/ioline.h (original)
+++ trunk/src/pulsecore/ioline.h Mon Jun 19 23:53:48 2006
@@ -4,26 +4,26 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include <polypcore/iochannel.h>
-#include <polypcore/core-util.h>
+#include <pulsecore/iochannel.h>
+#include <pulsecore/core-util.h>
 
 /* An ioline wraps an iochannel for line based communication. A
  * callback function is called whenever a new line has been recieved

Modified: trunk/src/pulsecore/llist.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/llist.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/llist.h (original)
+++ trunk/src/pulsecore/llist.h Mon Jun 19 23:53:48 2006
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/

Modified: trunk/src/pulsecore/log.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/log.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/log.c (original)
+++ trunk/src/pulsecore/log.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -33,10 +33,10 @@
 #include <syslog.h>
 #endif
 
-#include <polyp/utf8.h>
-#include <polyp/xmalloc.h>
-
-#include <polypcore/core-util.h>
+#include <pulse/utf8.h>
+#include <pulse/xmalloc.h>
+
+#include <pulsecore/core-util.h>
 
 #include "log.h"
 

Modified: trunk/src/pulsecore/log.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/log.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/log.h (original)
+++ trunk/src/pulsecore/log.h Mon Jun 19 23:53:48 2006
@@ -4,26 +4,26 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
 #include <stdarg.h>
-#include <polypcore/gccmacro.h>
+#include <pulsecore/gccmacro.h>
 
 /* A simple logging subsystem */
 

Modified: trunk/src/pulsecore/mcalign.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/mcalign.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/mcalign.c (original)
+++ trunk/src/pulsecore/mcalign.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -28,7 +28,7 @@
 #include <assert.h>
 #include <string.h>
 
-#include <polyp/xmalloc.h>
+#include <pulse/xmalloc.h>
 
 #include "mcalign.h"
 

Modified: trunk/src/pulsecore/mcalign.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/mcalign.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/mcalign.h (original)
+++ trunk/src/pulsecore/mcalign.h Mon Jun 19 23:53:48 2006
@@ -4,26 +4,26 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include <polypcore/memblock.h>
-#include <polypcore/memchunk.h>
+#include <pulsecore/memblock.h>
+#include <pulsecore/memchunk.h>
 
 /* An alignment object, used for aligning memchunks to multiples of
  * the frame size. */

Modified: trunk/src/pulsecore/memblock.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/memblock.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/memblock.c (original)
+++ trunk/src/pulsecore/memblock.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -28,7 +28,7 @@
 #include <assert.h>
 #include <string.h>
 
-#include <polyp/xmalloc.h>
+#include <pulse/xmalloc.h>
 
 #include "memblock.h"
 

Modified: trunk/src/pulsecore/memblock.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/memblock.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/memblock.h (original)
+++ trunk/src/pulsecore/memblock.h Mon Jun 19 23:53:48 2006
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/

Modified: trunk/src/pulsecore/memblockq.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/memblockq.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/memblockq.c (original)
+++ trunk/src/pulsecore/memblockq.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -30,10 +30,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <polyp/xmalloc.h>
-
-#include <polypcore/log.h>
-#include <polypcore/mcalign.h>
+#include <pulse/xmalloc.h>
+
+#include <pulsecore/log.h>
+#include <pulsecore/mcalign.h>
 
 #include "memblockq.h"
 

Modified: trunk/src/pulsecore/memblockq.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/memblockq.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/memblockq.h (original)
+++ trunk/src/pulsecore/memblockq.h Mon Jun 19 23:53:48 2006
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -25,9 +25,9 @@
 #include <sys/types.h>
 #include <inttypes.h>
 
-#include <polypcore/memblock.h>
-#include <polypcore/memchunk.h>
-#include <polyp/def.h>
+#include <pulsecore/memblock.h>
+#include <pulsecore/memchunk.h>
+#include <pulse/def.h>
 
 /* A memblockq is a queue of pa_memchunks (yepp, the name is not
  * perfect). It is similar to the ring buffers used by most other

Modified: trunk/src/pulsecore/memchunk.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/memchunk.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/memchunk.c (original)
+++ trunk/src/pulsecore/memchunk.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -28,7 +28,7 @@
 #include <assert.h>
 #include <string.h>
 
-#include <polyp/xmalloc.h>
+#include <pulse/xmalloc.h>
 
 #include "memchunk.h"
 

Modified: trunk/src/pulsecore/memchunk.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/memchunk.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/memchunk.h (original)
+++ trunk/src/pulsecore/memchunk.h Mon Jun 19 23:53:48 2006
@@ -4,25 +4,25 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include <polypcore/memblock.h>
+#include <pulsecore/memblock.h>
 
 /* A memchunk describes a part of a memblock. In contrast to the memblock, a
  * memchunk is not allocated dynamically or reference counted, instead

Modified: trunk/src/pulsecore/modargs.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/modargs.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/modargs.c (original)
+++ trunk/src/pulsecore/modargs.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -28,15 +28,15 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <polyp/xmalloc.h>
-
-#include <polypcore/hashmap.h>
-#include <polypcore/idxset.h>
-#include <polypcore/sample-util.h>
-#include <polypcore/namereg.h>
-#include <polypcore/sink.h>
-#include <polypcore/source.h>
-#include <polypcore/core-util.h>
+#include <pulse/xmalloc.h>
+
+#include <pulsecore/hashmap.h>
+#include <pulsecore/idxset.h>
+#include <pulsecore/sample-util.h>
+#include <pulsecore/namereg.h>
+#include <pulsecore/sink.h>
+#include <pulsecore/source.h>
+#include <pulsecore/core-util.h>
 
 #include "modargs.h"
 

Modified: trunk/src/pulsecore/modargs.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/modargs.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/modargs.h (original)
+++ trunk/src/pulsecore/modargs.h Mon Jun 19 23:53:48 2006
@@ -4,28 +4,28 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
 #include <inttypes.h>
-#include <polyp/sample.h>
-#include <polyp/channelmap.h>
-#include <polypcore/core.h>
+#include <pulse/sample.h>
+#include <pulse/channelmap.h>
+#include <pulsecore/core.h>
 
 typedef struct pa_modargs pa_modargs;
 

Modified: trunk/src/pulsecore/modinfo.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/modinfo.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/modinfo.c (original)
+++ trunk/src/pulsecore/modinfo.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -26,10 +26,10 @@
 #include <ltdl.h>
 #include <assert.h>
 
-#include <polyp/xmalloc.h>
+#include <pulse/xmalloc.h>
 
-#include <polypcore/core-util.h>
-#include <polypcore/log.h>
+#include <pulsecore/core-util.h>
+#include <pulsecore/log.h>
 
 #include "modinfo.h"
 

Modified: trunk/src/pulsecore/modinfo.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/modinfo.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/modinfo.h (original)
+++ trunk/src/pulsecore/modinfo.h Mon Jun 19 23:53:48 2006
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/

Modified: trunk/src/pulsecore/module.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/module.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/module.c (original)
+++ trunk/src/pulsecore/module.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -31,12 +31,12 @@
 #include <errno.h>
 #include <ctype.h>
 
-#include <polyp/timeval.h>
-#include <polyp/xmalloc.h>
-
-#include <polypcore/core-subscribe.h>
-#include <polypcore/log.h>
-#include <polypcore/core-util.h>
+#include <pulse/timeval.h>
+#include <pulse/xmalloc.h>
+
+#include <pulsecore/core-subscribe.h>
+#include <pulsecore/log.h>
+#include <pulsecore/core-util.h>
 
 #include "module.h"
 

Modified: trunk/src/pulsecore/module.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/module.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/module.h (original)
+++ trunk/src/pulsecore/module.h Mon Jun 19 23:53:48 2006
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -25,8 +25,8 @@
 #include <inttypes.h>
 #include <ltdl.h>
 
-#include <polypcore/core.h>
-#include <polypcore/modinfo.h>
+#include <pulsecore/core.h>
+#include <pulsecore/modinfo.h>
 
 typedef struct pa_module pa_module;
 

Modified: trunk/src/pulsecore/namereg.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/namereg.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/namereg.c (original)
+++ trunk/src/pulsecore/namereg.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -29,13 +29,13 @@
 #include <string.h>
 #include <stdio.h>
 
-#include <polyp/xmalloc.h>
-
-#include <polypcore/autoload.h>
-#include <polypcore/source.h>
-#include <polypcore/sink.h>
-#include <polypcore/core-subscribe.h>
-#include <polypcore/core-util.h>
+#include <pulse/xmalloc.h>
+
+#include <pulsecore/autoload.h>
+#include <pulsecore/source.h>
+#include <pulsecore/sink.h>
+#include <pulsecore/core-subscribe.h>
+#include <pulsecore/core-util.h>
 
 #include "namereg.h"
 

Modified: trunk/src/pulsecore/namereg.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/namereg.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/namereg.h (original)
+++ trunk/src/pulsecore/namereg.h Mon Jun 19 23:53:48 2006
@@ -4,25 +4,25 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include <polypcore/core.h>
+#include <pulsecore/core.h>
 
 typedef enum pa_namereg_type {
     PA_NAMEREG_SINK,

Modified: trunk/src/pulsecore/native-common.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/native-common.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/native-common.h (original)
+++ trunk/src/pulsecore/native-common.h Mon Jun 19 23:53:48 2006
@@ -4,26 +4,26 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include <polyp/cdecl.h>
-#include <polyp/def.h>
+#include <pulse/cdecl.h>
+#include <pulse/def.h>
 
 PA_C_DECL_BEGIN
 
@@ -112,7 +112,7 @@
 };
 
 #define PA_NATIVE_COOKIE_LENGTH 256
-#define PA_NATIVE_COOKIE_FILE ".polypaudio-cookie"
+#define PA_NATIVE_COOKIE_FILE ".pulseaudio-cookie"
 
 #define PA_NATIVE_DEFAULT_PORT 4713
 

Modified: trunk/src/pulsecore/packet.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/packet.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/packet.c (original)
+++ trunk/src/pulsecore/packet.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -26,7 +26,7 @@
 #include <assert.h>
 #include <stdlib.h>
 
-#include <polyp/xmalloc.h>
+#include <pulse/xmalloc.h>
 
 #include "packet.h"
 

Modified: trunk/src/pulsecore/packet.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/packet.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/packet.h (original)
+++ trunk/src/pulsecore/packet.h Mon Jun 19 23:53:48 2006
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/

Modified: trunk/src/pulsecore/parseaddr.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/parseaddr.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/parseaddr.c (original)
+++ trunk/src/pulsecore/parseaddr.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -27,10 +27,10 @@
 #include <assert.h>
 #include <stdlib.h>
 
-#include <polyp/xmalloc.h>
+#include <pulse/xmalloc.h>
 
-#include <polyp/util.h>
-#include <polypcore/core-util.h>
+#include <pulse/util.h>
+#include <pulsecore/core-util.h>
 
 #include "parseaddr.h"
 

Modified: trunk/src/pulsecore/parseaddr.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/parseaddr.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/parseaddr.h (original)
+++ trunk/src/pulsecore/parseaddr.h Mon Jun 19 23:53:48 2006
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/

Modified: trunk/src/pulsecore/pdispatch.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/pdispatch.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/pdispatch.c (original)
+++ trunk/src/pulsecore/pdispatch.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -27,13 +27,13 @@
 #include <stdlib.h>
 #include <assert.h>
 
-#include <polyp/timeval.h>
-#include <polyp/xmalloc.h>
-
-#include <polypcore/native-common.h>
-#include <polypcore/llist.h>
-#include <polypcore/log.h>
-#include <polypcore/core-util.h>
+#include <pulse/timeval.h>
+#include <pulse/xmalloc.h>
+
+#include <pulsecore/native-common.h>
+#include <pulsecore/llist.h>
+#include <pulsecore/log.h>
+#include <pulsecore/core-util.h>
 
 #include "pdispatch.h"
 

Modified: trunk/src/pulsecore/pdispatch.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/pdispatch.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/pdispatch.h (original)
+++ trunk/src/pulsecore/pdispatch.h Mon Jun 19 23:53:48 2006
@@ -4,29 +4,29 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
 #include <inttypes.h>
-#include <polyp/mainloop-api.h>
-#include <polyp/def.h>
-#include <polypcore/tagstruct.h>
-#include <polypcore/packet.h>
+#include <pulse/mainloop-api.h>
+#include <pulse/def.h>
+#include <pulsecore/tagstruct.h>
+#include <pulsecore/packet.h>
 
 typedef struct pa_pdispatch pa_pdispatch;
 

Modified: trunk/src/pulsecore/pid.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/pid.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/pid.c (original)
+++ trunk/src/pulsecore/pid.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -39,11 +39,11 @@
 #include <windows.h>
 #endif
 
-#include <polyp/xmalloc.h>
-
-#include <polypcore/core-error.h>
-#include <polypcore/core-util.h>
-#include <polypcore/log.h>
+#include <pulse/xmalloc.h>
+
+#include <pulsecore/core-error.h>
+#include <pulsecore/core-util.h>
+#include <pulsecore/log.h>
 
 #include "pid.h"
 

Modified: trunk/src/pulsecore/pid.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/pid.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/pid.h (original)
+++ trunk/src/pulsecore/pid.h Mon Jun 19 23:53:48 2006
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/

Modified: trunk/src/pulsecore/pipe.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/pipe.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/pipe.c (original)
+++ trunk/src/pulsecore/pipe.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-   This file is part of polypaudio.
+   This file is part of PulseAudio.
 
-   polypaudio is free software; you can redistribute it and/or modify it
+   PulseAudio is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
    by the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
 
-   polypaudio is distributed in the hope that it will be useful, but
+   PulseAudio 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
    Library General Public License for more details.
 
    You should have received a copy of the GNU Library General Public
-   License along with polypaudio; If not, write to the Free Software
+   License along with PulseAudio; If not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
    USA.
 ***/

Modified: trunk/src/pulsecore/pipe.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/pipe.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/pipe.h (original)
+++ trunk/src/pulsecore/pipe.h Mon Jun 19 23:53:48 2006
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-   This file is part of polypaudio.
+   This file is part of PulseAudio.
 
-   polypaudio is free software; you can redistribute it and/or modify it
+   PulseAudio is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
    by the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
 
-   polypaudio is distributed in the hope that it will be useful, but
+   PulseAudio 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
    Library General Public License for more details.
 
    You should have received a copy of the GNU Library General Public
-   License along with polypaudio; If not, write to the Free Software
+   License along with PulseAudio; If not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
    USA.
 ***/

Modified: trunk/src/pulsecore/play-memchunk.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/play-memchunk.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/play-memchunk.c (original)
+++ trunk/src/pulsecore/play-memchunk.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -28,10 +28,10 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <polyp/xmalloc.h>
+#include <pulse/xmalloc.h>
 
-#include <polypcore/sink-input.h>
-#include <polypcore/gccmacro.h>
+#include <pulsecore/sink-input.h>
+#include <pulsecore/gccmacro.h>
 
 #include "play-memchunk.h"
 

Modified: trunk/src/pulsecore/play-memchunk.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/play-memchunk.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/play-memchunk.h (original)
+++ trunk/src/pulsecore/play-memchunk.h Mon Jun 19 23:53:48 2006
@@ -4,26 +4,26 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include <polypcore/sink.h>
-#include <polypcore/memchunk.h>
+#include <pulsecore/sink.h>
+#include <pulsecore/memchunk.h>
 
 int pa_play_memchunk(
     pa_sink *sink,

Modified: trunk/src/pulsecore/poll.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/poll.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/poll.c (original)
+++ trunk/src/pulsecore/poll.c Mon Jun 19 23:53:48 2006
@@ -3,21 +3,21 @@
 /***
    Copyright (C) 1994, 1996, 1997 Free Software Foundation, Inc.
    Copyright (C) 2005, Cendio AB.
-   This file is part of polypaudio.
+   This file is part of PulseAudio.
    Based on work for the GNU C Library.
 
-   polypaudio is free software; you can redistribute it and/or modify it
+   PulseAudio is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
    by the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
 
-   polypaudio is distributed in the hope that it will be useful, but
+   PulseAudio 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
    Library General Public License for more details.
 
    You should have received a copy of the GNU Library General Public
-   License along with polypaudio; If not, write to the Free Software
+   License along with PulseAudio; If not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
    USA.
 ***/
@@ -42,7 +42,7 @@
 
 #ifndef HAVE_SYS_POLL_H
 
-#include <polypcore/core-util.h>
+#include <pulsecore/core-util.h>
 
 #include "poll.h"
 

Modified: trunk/src/pulsecore/poll.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/poll.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/poll.h (original)
+++ trunk/src/pulsecore/poll.h Mon Jun 19 23:53:48 2006
@@ -4,21 +4,21 @@
    Compatibility definitions for System V `poll' interface.
    Copyright (C) 1994,96,97,98,99,2000,2001,2004 Free Software Foundation, Inc.
    Copyright (C) 2005, Cendio AB.
-   This file is part of polypaudio.
+   This file is part of PulseAudio.
    Based on work for the GNU C Library.
 
-   polypaudio is free software; you can redistribute it and/or modify it
+   PulseAudio is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
    by the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
 
-   polypaudio is distributed in the hope that it will be useful, but
+   PulseAudio 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
    Library General Public License for more details.
 
    You should have received a copy of the GNU Library General Public
-   License along with polypaudio; If not, write to the Free Software
+   License along with PulseAudio; If not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
    USA.
 ***/

Modified: trunk/src/pulsecore/props.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/props.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/props.c (original)
+++ trunk/src/pulsecore/props.c Mon Jun 19 23:53:48 2006
@@ -1,29 +1,29 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
 #include <assert.h>
 
-#include <polyp/xmalloc.h>
+#include <pulse/xmalloc.h>
 
-#include <polypcore/log.h>
+#include <pulsecore/log.h>
 
 #include "props.h"
 

Modified: trunk/src/pulsecore/props.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/props.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/props.h (original)
+++ trunk/src/pulsecore/props.h Mon Jun 19 23:53:48 2006
@@ -4,26 +4,26 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include <polypcore/core.h>
-#include <polypcore/strbuf.h>
+#include <pulsecore/core.h>
+#include <pulsecore/strbuf.h>
 
 /* The property subsystem is to be used to share data between
  * modules. Consider them to be kind of "global" variables for a

Modified: trunk/src/pulsecore/protocol-cli.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/protocol-cli.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/protocol-cli.c (original)
+++ trunk/src/pulsecore/protocol-cli.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -26,10 +26,10 @@
 #include <assert.h>
 #include <stdlib.h>
 
-#include <polyp/xmalloc.h>
+#include <pulse/xmalloc.h>
 
-#include <polypcore/cli.h>
-#include <polypcore/log.h>
+#include <pulsecore/cli.h>
+#include <pulsecore/log.h>
 
 #include "protocol-cli.h"
 

Modified: trunk/src/pulsecore/protocol-cli.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/protocol-cli.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/protocol-cli.h (original)
+++ trunk/src/pulsecore/protocol-cli.h Mon Jun 19 23:53:48 2006
@@ -4,28 +4,28 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include <polypcore/core.h>
-#include <polypcore/socket-server.h>
-#include <polypcore/module.h>
-#include <polypcore/modargs.h>
+#include <pulsecore/core.h>
+#include <pulsecore/socket-server.h>
+#include <pulsecore/module.h>
+#include <pulsecore/modargs.h>
 
 typedef struct pa_protocol_cli pa_protocol_cli;
 

Modified: trunk/src/pulsecore/protocol-esound.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/protocol-esound.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/protocol-esound.c (original)
+++ trunk/src/pulsecore/protocol-esound.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -30,25 +30,25 @@
 #include <stdlib.h>
 #include <limits.h>
 
-#include <polyp/sample.h>
-#include <polyp/timeval.h>
-#include <polyp/utf8.h>
-#include <polyp/xmalloc.h>
-
-#include <polypcore/esound.h>
-#include <polypcore/memblock.h>
-#include <polypcore/client.h>
-#include <polypcore/sink-input.h>
-#include <polypcore/sink.h>
-#include <polypcore/source-output.h>
-#include <polypcore/source.h>
-#include <polypcore/core-scache.h>
-#include <polypcore/sample-util.h>
-#include <polypcore/authkey.h>
-#include <polypcore/namereg.h>
-#include <polypcore/log.h>
-#include <polypcore/core-util.h>
-#include <polypcore/core-error.h>
+#include <pulse/sample.h>
+#include <pulse/timeval.h>
+#include <pulse/utf8.h>
+#include <pulse/xmalloc.h>
+
+#include <pulsecore/esound.h>
+#include <pulsecore/memblock.h>
+#include <pulsecore/client.h>
+#include <pulsecore/sink-input.h>
+#include <pulsecore/sink.h>
+#include <pulsecore/source-output.h>
+#include <pulsecore/source.h>
+#include <pulsecore/core-scache.h>
+#include <pulsecore/sample-util.h>
+#include <pulsecore/authkey.h>
+#include <pulsecore/namereg.h>
+#include <pulsecore/log.h>
+#include <pulsecore/core-util.h>
+#include <pulsecore/core-error.h>
 
 #include "endianmacros.h"
 

Modified: trunk/src/pulsecore/protocol-esound.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/protocol-esound.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/protocol-esound.h (original)
+++ trunk/src/pulsecore/protocol-esound.h Mon Jun 19 23:53:48 2006
@@ -4,28 +4,28 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include <polypcore/core.h>
-#include <polypcore/socket-server.h>
-#include <polypcore/module.h>
-#include <polypcore/modargs.h>
+#include <pulsecore/core.h>
+#include <pulsecore/socket-server.h>
+#include <pulsecore/module.h>
+#include <pulsecore/modargs.h>
 
 typedef struct pa_protocol_esound pa_protocol_esound;
 

Modified: trunk/src/pulsecore/protocol-http.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/protocol-http.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/protocol-http.c (original)
+++ trunk/src/pulsecore/protocol-http.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -28,13 +28,13 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <polyp/util.h>
-#include <polyp/xmalloc.h>
-
-#include <polypcore/ioline.h>
-#include <polypcore/log.h>
-#include <polypcore/namereg.h>
-#include <polypcore/cli-text.h>
+#include <pulse/util.h>
+#include <pulse/xmalloc.h>
+
+#include <pulsecore/ioline.h>
+#include <pulsecore/log.h>
+#include <pulsecore/namereg.h>
+#include <pulsecore/cli-text.h>
 
 #include "protocol-http.h"
 

Modified: trunk/src/pulsecore/protocol-http.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/protocol-http.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/protocol-http.h (original)
+++ trunk/src/pulsecore/protocol-http.h Mon Jun 19 23:53:48 2006
@@ -4,28 +4,28 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include <polypcore/core.h>
-#include <polypcore/socket-server.h>
-#include <polypcore/module.h>
-#include <polypcore/modargs.h>
+#include <pulsecore/core.h>
+#include <pulsecore/socket-server.h>
+#include <pulsecore/module.h>
+#include <pulsecore/modargs.h>
 
 typedef struct pa_protocol_http pa_protocol_http;
 

Modified: trunk/src/pulsecore/protocol-native.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/protocol-native.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/protocol-native.c (original)
+++ trunk/src/pulsecore/protocol-native.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -29,32 +29,32 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include <polyp/timeval.h>
-#include <polyp/version.h>
-#include <polyp/utf8.h>
-#include <polyp/util.h>
-#include <polyp/xmalloc.h>
-
-#include <polypcore/native-common.h>
-#include <polypcore/packet.h>
-#include <polypcore/client.h>
-#include <polypcore/source-output.h>
-#include <polypcore/sink-input.h>
-#include <polypcore/pstream.h>
-#include <polypcore/tagstruct.h>
-#include <polypcore/pdispatch.h>
-#include <polypcore/pstream-util.h>
-#include <polypcore/authkey.h>
-#include <polypcore/namereg.h>
-#include <polypcore/core-scache.h>
-#include <polypcore/core-subscribe.h>
-#include <polypcore/log.h>
-#include <polypcore/autoload.h>
-#include <polypcore/authkey-prop.h>
-#include <polypcore/strlist.h>
-#include <polypcore/props.h>
-#include <polypcore/sample-util.h>
-#include <polypcore/llist.h>
+#include <pulse/timeval.h>
+#include <pulse/version.h>
+#include <pulse/utf8.h>
+#include <pulse/util.h>
+#include <pulse/xmalloc.h>
+
+#include <pulsecore/native-common.h>
+#include <pulsecore/packet.h>
+#include <pulsecore/client.h>
+#include <pulsecore/source-output.h>
+#include <pulsecore/sink-input.h>
+#include <pulsecore/pstream.h>
+#include <pulsecore/tagstruct.h>
+#include <pulsecore/pdispatch.h>
+#include <pulsecore/pstream-util.h>
+#include <pulsecore/authkey.h>
+#include <pulsecore/namereg.h>
+#include <pulsecore/core-scache.h>
+#include <pulsecore/core-subscribe.h>
+#include <pulsecore/log.h>
+#include <pulsecore/autoload.h>
+#include <pulsecore/authkey-prop.h>
+#include <pulsecore/strlist.h>
+#include <pulsecore/props.h>
+#include <pulsecore/sample-util.h>
+#include <pulsecore/llist.h>
 
 #include "protocol-native.h"
 

Modified: trunk/src/pulsecore/protocol-native.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/protocol-native.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/protocol-native.h (original)
+++ trunk/src/pulsecore/protocol-native.h Mon Jun 19 23:53:48 2006
@@ -4,28 +4,28 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include <polypcore/core.h>
-#include <polypcore/socket-server.h>
-#include <polypcore/module.h>
-#include <polypcore/modargs.h>
+#include <pulsecore/core.h>
+#include <pulsecore/socket-server.h>
+#include <pulsecore/module.h>
+#include <pulsecore/modargs.h>
 
 typedef struct pa_protocol_native pa_protocol_native;
 

Modified: trunk/src/pulsecore/protocol-simple.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/protocol-simple.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/protocol-simple.c (original)
+++ trunk/src/pulsecore/protocol-simple.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -30,15 +30,15 @@
 #include <errno.h>
 #include <string.h>
 
-#include <polyp/xmalloc.h>
-
-#include <polypcore/sink-input.h>
-#include <polypcore/source-output.h>
-#include <polypcore/client.h>
-#include <polypcore/sample-util.h>
-#include <polypcore/namereg.h>
-#include <polypcore/log.h>
-#include <polypcore/core-error.h>
+#include <pulse/xmalloc.h>
+
+#include <pulsecore/sink-input.h>
+#include <pulsecore/source-output.h>
+#include <pulsecore/client.h>
+#include <pulsecore/sample-util.h>
+#include <pulsecore/namereg.h>
+#include <pulsecore/log.h>
+#include <pulsecore/core-error.h>
 
 #include "protocol-simple.h"
 

Modified: trunk/src/pulsecore/protocol-simple.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/protocol-simple.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/protocol-simple.h (original)
+++ trunk/src/pulsecore/protocol-simple.h Mon Jun 19 23:53:48 2006
@@ -4,28 +4,28 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include <polypcore/socket-server.h>
-#include <polypcore/module.h>
-#include <polypcore/core.h>
-#include <polypcore/modargs.h>
+#include <pulsecore/socket-server.h>
+#include <pulsecore/module.h>
+#include <pulsecore/core.h>
+#include <pulsecore/modargs.h>
 
 typedef struct pa_protocol_simple pa_protocol_simple;
 

Modified: trunk/src/pulsecore/pstream-util.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/pstream-util.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/pstream-util.c (original)
+++ trunk/src/pulsecore/pstream-util.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -25,7 +25,7 @@
 
 #include <assert.h>
 
-#include <polypcore/native-common.h>
+#include <pulsecore/native-common.h>
 
 #include "pstream-util.h"
 

Modified: trunk/src/pulsecore/pstream-util.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/pstream-util.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/pstream-util.h (original)
+++ trunk/src/pulsecore/pstream-util.h Mon Jun 19 23:53:48 2006
@@ -4,27 +4,27 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
 #include <inttypes.h>
-#include <polypcore/pstream.h>
-#include <polypcore/tagstruct.h>
+#include <pulsecore/pstream.h>
+#include <pulsecore/tagstruct.h>
 
 /* The tagstruct is freed!*/
 void pa_pstream_send_tagstruct_with_creds(pa_pstream *p, pa_tagstruct *t, int creds);

Modified: trunk/src/pulsecore/pstream.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/pstream.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/pstream.c (original)
+++ trunk/src/pulsecore/pstream.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -34,11 +34,11 @@
 
 #include "winsock.h"
 
-#include <polyp/xmalloc.h>
-
-#include <polypcore/queue.h>
-#include <polypcore/log.h>
-#include <polypcore/core-scache.h>
+#include <pulse/xmalloc.h>
+
+#include <pulsecore/queue.h>
+#include <pulsecore/log.h>
+#include <pulsecore/core-scache.h>
 
 #include "pstream.h"
 

Modified: trunk/src/pulsecore/pstream.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/pstream.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/pstream.h (original)
+++ trunk/src/pulsecore/pstream.h Mon Jun 19 23:53:48 2006
@@ -4,32 +4,32 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
 #include <inttypes.h>
 
-#include <polyp/mainloop-api.h>
-#include <polyp/def.h>
-#include <polypcore/packet.h>
-#include <polypcore/memblock.h>
-#include <polypcore/iochannel.h>
-#include <polypcore/memchunk.h>
+#include <pulse/mainloop-api.h>
+#include <pulse/def.h>
+#include <pulsecore/packet.h>
+#include <pulsecore/memblock.h>
+#include <pulsecore/iochannel.h>
+#include <pulsecore/memchunk.h>
 
 typedef struct pa_pstream pa_pstream;
 

Modified: trunk/src/pulsecore/queue.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/queue.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/queue.c (original)
+++ trunk/src/pulsecore/queue.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -26,7 +26,7 @@
 #include <assert.h>
 #include <stdlib.h>
 
-#include <polyp/xmalloc.h>
+#include <pulse/xmalloc.h>
 
 #include "queue.h"
 

Modified: trunk/src/pulsecore/queue.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/queue.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/queue.h (original)
+++ trunk/src/pulsecore/queue.h Mon Jun 19 23:53:48 2006
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/

Modified: trunk/src/pulsecore/random.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/random.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/random.c (original)
+++ trunk/src/pulsecore/random.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -31,8 +31,8 @@
 #include <assert.h>
 #include <time.h>
 
-#include <polypcore/core-util.h>
-#include <polypcore/log.h>
+#include <pulsecore/core-util.h>
+#include <pulsecore/log.h>
 
 #include "random.h"
 

Modified: trunk/src/pulsecore/random.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/random.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/random.h (original)
+++ trunk/src/pulsecore/random.h Mon Jun 19 23:53:48 2006
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/

Modified: trunk/src/pulsecore/resampler.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/resampler.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/resampler.c (original)
+++ trunk/src/pulsecore/resampler.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -30,10 +30,10 @@
 #include <liboil/liboilfuncs.h>
 #include <liboil/liboil.h>
 
-#include <polyp/xmalloc.h>
-
-#include <polypcore/sconv.h>
-#include <polypcore/log.h>
+#include <pulse/xmalloc.h>
+
+#include <pulsecore/sconv.h>
+#include <pulsecore/log.h>
 
 #include "resampler.h"
 

Modified: trunk/src/pulsecore/resampler.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/resampler.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/resampler.h (original)
+++ trunk/src/pulsecore/resampler.h Mon Jun 19 23:53:48 2006
@@ -4,30 +4,30 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
 #include <samplerate.h>
 
-#include <polyp/sample.h>
-#include <polyp/channelmap.h>
-#include <polypcore/memblock.h>
-#include <polypcore/memchunk.h>
+#include <pulse/sample.h>
+#include <pulse/channelmap.h>
+#include <pulsecore/memblock.h>
+#include <pulsecore/memchunk.h>
 
 typedef struct pa_resampler pa_resampler;
 

Modified: trunk/src/pulsecore/sample-util.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/sample-util.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/sample-util.c (original)
+++ trunk/src/pulsecore/sample-util.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -30,7 +30,7 @@
 
 #include <liboil/liboilfuncs.h>
 
-#include <polypcore/log.h>
+#include <pulsecore/log.h>
 
 #include "sample-util.h"
 #include "endianmacros.h"

Modified: trunk/src/pulsecore/sample-util.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/sample-util.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/sample-util.h (original)
+++ trunk/src/pulsecore/sample-util.h Mon Jun 19 23:53:48 2006
@@ -4,28 +4,28 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include <polyp/sample.h>
-#include <polyp/volume.h>
-#include <polypcore/memblock.h>
-#include <polypcore/memchunk.h>
+#include <pulse/sample.h>
+#include <pulse/volume.h>
+#include <pulsecore/memblock.h>
+#include <pulsecore/memchunk.h>
 
 pa_memblock *pa_silence_memblock(pa_memblock* b, const pa_sample_spec *spec);
 pa_memblock *pa_silence_memblock_new(const pa_sample_spec *spec, size_t length, pa_memblock_stat*s);

Modified: trunk/src/pulsecore/sconv-s16be.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/sconv-s16be.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/sconv-s16be.c (original)
+++ trunk/src/pulsecore/sconv-s16be.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/

Modified: trunk/src/pulsecore/sconv-s16be.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/sconv-s16be.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/sconv-s16be.h (original)
+++ trunk/src/pulsecore/sconv-s16be.h Mon Jun 19 23:53:48 2006
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/

Modified: trunk/src/pulsecore/sconv-s16le.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/sconv-s16le.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/sconv-s16le.c (original)
+++ trunk/src/pulsecore/sconv-s16le.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -28,8 +28,8 @@
 
 #include <liboil/liboilfuncs.h>
 
-#include <polypcore/sconv.h>
-#include <polypcore/log.h>
+#include <pulsecore/sconv.h>
+#include <pulsecore/log.h>
 
 #include "endianmacros.h"
 

Modified: trunk/src/pulsecore/sconv-s16le.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/sconv-s16le.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/sconv-s16le.h (original)
+++ trunk/src/pulsecore/sconv-s16le.h Mon Jun 19 23:53:48 2006
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/

Modified: trunk/src/pulsecore/sconv.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/sconv.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/sconv.c (original)
+++ trunk/src/pulsecore/sconv.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -30,7 +30,7 @@
 #include <liboil/liboilfuncs.h>
 #include <liboil/liboil.h>
 
-#include <polypcore/g711.h>
+#include <pulsecore/g711.h>
 
 #include "endianmacros.h"
 #include "sconv-s16le.h"

Modified: trunk/src/pulsecore/sconv.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/sconv.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/sconv.h (original)
+++ trunk/src/pulsecore/sconv.h Mon Jun 19 23:53:48 2006
@@ -4,25 +4,25 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include <polyp/sample.h>
+#include <pulse/sample.h>
 
 typedef void (*pa_convert_to_float32ne_func_t)(unsigned n, const void *a, float *b);
 typedef void (*pa_convert_from_float32ne_func_t)(unsigned n, const float *a, void *b);

Modified: trunk/src/pulsecore/sink-input.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/sink-input.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/sink-input.c (original)
+++ trunk/src/pulsecore/sink-input.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -28,12 +28,12 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <polyp/utf8.h>
-#include <polyp/xmalloc.h>
-
-#include <polypcore/sample-util.h>
-#include <polypcore/core-subscribe.h>
-#include <polypcore/log.h>
+#include <pulse/utf8.h>
+#include <pulse/xmalloc.h>
+
+#include <pulsecore/sample-util.h>
+#include <pulsecore/core-subscribe.h>
+#include <pulsecore/log.h>
 
 #include "sink-input.h"
 

Modified: trunk/src/pulsecore/sink-input.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/sink-input.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/sink-input.h (original)
+++ trunk/src/pulsecore/sink-input.h Mon Jun 19 23:53:48 2006
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -26,12 +26,12 @@
 
 typedef struct pa_sink_input pa_sink_input;
 
-#include <polyp/sample.h>
-#include <polypcore/sink.h>
-#include <polypcore/memblockq.h>
-#include <polypcore/resampler.h>
-#include <polypcore/module.h>
-#include <polypcore/client.h>
+#include <pulse/sample.h>
+#include <pulsecore/sink.h>
+#include <pulsecore/memblockq.h>
+#include <pulsecore/resampler.h>
+#include <pulsecore/module.h>
+#include <pulsecore/client.h>
 
 typedef enum pa_sink_input_state {
     PA_SINK_INPUT_RUNNING,

Modified: trunk/src/pulsecore/sink.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/sink.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/sink.c (original)
+++ trunk/src/pulsecore/sink.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -28,16 +28,16 @@
 #include <string.h>
 #include <stdio.h>
 
-#include <polyp/introspect.h>
-#include <polyp/utf8.h>
-#include <polyp/xmalloc.h>
-
-#include <polypcore/sink-input.h>
-#include <polypcore/namereg.h>
-#include <polypcore/core-util.h>
-#include <polypcore/sample-util.h>
-#include <polypcore/core-subscribe.h>
-#include <polypcore/log.h>
+#include <pulse/introspect.h>
+#include <pulse/utf8.h>
+#include <pulse/xmalloc.h>
+
+#include <pulsecore/sink-input.h>
+#include <pulsecore/namereg.h>
+#include <pulsecore/core-util.h>
+#include <pulsecore/sample-util.h>
+#include <pulsecore/core-subscribe.h>
+#include <pulsecore/log.h>
 
 #include "sink.h"
 

Modified: trunk/src/pulsecore/sink.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/sink.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/sink.h (original)
+++ trunk/src/pulsecore/sink.h Mon Jun 19 23:53:48 2006
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -26,14 +26,14 @@
 
 typedef struct pa_sink pa_sink;
 
-#include <polyp/sample.h>
-#include <polyp/channelmap.h>
-#include <polyp/volume.h>
-#include <polypcore/core-def.h>
-#include <polypcore/core.h>
-#include <polypcore/idxset.h>
-#include <polypcore/source.h>
-#include <polypcore/module.h>
+#include <pulse/sample.h>
+#include <pulse/channelmap.h>
+#include <pulse/volume.h>
+#include <pulsecore/core-def.h>
+#include <pulsecore/core.h>
+#include <pulsecore/idxset.h>
+#include <pulsecore/source.h>
+#include <pulsecore/module.h>
 
 #define PA_MAX_INPUTS_PER_SINK 32
 

Modified: trunk/src/pulsecore/sioman.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/sioman.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/sioman.c (original)
+++ trunk/src/pulsecore/sioman.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/

Modified: trunk/src/pulsecore/sioman.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/sioman.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/sioman.h (original)
+++ trunk/src/pulsecore/sioman.h Mon Jun 19 23:53:48 2006
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/

Modified: trunk/src/pulsecore/socket-client.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/socket-client.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/socket-client.c (original)
+++ trunk/src/pulsecore/socket-client.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -54,14 +54,14 @@
 
 #include "winsock.h"
 
-#include <polyp/timeval.h>
-#include <polyp/xmalloc.h>
-
-#include <polypcore/core-error.h>
-#include <polypcore/socket-util.h>
-#include <polypcore/core-util.h>
-#include <polypcore/log.h>
-#include <polypcore/parseaddr.h>
+#include <pulse/timeval.h>
+#include <pulse/xmalloc.h>
+
+#include <pulsecore/core-error.h>
+#include <pulsecore/socket-util.h>
+#include <pulsecore/core-util.h>
+#include <pulsecore/log.h>
+#include <pulsecore/parseaddr.h>
 
 #include "socket-client.h"
 

Modified: trunk/src/pulsecore/socket-client.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/socket-client.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/socket-client.h (original)
+++ trunk/src/pulsecore/socket-client.h Mon Jun 19 23:53:48 2006
@@ -4,28 +4,28 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
 #include <inttypes.h>
 
-#include <polyp/mainloop-api.h>
-#include <polypcore/iochannel.h>
+#include <pulse/mainloop-api.h>
+#include <pulsecore/iochannel.h>
 
 struct sockaddr;
 

Modified: trunk/src/pulsecore/socket-server.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/socket-server.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/socket-server.c (original)
+++ trunk/src/pulsecore/socket-server.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -62,13 +62,13 @@
 
 #include "winsock.h"
 
-#include <polyp/xmalloc.h>
-#include <polyp/util.h>
-
-#include <polypcore/socket-util.h>
-#include <polypcore/core-util.h>
-#include <polypcore/log.h>
-#include <polypcore/core-error.h>
+#include <pulse/xmalloc.h>
+#include <pulse/util.h>
+
+#include <pulsecore/socket-util.h>
+#include <pulsecore/core-util.h>
+#include <pulsecore/log.h>
+#include <pulsecore/core-error.h>
 
 #include "socket-server.h"
 

Modified: trunk/src/pulsecore/socket-server.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/socket-server.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/socket-server.h (original)
+++ trunk/src/pulsecore/socket-server.h Mon Jun 19 23:53:48 2006
@@ -4,27 +4,27 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
 #include <inttypes.h>
-#include <polyp/mainloop-api.h>
-#include <polypcore/iochannel.h>
+#include <pulse/mainloop-api.h>
+#include <pulsecore/iochannel.h>
 
 /* It is safe to destroy the calling socket_server object from the callback */
 

Modified: trunk/src/pulsecore/socket-util.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/socket-util.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/socket-util.c (original)
+++ trunk/src/pulsecore/socket-util.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -66,11 +66,11 @@
 
 #include "winsock.h"
 
-#include <polyp/xmalloc.h>
-
-#include <polypcore/core-error.h>
-#include <polypcore/core-util.h>
-#include <polypcore/log.h>
+#include <pulse/xmalloc.h>
+
+#include <pulsecore/core-error.h>
+#include <pulsecore/core-util.h>
+#include <pulsecore/log.h>
 
 #include "socket-util.h"
 

Modified: trunk/src/pulsecore/socket-util.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/socket-util.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/socket-util.h (original)
+++ trunk/src/pulsecore/socket-util.h Mon Jun 19 23:53:48 2006
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/

Modified: trunk/src/pulsecore/sound-file-stream.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/sound-file-stream.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/sound-file-stream.c (original)
+++ trunk/src/pulsecore/sound-file-stream.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -30,10 +30,10 @@
 
 #include <sndfile.h>
 
-#include <polyp/xmalloc.h>
+#include <pulse/xmalloc.h>
 
-#include <polypcore/sink-input.h>
-#include <polypcore/log.h>
+#include <pulsecore/sink-input.h>
+#include <pulsecore/log.h>
 
 #include "sound-file-stream.h"
 

Modified: trunk/src/pulsecore/sound-file-stream.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/sound-file-stream.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/sound-file-stream.h (original)
+++ trunk/src/pulsecore/sound-file-stream.h Mon Jun 19 23:53:48 2006
@@ -4,25 +4,25 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include <polypcore/sink.h>
+#include <pulsecore/sink.h>
 
 int pa_play_file(pa_sink *sink, const char *fname, const pa_cvolume *volume);
 

Modified: trunk/src/pulsecore/sound-file.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/sound-file.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/sound-file.c (original)
+++ trunk/src/pulsecore/sound-file.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -28,8 +28,8 @@
 
 #include <sndfile.h>
 
-#include <polyp/sample.h>
-#include <polypcore/log.h>
+#include <pulse/sample.h>
+#include <pulsecore/log.h>
 
 #include "sound-file.h"
 #include "core-scache.h"

Modified: trunk/src/pulsecore/sound-file.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/sound-file.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/sound-file.h (original)
+++ trunk/src/pulsecore/sound-file.h Mon Jun 19 23:53:48 2006
@@ -4,27 +4,27 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include <polyp/sample.h>
-#include <polyp/channelmap.h>
-#include <polypcore/memchunk.h>
+#include <pulse/sample.h>
+#include <pulse/channelmap.h>
+#include <pulsecore/memchunk.h>
 
 int pa_sound_file_load(const char *fname, pa_sample_spec *ss, pa_channel_map *map, pa_memchunk *chunk, pa_memblock_stat *s);
 

Modified: trunk/src/pulsecore/source-output.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/source-output.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/source-output.c (original)
+++ trunk/src/pulsecore/source-output.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -28,11 +28,11 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <polyp/utf8.h>
-#include <polyp/xmalloc.h>
-
-#include <polypcore/core-subscribe.h>
-#include <polypcore/log.h>
+#include <pulse/utf8.h>
+#include <pulse/xmalloc.h>
+
+#include <pulsecore/core-subscribe.h>
+#include <pulsecore/log.h>
 
 #include "source-output.h"
 

Modified: trunk/src/pulsecore/source-output.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/source-output.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/source-output.h (original)
+++ trunk/src/pulsecore/source-output.h Mon Jun 19 23:53:48 2006
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -26,12 +26,12 @@
 
 typedef struct pa_source_output pa_source_output;
 
-#include <polyp/sample.h>
-#include <polypcore/source.h>
-#include <polypcore/memblockq.h>
-#include <polypcore/resampler.h>
-#include <polypcore/module.h>
-#include <polypcore/client.h>
+#include <pulse/sample.h>
+#include <pulsecore/source.h>
+#include <pulsecore/memblockq.h>
+#include <pulsecore/resampler.h>
+#include <pulsecore/module.h>
+#include <pulsecore/client.h>
 
 typedef enum {
     PA_SOURCE_OUTPUT_RUNNING,

Modified: trunk/src/pulsecore/source.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/source.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/source.c (original)
+++ trunk/src/pulsecore/source.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -28,14 +28,14 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <polyp/utf8.h>
-#include <polyp/xmalloc.h>
-
-#include <polypcore/source-output.h>
-#include <polypcore/namereg.h>
-#include <polypcore/core-subscribe.h>
-#include <polypcore/log.h>
-#include <polypcore/sample-util.h>
+#include <pulse/utf8.h>
+#include <pulse/xmalloc.h>
+
+#include <pulsecore/source-output.h>
+#include <pulsecore/namereg.h>
+#include <pulsecore/core-subscribe.h>
+#include <pulsecore/log.h>
+#include <pulsecore/sample-util.h>
 
 #include "source.h"
 

Modified: trunk/src/pulsecore/source.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/source.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/source.h (original)
+++ trunk/src/pulsecore/source.h Mon Jun 19 23:53:48 2006
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -26,16 +26,16 @@
 
 #include <inttypes.h>
 
-#include <polyp/sample.h>
-#include <polyp/channelmap.h>
-#include <polyp/volume.h>
-#include <polypcore/core-def.h>
-#include <polypcore/core.h>
-#include <polypcore/idxset.h>
-#include <polypcore/memblock.h>
-#include <polypcore/memchunk.h>
-#include <polypcore/sink.h>
-#include <polypcore/module.h>
+#include <pulse/sample.h>
+#include <pulse/channelmap.h>
+#include <pulse/volume.h>
+#include <pulsecore/core-def.h>
+#include <pulsecore/core.h>
+#include <pulsecore/idxset.h>
+#include <pulsecore/memblock.h>
+#include <pulsecore/memchunk.h>
+#include <pulsecore/sink.h>
+#include <pulsecore/module.h>
 
 #define PA_MAX_OUTPUTS_PER_SOURCE 16
 

Modified: trunk/src/pulsecore/strbuf.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/strbuf.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/strbuf.c (original)
+++ trunk/src/pulsecore/strbuf.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -30,7 +30,7 @@
 #include <stdarg.h>
 #include <stdio.h>
 
-#include <polyp/xmalloc.h>
+#include <pulse/xmalloc.h>
 
 #include "strbuf.h"
 

Modified: trunk/src/pulsecore/strbuf.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/strbuf.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/strbuf.h (original)
+++ trunk/src/pulsecore/strbuf.h Mon Jun 19 23:53:48 2006
@@ -4,25 +4,25 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include <polypcore/gccmacro.h>
+#include <pulsecore/gccmacro.h>
 
 typedef struct pa_strbuf pa_strbuf;
 

Modified: trunk/src/pulsecore/strlist.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/strlist.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/strlist.c (original)
+++ trunk/src/pulsecore/strlist.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -26,10 +26,10 @@
 #include <string.h>
 #include <assert.h>
 
-#include <polyp/xmalloc.h>
+#include <pulse/xmalloc.h>
 
-#include <polypcore/strbuf.h>
-#include <polypcore/core-util.h>
+#include <pulsecore/strbuf.h>
+#include <pulsecore/core-util.h>
 
 #include "strlist.h"
 

Modified: trunk/src/pulsecore/strlist.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/strlist.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/strlist.h (original)
+++ trunk/src/pulsecore/strlist.h Mon Jun 19 23:53:48 2006
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/

Modified: trunk/src/pulsecore/tagstruct.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/tagstruct.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/tagstruct.c (original)
+++ trunk/src/pulsecore/tagstruct.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -36,7 +36,7 @@
 
 #include "winsock.h"
 
-#include <polyp/xmalloc.h>
+#include <pulse/xmalloc.h>
 
 #include "tagstruct.h"
 

Modified: trunk/src/pulsecore/tagstruct.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/tagstruct.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/tagstruct.h (original)
+++ trunk/src/pulsecore/tagstruct.h Mon Jun 19 23:53:48 2006
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -27,9 +27,9 @@
 #include <sys/time.h>
 #include <time.h>
 
-#include <polyp/sample.h>
-#include <polyp/channelmap.h>
-#include <polyp/volume.h>
+#include <pulse/sample.h>
+#include <pulse/channelmap.h>
+#include <pulse/volume.h>
 
 typedef struct pa_tagstruct pa_tagstruct;
 

Modified: trunk/src/pulsecore/tokenizer.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/tokenizer.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/tokenizer.c (original)
+++ trunk/src/pulsecore/tokenizer.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -27,10 +27,10 @@
 #include <assert.h>
 #include <stdlib.h>
 
-#include <polyp/xmalloc.h>
+#include <pulse/xmalloc.h>
 
-#include <polypcore/dynarray.h>
-#include <polypcore/gccmacro.h>
+#include <pulsecore/dynarray.h>
+#include <pulsecore/gccmacro.h>
 
 #include "tokenizer.h"
 

Modified: trunk/src/pulsecore/tokenizer.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/tokenizer.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/tokenizer.h (original)
+++ trunk/src/pulsecore/tokenizer.h Mon Jun 19 23:53:48 2006
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/

Modified: trunk/src/pulsecore/x11prop.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/x11prop.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/x11prop.c (original)
+++ trunk/src/pulsecore/x11prop.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
 
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
 
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/

Modified: trunk/src/pulsecore/x11prop.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/x11prop.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/x11prop.h (original)
+++ trunk/src/pulsecore/x11prop.h Mon Jun 19 23:53:48 2006
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
 
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
 
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/

Modified: trunk/src/pulsecore/x11wrap.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/x11wrap.c?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/x11wrap.c (original)
+++ trunk/src/pulsecore/x11wrap.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -22,11 +22,11 @@
 #include <assert.h>
 #include <stdio.h>
 
-#include <polyp/xmalloc.h>
-
-#include <polypcore/llist.h>
-#include <polypcore/log.h>
-#include <polypcore/props.h>
+#include <pulse/xmalloc.h>
+
+#include <pulsecore/llist.h>
+#include <pulsecore/log.h>
+#include <pulsecore/props.h>
 
 #include "x11wrap.h"
 

Modified: trunk/src/pulsecore/x11wrap.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/x11wrap.h?rev=1033&root=pulseaudio&r1=1031&r2=1033&view=diff
==============================================================================
--- trunk/src/pulsecore/x11wrap.h (original)
+++ trunk/src/pulsecore/x11wrap.h Mon Jun 19 23:53:48 2006
@@ -4,27 +4,27 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
 #include <X11/Xlib.h>
 
-#include <polypcore/core.h>
+#include <pulsecore/core.h>
 
 typedef struct pa_x11_wrapper pa_x11_wrapper;
 

Modified: trunk/src/tests/Makefile
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/tests/Makefile?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/tests/Makefile (original)
+++ trunk/src/tests/Makefile Mon Jun 19 23:53:48 2006
@@ -1,1 +1,1 @@
-link ../polyp/Makefile
+link ../pulse/Makefile

Modified: trunk/src/tests/channelmap-test.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/tests/channelmap-test.c?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/tests/channelmap-test.c (original)
+++ trunk/src/tests/channelmap-test.c Mon Jun 19 23:53:48 2006
@@ -3,8 +3,8 @@
 #include <stdio.h>
 #include <assert.h>
 
-#include <polyp/channelmap.h>
-#include <polypcore/gccmacro.h>
+#include <pulse/channelmap.h>
+#include <pulsecore/gccmacro.h>
 
 int main(PA_GCC_UNUSED int argc, PA_GCC_UNUSED char *argv[]) {
     char cm[PA_CHANNEL_MAP_SNPRINT_MAX];

Modified: trunk/src/tests/cpulimit-test.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/tests/cpulimit-test.c?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/tests/cpulimit-test.c (original)
+++ trunk/src/tests/cpulimit-test.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -29,11 +29,11 @@
 #include <stdio.h>
 #include <signal.h>
 
-#include <polyp/mainloop.h>
-#include <polypcore/gccmacro.h>
+#include <pulse/mainloop.h>
+#include <pulsecore/gccmacro.h>
 
 #ifdef TEST2
-#include <polyp/mainloop-signal.h>
+#include <pulse/mainloop-signal.h>
 #endif
 
 #include "../daemon/cpulimit.h"

Modified: trunk/src/tests/interpol-test.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/tests/interpol-test.c?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/tests/interpol-test.c (original)
+++ trunk/src/tests/interpol-test.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -34,8 +34,8 @@
 #include <math.h>
 #include <pthread.h>
 
-#include <polyp/polypaudio.h>
-#include <polyp/mainloop.h>
+#include <pulse/pulseaudio.h>
+#include <pulse/mainloop.h>
 
 static pa_context *context = NULL;
 static pa_stream *stream = NULL;

Modified: trunk/src/tests/mainloop-test.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/tests/mainloop-test.c?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/tests/mainloop-test.c (original)
+++ trunk/src/tests/mainloop-test.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -28,15 +28,15 @@
 #include <sys/time.h>
 #include <assert.h>
 
-#include <polyp/timeval.h>
+#include <pulse/timeval.h>
 
-#include <polypcore/core-util.h>
-#include <polypcore/gccmacro.h>
+#include <pulsecore/core-util.h>
+#include <pulsecore/gccmacro.h>
 
 #ifdef GLIB_MAIN_LOOP
 
 #include <glib.h>
-#include <polyp/glib-mainloop.h>
+#include <pulse/glib-mainloop.h>
 
 static GMainLoop* glib_main_loop = NULL;
 
@@ -48,7 +48,7 @@
 
 
 #else /* GLIB_MAIN_LOOP */
-#include <polyp/mainloop.h>
+#include <pulse/mainloop.h>
 #endif /* GLIB_MAIN_LOOP */
 
 static pa_defer_event *de;

Modified: trunk/src/tests/mcalign-test.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/tests/mcalign-test.c?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/tests/mcalign-test.c (original)
+++ trunk/src/tests/mcalign-test.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -31,9 +31,9 @@
 #include <stdlib.h>
 #include <time.h>
 
-#include <polypcore/core-util.h>
-#include <polypcore/mcalign.h>
-#include <polypcore/gccmacro.h>
+#include <pulsecore/core-util.h>
+#include <pulsecore/mcalign.h>
+#include <pulsecore/gccmacro.h>
 
 /* A simple program for testing pa_mcalign */
 

Modified: trunk/src/tests/memblockq-test.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/tests/memblockq-test.c?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/tests/memblockq-test.c (original)
+++ trunk/src/tests/memblockq-test.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -27,8 +27,8 @@
 #include <assert.h>
 #include <stdio.h>
 
-#include <polypcore/memblockq.h>
-#include <polypcore/log.h>
+#include <pulsecore/memblockq.h>
+#include <pulsecore/log.h>
 
 int main(int argc, char *argv[]) {
     int ret;

Modified: trunk/src/tests/pacat-simple.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/tests/pacat-simple.c?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/tests/pacat-simple.c (original)
+++ trunk/src/tests/pacat-simple.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -29,9 +29,9 @@
 #include <errno.h>
 #include <fcntl.h>
 
-#include <polyp/simple.h>
-#include <polyp/error.h>
-#include <polypcore/gccmacro.h>
+#include <pulse/simple.h>
+#include <pulse/error.h>
+#include <pulsecore/gccmacro.h>
 
 #define BUFSIZE 1024
 

Modified: trunk/src/tests/parec-simple.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/tests/parec-simple.c?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/tests/parec-simple.c (original)
+++ trunk/src/tests/parec-simple.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -28,9 +28,9 @@
 #include <string.h>
 #include <errno.h>
 
-#include <polyp/simple.h>
-#include <polyp/error.h>
-#include <polypcore/gccmacro.h>
+#include <pulse/simple.h>
+#include <pulse/error.h>
+#include <pulsecore/gccmacro.h>
 
 #define BUFSIZE 1024
 

Modified: trunk/src/tests/strlist-test.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/tests/strlist-test.c?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/tests/strlist-test.c (original)
+++ trunk/src/tests/strlist-test.c Mon Jun 19 23:53:48 2006
@@ -1,8 +1,8 @@
 #include <stdio.h>
 
-#include <polyp/xmalloc.h>
-#include <polypcore/strlist.h>
-#include <polypcore/gccmacro.h>
+#include <pulse/xmalloc.h>
+#include <pulsecore/strlist.h>
+#include <pulsecore/gccmacro.h>
 
 int main(PA_GCC_UNUSED int argc, PA_GCC_UNUSED char* argv[]) {
     char *t, *u;

Modified: trunk/src/tests/sync-playback.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/tests/sync-playback.c?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/tests/sync-playback.c (original)
+++ trunk/src/tests/sync-playback.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -33,8 +33,8 @@
 #include <getopt.h>
 #include <math.h>
 
-#include <polyp/polypaudio.h>
-#include <polyp/mainloop.h>
+#include <pulse/pulseaudio.h>
+#include <pulse/mainloop.h>
 
 #define NSTREAMS 4
 #define SINE_HZ 440

Modified: trunk/src/tests/thread-mainloop-test.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/tests/thread-mainloop-test.c?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/tests/thread-mainloop-test.c (original)
+++ trunk/src/tests/thread-mainloop-test.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -28,11 +28,11 @@
 #include <unistd.h>
 #include <stdio.h>
 
-#include <polyp/timeval.h>
-#include <polyp/util.h>
+#include <pulse/timeval.h>
+#include <pulse/util.h>
 
-#include <polypcore/gccmacro.h>
-#include <polyp/thread-mainloop.h>
+#include <pulsecore/gccmacro.h>
+#include <pulse/thread-mainloop.h>
 
 static void tcb(pa_mainloop_api*a, pa_time_event *e, const struct timeval *tv, void *userdata) {
     fprintf(stderr, "TIME EVENT START\n");

Modified: trunk/src/tests/utf8-test.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/tests/utf8-test.c?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/tests/utf8-test.c (original)
+++ trunk/src/tests/utf8-test.c Mon Jun 19 23:53:48 2006
@@ -3,8 +3,8 @@
 #include <stdio.h>
 #include <assert.h>
 
-#include <polyp/utf8.h>
-#include <polyp/xmalloc.h>
+#include <pulse/utf8.h>
+#include <pulse/xmalloc.h>
 
 int main(int argc, char *argv[]) {
     char *c;

Modified: trunk/src/tests/voltest.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/tests/voltest.c?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/tests/voltest.c (original)
+++ trunk/src/tests/voltest.c Mon Jun 19 23:53:48 2006
@@ -2,8 +2,8 @@
 
 #include <stdio.h>
 
-#include <polyp/volume.h>
-#include <polypcore/gccmacro.h>
+#include <pulse/volume.h>
+#include <pulsecore/gccmacro.h>
 
 int main(PA_GCC_UNUSED int argc, PA_GCC_UNUSED char *argv[]) {
     pa_volume_t v;

Modified: trunk/src/utils/Makefile
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/utils/Makefile?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/utils/Makefile (original)
+++ trunk/src/utils/Makefile Mon Jun 19 23:53:48 2006
@@ -1,1 +1,1 @@
-link ../polyp/Makefile
+link ../pulse/Makefile

Modified: trunk/src/utils/pabrowse.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/utils/pabrowse.c?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/utils/pabrowse.c (original)
+++ trunk/src/utils/pabrowse.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -27,8 +27,8 @@
 #include <assert.h>
 #include <signal.h>
 
-#include <polyp/polypaudio.h>
-#include <polyp/browser.h>
+#include <pulse/pulseaudio.h>
+#include <pulse/browser.h>
 
 static void exit_signal_callback(pa_mainloop_api*m, pa_signal_event *e, int sig, void *userdata) {
     fprintf(stderr, "Got signal, exiting\n");

Modified: trunk/src/utils/pacat.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/utils/pacat.c?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/utils/pacat.c (original)
+++ trunk/src/utils/pacat.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -33,7 +33,7 @@
 #include <getopt.h>
 #include <fcntl.h>
 
-#include <polyp/polypaudio.h>
+#include <pulse/pulseaudio.h>
 
 #define TIME_EVENT_USEC 50000
 
@@ -479,7 +479,7 @@
                 goto quit;
                 
             case ARG_VERSION:
-                printf("pacat "PACKAGE_VERSION"\nCompiled with libpolyp %s\nLinked with libpolyp %s\n", pa_get_headers_version(), pa_get_library_version());
+                printf("pacat "PACKAGE_VERSION"\nCompiled with libpulse %s\nLinked with libpulse %s\n", pa_get_headers_version(), pa_get_library_version());
                 ret = 0;
                 goto quit;
 

Modified: trunk/src/utils/pacmd.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/utils/pacmd.c?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/utils/pacmd.c (original)
+++ trunk/src/utils/pacmd.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -32,12 +32,12 @@
 #include <string.h>
 #include <sys/un.h>
 
-#include <polyp/error.h>
-#include <polyp/util.h>
+#include <pulse/error.h>
+#include <pulse/util.h>
 
-#include <polypcore/core-util.h>
-#include <polypcore/log.h>
-#include <polypcore/pid.h>
+#include <pulsecore/core-util.h>
+#include <pulsecore/log.h>
+#include <pulsecore/pid.h>
 
 int main(PA_GCC_UNUSED int argc, PA_GCC_UNUSED char*argv[]) {
     pid_t pid ;

Modified: trunk/src/utils/pactl.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/utils/pactl.c?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/utils/pactl.c (original)
+++ trunk/src/utils/pactl.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -35,7 +35,7 @@
 
 #include <sndfile.h>
 
-#include <polyp/polypaudio.h>
+#include <pulse/pulseaudio.h>
 
 #if PA_API_VERSION != 9
 #error Invalid Polypaudio API version
@@ -644,7 +644,7 @@
                 goto quit;
                 
             case ARG_VERSION:
-                printf("pactl "PACKAGE_VERSION"\nCompiled with libpolyp %s\nLinked with libpolyp %s\n", pa_get_headers_version(), pa_get_library_version());
+                printf("pactl "PACKAGE_VERSION"\nCompiled with libpulse %s\nLinked with libpulse %s\n", pa_get_headers_version(), pa_get_library_version());
                 ret = 0;
                 goto quit;
 

Modified: trunk/src/utils/padsp
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/utils/padsp?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/utils/padsp (original)
+++ trunk/src/utils/padsp Mon Jun 19 23:53:48 2006
@@ -2,20 +2,20 @@
 
 # $Id$
 #
-# This file is part of polypaudio.
+# This file is part of PulseAudio.
 #
-# polypaudio is free software; you can redistribute it and/or modify
+# PulseAudio is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 #
-# polypaudio is distributed in the hope that it will be useful, but
+# PulseAudio 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 Lesser General Public License
-# along with polypaudio; if not, write to the Free Software
+# along with PulseAudio; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 
@@ -75,9 +75,9 @@
 shift $(( $OPTIND - 1 ))
 
 if [ x"$LD_PRELOAD" = x ] ; then
-   LD_PRELOAD="libpolypdsp.so"
+   LD_PRELOAD="libpulsedsp.so"
 else
-   LD_PRELOAD="$LD_PRELOAD libpolypdsp.so"
+   LD_PRELOAD="$LD_PRELOAD libpulsedsp.so"
 fi
 
 export LD_PRELOAD

Modified: trunk/src/utils/padsp.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/utils/padsp.c?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/utils/padsp.c (original)
+++ trunk/src/utils/padsp.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -46,9 +46,9 @@
 
 #include <linux/sockios.h>
 
-#include <polyp/polypaudio.h>
-#include <polypcore/llist.h>
-#include <polypcore/gccmacro.h>
+#include <pulse/pulseaudio.h>
+#include <pulsecore/llist.h>
+#include <pulsecore/gccmacro.h>
 
 typedef enum {
     FD_INFO_MIXER,

Modified: trunk/src/utils/paplay.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/utils/paplay.c?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/utils/paplay.c (original)
+++ trunk/src/utils/paplay.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -35,7 +35,7 @@
 
 #include <sndfile.h>
 
-#include <polyp/polypaudio.h>
+#include <pulse/pulseaudio.h>
 
 #if PA_API_VERSION != 9
 #error Invalid Polypaudio API version
@@ -253,7 +253,7 @@
                 goto quit;
                 
             case ARG_VERSION:
-                printf("paplay "PACKAGE_VERSION"\nCompiled with libpolyp %s\nLinked with libpolyp %s\n", pa_get_headers_version(), pa_get_library_version());
+                printf("paplay "PACKAGE_VERSION"\nCompiled with libpulse %s\nLinked with libpulse %s\n", pa_get_headers_version(), pa_get_library_version());
                 ret = 0;
                 goto quit;
 

Modified: trunk/src/utils/pax11publish.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/utils/pax11publish.c?rev=1033&root=pulseaudio&r1=1032&r2=1033&view=diff
==============================================================================
--- trunk/src/utils/pax11publish.c (original)
+++ trunk/src/utils/pax11publish.c Mon Jun 19 23:53:48 2006
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -31,15 +31,15 @@
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 
-#include <polyp/util.h>
-
-#include <polypcore/core-util.h>
-#include <polypcore/log.h>
-#include <polypcore/authkey.h>
-#include <polypcore/native-common.h>
-#include <polypcore/x11prop.h>
-
-#include "../polyp/client-conf.h"
+#include <pulse/util.h>
+
+#include <pulsecore/core-util.h>
+#include <pulsecore/log.h>
+#include <pulsecore/authkey.h>
+#include <pulsecore/native-common.h>
+#include <pulsecore/x11prop.h>
+
+#include "../pulse/client-conf.h"
 
 int main(int argc, char *argv[]) {
     const char *dname = NULL, *sink = NULL, *source = NULL, *server = NULL, *cookie_file = PA_NATIVE_COOKIE_FILE;




More information about the pulseaudio-commits mailing list