From f44ba092651aa75055e109e04b4164ea92ae7fdc Mon Sep 17 00:00:00 2001
From: Lennart Poettering
I often hear noises when playing back with Polypaudio, what can I do?
-There are to possible solutions: run polypaudio with argument +
There are to possible solutions: run pulseaudio with argument --high-priority=1 and make yourself member of the group realtime, or increase the fragment sizes of the audio drivers. The former will allow Polypaudio to activate SCHED_FIFO high priority scheduling (root rights are dropped immediately after this). Keep in mind that this is a potential security hole!
The polypaudio executable is installed SUID root by default. Why this? Isn't this a potential security hole?
+The pulseaudio executable is installed SUID root by default. Why this? Isn't this a potential security hole?
Polypaudio activates SCHED_FIFO scheduling if the user passes --high-priority=1. 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 CAP_SYS_NICE (At least on systems that support it, like Linux; see man 7 capabilities for more information). If the calling user is not a member of the group realtime (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 realtime) 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.
I want to run polypaudio only when it is needed, how do I do this?
+I want to run pulseaudio only when it is needed, how do I do this?
Set autospawn = yes in client.conf. That -configuration file may be found either in /etc/polypaudio/ or -in ~/.polypaudio/.
How do I list all polypaudio modules installed?
+How do I list all pulseaudio modules installed?
-polypaudio --dump-modules
+pulseaudio --dump-modules
Add -v for terse usage instructions.
-How do I use polypaudio over the network?
+How do I use pulseaudio over the network?
-Just set $POLYP_SERVER to the host name of the polypaudio +
Just set $POLYP_SERVER to the host name of the pulseaudio server. For authentication you need the same auth cookies on all sides. For -that copy ~./polypaudio-cookie to all clients that shall +that copy ~./pulseaudio-cookie to all clients that shall be allowed to connect.
Alternatively the authorization cookies can be stored in the X11 server.
Is polypaudio capable of providing synchronized audio playback over the network for movie players like mplayer?
+Is pulseaudio capable of providing synchronized audio playback over the network for movie players like mplayer?
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.
-What environment variables does polypaudio care about?
+What environment variables does pulseaudio care about?
The client honors: POLYP_SINK (default sink to connect to), POLYP_SOURCE (default source to connect to), POLYP_SERVER (default server to connect to, like ESPEAKER), POLYP_BINARY (the binary to start when autospawning a daemon), POLYP_CLIENTCONFIG (path to the client configuration file).
@@ -126,31 +126,31 @@ be allowed to connect.A brilliant guy named Lennart Poettering once wrote a nifty tool for that purpose: bidilink. To -connect to a running polypaudio daemon try using the following commands:
+connect to a running pulseaudio daemon try using the following commands: -killall -USR2 polypaudio -bidilink unix-client:/tmp/polypaudio/cli+
killall -USR2 pulseaudio +bidilink unix-client:/tmp/pulseaudio/cli
BTW: Someone should package this great tool for Debian!
New: There's now a tool pacmd that automates sending SIGUSR2 to the daemon and running a bidilink like tool for you.
How do the polypaudio libraries decide where to connect to?
+How do the pulseaudio libraries decide where to connect to?
The following rule applies:
Why the heck does libpolyp link against libX11?
+Why the heck does libpulse link against libX11?
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.
Copyright 2004-2006 Lennart Poettering <@PACKAGE_BUGREPORT@> and Pierre Ossman
@@ -44,7 +44,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.Version 0.9.1 +href="@PACKAGE_URL@pulseaudio-0.9.1.tar.gz">Version 0.9.1 released; changes include: load modules even when libtool .la files are missing; generate better ALSA device names from module-detect; if an ALSA device doesn't support the @@ -53,7 +53,7 @@ suggests instead; amd64 portability; drop .sh suffix of esdcompat.sh; build system fixes; No API or ABI changes were made
Version 0.9.0 +href="@PACKAGE_URL@pulseaudio-0.9.0.tar.gz">Version 0.9.0 released; changes include: new module module-volume-restore; new OSS API emulation tool padsp; require valid UTF8 strings everywhere; properly support ALSA channel maps for surround sound; @@ -62,7 +62,7 @@ main loop API for synchronous programs; introduce real shared object versioning; a few API additions; many, many bugfixes
Version 0.8.1 +href="@PACKAGE_URL@pulseaudio-0.8.1.tar.gz">Version 0.8.1 released; changes include: support for specifying the channel map on the command lines of paplay and pacat and as arguments to the driver modules; ALSA hardware mixer compatibility; @@ -70,16 +70,16 @@ fix linking; properly remove PF_UNIX sockets when unloading protocol modules; fix sample cache; many other fixes
Version 0.8 released; -changes include: too many to count - consider reading this blog entry for more information; many, many minor fixes.
+href="@PACKAGE_URL@pulseaudio-0.8.tar.gz">Version 0.8 released; +changes include: too many to count - consider reading this blog entry for more information; many, many minor fixes.Version 0.7 released; +href="@PACKAGE_URL@pulseaudio-0.7.tar.gz">Version 0.7 released; changes include: IPv6 support; PID file support; publish credentials in X11 root window (module-x11-publish; new tool pacmd; ESOUND backend; new command load-sample-dir-lazy; many, many minor fixes.
Version 0.6 released; +href="@PACKAGE_URL@pulseaudio-0.6.tar.gz">Version 0.6 released; changes include: TCP wrappers support; don't load the complete sound file into memory when playing back using pa_play_file(); autoload API change; don't load all sound files as FLOAT32; shorten @@ -91,14 +91,14 @@ generation; correctly lock daemon autospawning; print daemon layout to STDERR on SIGHUP; new options for pacat: allow sample type specification.
Version 0.5.1 released; +href="@PACKAGE_URL@pulseaudio-0.5.1.tar.gz">Version 0.5.1 released; changes include: improve esound protocol compatibility; fix autospawning via libesd; make use of POSIX capabilities; allow SCHED_FIFO scheduling only for users in group realtime; minor build system fix.
Version 0.5 released; +href="@PACKAGE_URL@pulseaudio-0.5.tar.gz">Version 0.5 released; changes include: extensive API improvements, new module module-combine for combining multiple sound cards into one, gcc 2.95 compatibility, configuration files, add "lazy" samples, @@ -106,29 +106,29 @@ support for source and network latency measurements, add module-pipe-source, many other fixes and improvements.
Version 0.4 released; +href="@PACKAGE_URL@pulseaudio-0.4.tar.gz">Version 0.4 released; changes include: daemon auto spawning, support for SCHED_FIFO scheduling, three new modules, proper logging, CPU load watchdog, many fixes.
Version 0.3 released; +href="@PACKAGE_URL@pulseaudio-0.3.tar.gz">Version 0.3 released; changes include: support for both glib 2.0 and glib 1.2, future cancellation, API updates, many fixes, relicense client library to LGPL.
Version 0.2 released; +href="@PACKAGE_URL@pulseaudio-0.2.tar.gz">Version 0.2 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.
Version 0.1 released
+href="@PACKAGE_URL@pulseaudio-0.1.tar.gz">Version 0.1 releasedpolypaudio is a networked sound server for Linux and other +
pulseaudio 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 Enlightened Sound Daemon (ESOUND). In addition to the features ESOUND provides -polypaudio has:
+pulseaudio has:The following modules are currently available:
@@ -169,9 +169,9 @@ Sound Architecture (ALSA) sinks and sourcesA GTK GUI manager application for polypaudio is the A GTK GUI manager application for pulseaudio is the Polypaudio Manager. Other GTK GUI tool for Polypaudio are the Polypaudio Volume @@ -195,10 +195,10 @@ href="http://0pointer.de/lennart/projects/pavucontrol">Polypaudio Volume Control .
There are output plugins for XMMS, libao +href="http://0pointer.de/lennart/projects/xmms-pulse/">XMMS, libao (merged in libao SVN) and gstreamer +href="http://0pointer.de/lennart/projects/gst-pulse/">gstreamer (merged in gstreamer-plugins CVS), MPlayer (merged in MPlayer CVS) and Xine (merged in Xine CVS). Drivers for @@ -216,68 +216,68 @@ href="modules.html">modules.html, cli.html, daemon.html and FAQ.html.
-There is a Trac based Wiki for Polypaudio available.
+There is a Trac based Wiki for Polypaudio available.
Simply start the polypaudio daemon with the argument -nC
+Simply start the pulseaudio daemon with the argument -nC
-polypaudio -nC+
pulseaudio -nC
This will present you a screen like this:
-Welcome to polypaudio! Use "help" for usage information. +Welcome to pulseaudio! Use "help" for usage information. >>>Now you can issue CLI commands as described in cli.html. Another way to start -polypaudio is by specifying a configuration script like that one included in the distribution on the +pulseaudio is by specifying a configuration script like that one included in the distribution on the command line :
-polypaudio -nF polypaudio.pa+pulseaudio -nF pulseaudio.paThis will load some drivers and protocols automatically.
-The best idea is to configure your daemon in /etc/polypaudio/daemon.conf and /etc/polypaudio/default.pa and to run polypaudio without any arguments.
+The best idea is to configure your daemon in /etc/pulseaudio/daemon.conf and /etc/pulseaudio/default.pa and to run pulseaudio without any arguments.
Beware! Unless you pass the option --sysconfdir=/etc to -configure, the directory /etc/polypaudio/ is really -/usr/local/etc/polypaudio/.
+configure, the directory /etc/pulseaudio/ is really +/usr/local/etc/pulseaudio/. -Developing polypaudio Clients
+Developing pulseaudio Clients
You may browse the Doxygen generated programing +href="http://0pointer.de/lennart/projects/pulseaudio/doxygen/">programing documentation for the client API. (Run make doxygen to generate this documentation from the source tree)
-Developing polypaudio Modules
+Developing pulseaudio Modules
-There are several reasons for writing loadable modules for polypaudio:
+There are several reasons for writing loadable modules for pulseaudio:
There is currently no documentation how to write loadable modules -for polypaudio. Read the source, Luke! If you are interested in +for pulseaudio. Read the source, Luke! If you are interested in writing new modules feel free to contact the author in case you have any questions.
Currently, polypaudio is tested on Linux, FreeBSD, Solaris and Microsoft Windows. It requires an OSS, ALSA, Win32 or Solaris compatible soundcard.
+Currently, pulseaudio is tested on Linux, FreeBSD, Solaris and Microsoft Windows. It requires an OSS, ALSA, Win32 or Solaris compatible soundcard.
-polypaudio was developed and tested on Debian GNU/Linux +
pulseaudio 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.
-polypaudio needs pulseaudio needs Secret Rabbit Code (aka libsamplerate), libsndfile, ./configure inside the distribution directory for configuring the source tree. After that you should run make for compilation and make install (as root) for installation of -polypaudio.
+pulseaudio.The newest release is always available from @PACKAGE_URL@
-The current release is @PACKAGE_VERSION@
+The current release is @PACKAGE_VERSION@
-Get polypaudio's development sources from the Subversion repository (viewcvs):
+Get pulseaudio's development sources from the Subversion repository (viewcvs):
-svn checkout svn://0pointer.de/polypaudio/trunk polypaudio+
svn checkout svn://0pointer.de/pulseaudio/trunk pulseaudio
If you want to be notified whenever I release a new version of this software use the subscription feature of Freshmeat.
+If you want to be notified whenever I release a new version of this software use the subscription feature of Freshmeat.
-There is a general discussion mailing list for polypaudio available. In addition, you can subscribe to SVN changes and Trac Tickets.
+There is a general discussion mailing list for pulseaudio available. In addition, you can subscribe to SVN changes and Trac Tickets.
-Polypaudio is being tracked at CIA.
+Polypaudio is being tracked at CIA.
-There's a chance to meet the Polypaudio developers on our IRC channel #polypaudio on irc.freenode.org.
+There's a chance to meet the Polypaudio developers on our IRC channel #pulseaudio on irc.freenode.org.
-There is a Trac based Wiki for Polypaudio available.
+There is a Trac based Wiki for Polypaudio available.
-Please report bugs to our Trac ticket system.
+Please report bugs to our Trac ticket system.
polypaudio provides a simple command line language used by +
pulseaudio provides a simple command line language used by configuration scripts as well as the modules module-cli and module-cli-protocol-{unix,tcp}. Empty lines and lines beginning with a hashmark (#) are silently ignored. Several @@ -181,7 +181,7 @@ on the interactive command line.
Mark the following script as executable (chmod +x) and run it for a sensible polypaudio configuration.
+Mark the following script as executable (chmod +x) and run it for a sensible pulseaudio configuration.
#!/usr/bin/polaudio -nF diff --git a/doc/daemon.html.in b/doc/daemon.html.in index a4db0bd..0d91e53 100644 --- a/doc/daemon.html.in +++ b/doc/daemon.html.in @@ -2,7 +2,7 @@ -polypaudio: Daemon +pulseaudio: Daemon @@ -11,7 +11,7 @@Command Line Arguments
-The polypaudio daemon accepts several command line arguments: +The pulseaudio daemon accepts several command line arguments:COMMANDS: @@ -58,9 +58,9 @@ STARTUP SCRIPT:It is a good idea to run the daemon like this:
-polypaudio -D+pulseaudio -D-This will run /etc/polypaudio/default.pa after startup. This should be a script written in the CLI language described in cli.html.
+This will run /etc/pulseaudio/default.pa after startup. This should be a script written in the CLI language described in cli.html.
Signals
diff --git a/doc/modules.html.in b/doc/modules.html.in index 8547952..f004f08 100644 --- a/doc/modules.html.in +++ b/doc/modules.html.in @@ -2,7 +2,7 @@ -polypaudio: Loadable Modules +pulseaudio: Loadable Modules @@ -10,7 +10,7 @@Loadable Modules
-The following loadable modules are provided with the polypaudio distribution:
+The following loadable modules are provided with the pulseaudio distribution:
Device Drivers
@@ -157,7 +157,7 @@ will decrease output quality however. (defaults tomodule-tunnel-{sink,source}
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 module-native-protocol-tcp loaded. It's probably a better idea to connect to the remote sink/source directly since some buffer control is lost through this tunneling.
@@ -204,7 +204,7 @@ module see cli.html.module-cli-protocol-{unix,tcp}
An implemenation of a simple command line based protocol for -controlling the polypaudio daemon. If loaded, the user may +controlling the pulseaudio daemon. If loaded, the user may connect with tools like netcat, telnet or bidilink to the listening sockets and execute commands the same way as with module-cli.
@@ -225,7 +225,7 @@ transparent TCP/IP socket. (Both IPv6 and IPv4 - if available) a numerical binary value. If 1 the socket is bound to the loopback device, i.e. not publicly accessible. (defaults to 1)- listen= (only for -tcp) The IP address to listen on. If specified, supersedes the value specified in loopback= + socket= (only for -unix) The UNIX socket name (defaults to /tmp/polypaudio/cli) socket= (only for -unix) The UNIX socket name (defaults to /tmp/pulseaudio/cli) module-simple-protocol-{unix,tcp}
@@ -254,7 +254,7 @@ about the two possible suffixes of this module.An implemenation of a protocol compatible with the Enlightened Sound Daemon (ESOUND, esd). When you load this module you may -access the polypaudio daemon with tools like esdcat, +access the pulseaudio daemon with tools like esdcat, esdrec or even esdctl. Many applications, such as XMMS, include support for this protocol.
@@ -273,7 +273,7 @@ about the two possible suffixes of this module.module-native-protocol-{unix,tcp}
-The native protocol of polypaudio.
+The native protocol of pulseaudio.
See module-cli-protocol-{unix,tcp} for more information about the two possible suffixes of this module.
@@ -293,7 +293,7 @@ about the two possible suffixes of this module.module-http-protocol-tcp
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 http://localhost:4714/. This module takes the same arguments as module-cli-protocol-tcp.
@@ -347,7 +347,7 @@ already loaded protocol module is used.
config= | The LIRC configuration file |
appname= | The application name to pass to LIRC (defaults to polypaudio) |
appname= | The application name to pass to LIRC (defaults to pulseaudio) |
sink= | The sink to control |
sink_name= | The name for the Polypaudio sink. If ommited defaults to jack_out. |
server_name= | The JACK server to connect to. If ommited defaults to the default server. |
client_name= | The client name to tell the JACK server. If ommited defaults to polypaudio. |
client_name= | The client name to tell the JACK server. If ommited defaults to pulseaudio. |
channels= | Number of channels to register. If ommited defaults to the number of physical playback ports of the JACK server. |
connect= | Takes a boolean value. If enabled (the default) Polypaudio will try to connect its ports to the physicial playback ports of the JACK server |
This is a compatibility module for libesd based autospawning of polypaudio. Don't use it directly.
+This is a compatibility module for libesd based autospawning of pulseaudio. Don't use it directly.
This is a compatibility module for libesd based autospawning of polypaudio. Don't use it directly.
+This is a compatibility module for libesd based autospawning of pulseaudio. Don't use it directly.
Adjust the volume of a playback stream automatically based on its name.
table= | The regular expression matching table file to use (defaults to ~/.polypaudio/match.table) |
table= | The regular expression matching table file to use (defaults to ~/.pulseaudio/match.table) |
The table file should contain a regexp and volume on each line, seperated by spaces. An example:
@@ -482,7 +482,7 @@ which is replaced by source_name (with a default of jack_in) fAdjust the volume of a playback stream automatically based on its name.
table= | The table file to use (defaults to ~/.polypaudio/volume.table) |
table= | The table file to use (defaults to ~/.pulseaudio/volume.table) |
In contrast to module-match this module needs no explicit
diff --git a/doc/style.css b/doc/style.css
index a606c08..c5af005 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -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.
***/
diff --git a/doxygen/Makefile.am b/doxygen/Makefile.am
index 8feec73..c4f66d8 100644
--- a/doxygen/Makefile.am
+++ b/doxygen/Makefile.am
@@ -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.
diff --git a/doxygen/doxygen.conf.in b/doxygen/doxygen.conf.in
index f466c9d..8ccf667 100644
--- a/doxygen/doxygen.conf.in
+++ b/doxygen/doxygen.conf.in
@@ -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 @@ WARN_LOGFILE =
# 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
diff --git a/polyplib-browse.pc.in b/libpulse-browse.pc.in
similarity index 57%
rename from polyplib-browse.pc.in
rename to libpulse-browse.pc.in
index 952e28c..7bdedf2 100644
--- a/polyplib-browse.pc.in
+++ b/libpulse-browse.pc.in
@@ -3,9 +3,9 @@ exec_prefix=${prefix}
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
diff --git a/polyplib-glib-mainloop.pc.in b/libpulse-glib-mainloop.pc.in
similarity index 50%
rename from polyplib-glib-mainloop.pc.in
rename to libpulse-glib-mainloop.pc.in
index 03338c5..169910b 100644
--- a/polyplib-glib-mainloop.pc.in
+++ b/libpulse-glib-mainloop.pc.in
@@ -3,9 +3,9 @@ exec_prefix=${prefix}
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
diff --git a/polyplib-glib12-mainloop.pc.in b/libpulse-glib12-mainloop.pc.in
similarity index 50%
rename from polyplib-glib12-mainloop.pc.in
rename to libpulse-glib12-mainloop.pc.in
index c12a838..f525c37 100644
--- a/polyplib-glib12-mainloop.pc.in
+++ b/libpulse-glib12-mainloop.pc.in
@@ -3,9 +3,9 @@ exec_prefix=${prefix}
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
diff --git a/polyplib-simple.pc.in b/libpulse-simple.pc.in
similarity index 53%
rename from polyplib-simple.pc.in
rename to libpulse-simple.pc.in
index fa0ca0b..c35e83f 100644
--- a/polyplib-simple.pc.in
+++ b/libpulse-simple.pc.in
@@ -3,9 +3,9 @@ exec_prefix=${prefix}
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
diff --git a/polyplib.pc.in b/libpulse.pc.in
similarity index 66%
rename from polyplib.pc.in
rename to libpulse.pc.in
index 2d073a9..8d0ffb8 100644
--- a/polyplib.pc.in
+++ b/libpulse.pc.in
@@ -3,9 +3,9 @@ exec_prefix=${prefix}
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:
diff --git a/src/Makefile.am b/src/Makefile.am
index 6a2decb..746f85e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -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 @@ endif
###################################
EXTRA_DIST = \
- polyp/client.conf.in \
+ pulse/client.conf.in \
daemon/daemon.conf.in \
daemon/default.pa.in \
depmod.py \
@@ -81,35 +81,35 @@ EXTRA_DIST = \
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
+bin_PROGRAMS = pulseaudio
-polypaudio_SOURCES = \
+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
+ pulsecore/gccmacro.h
-polypaudio_CFLAGS = $(AM_CFLAGS) $(LIBOIL_CFLAGS)
-polypaudio_CPPFLAGS = $(AM_CPPFLAGS)
-polypaudio_LDADD = $(AM_LDADD) libpolypcore.la $(LIBLTDL) \
+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 @@ PREOPEN_LIBS = $(modlibexec_LTLIBRARIES)
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 @@ endif
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 @@ endif
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 @@ interpol_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
# 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
+libpulse_la_SOURCES += \
+ pulse/client-conf-x11.c pulse/client-conf-x11.h \
+ pulsecore/x11prop.c pulsecore/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_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)
+libpulse_la_CFLAGS += $(LIBASYNCNS_CFLAGS)
+libpulse_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)
+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)
-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)
+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)
-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)
+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)
-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_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 @@ libpolyp_mainloop_glib12_la_LDFLAGS = -version-info $(LIBPOLYP_MAINLOOP_GLIB_VER
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
+libpulsecore_la_SOURCES += \
+ pulsecore/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_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 @@ modlibexec_LTLIBRARIES += \
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_server_la_LIBADD = $(AM_LIBADD) libpulsecore.la libiochannel.la libsocket-util.la $(LIBWRAP_LIBS) $(WINSOCK_LIBS)
-libsocket_client_la_SOURCES = polypcore/socket-client.c polypcore/socket-client.h
+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
+libparseaddr_la_LIBADD = $(AM_LIBADD) libpulsecore.la
-libpstream_la_SOURCES = polypcore/pstream.c polypcore/pstream.h
+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_la_LIBADD = $(AM_LIBADD) libpulsecore.la libpacket.la libiochannel.la $(WINSOCK_LIBS)
-libpstream_util_la_SOURCES = polypcore/pstream-util.c polypcore/pstream-util.h
+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
+libpdispatch_la_LIBADD = $(AM_LIBADD) libtagstruct.la libpulsecore.la
-libiochannel_la_SOURCES = polypcore/iochannel.c polypcore/iochannel.h
+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)
+libiochannel_la_LIBADD = $(AM_LIBADD) libsocket-util.la libpulsecore.la $(WINSOCK_LIBS)
-libpacket_la_SOURCES = polypcore/packet.c polypcore/packet.h
+libpacket_la_SOURCES = pulsecore/packet.c pulsecore/packet.h
libpacket_la_LDFLAGS = -avoid-version
-libpacket_la_LIBADD = $(AM_LIBADD) libpolypcore.la
+libpacket_la_LIBADD = $(AM_LIBADD) libpulsecore.la
-libioline_la_SOURCES = polypcore/ioline.c polypcore/ioline.h
+libioline_la_SOURCES = pulsecore/ioline.c pulsecore/ioline.h
libioline_la_LDFLAGS = -avoid-version
-libioline_la_LIBADD = $(AM_LIBADD) libiochannel.la libpolypcore.la
+libioline_la_LIBADD = $(AM_LIBADD) libiochannel.la libpulsecore.la
-libcli_la_SOURCES = polypcore/cli.c polypcore/cli.h
+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
+libcli_la_LIBADD = $(AM_LIBADD) libiochannel.la libioline.la libpulsecore.la
-libstrlist_la_SOURCES = polypcore/strlist.c polypcore/strlist.h
+libstrlist_la_SOURCES = pulsecore/strlist.c pulsecore/strlist.h
libstrlist_la_LDFLAGS = -avoid-version
-libstrlist_la_LIBADD = $(AM_LIBADD) libpolypcore.la
+libstrlist_la_LIBADD = $(AM_LIBADD) libpulsecore.la
-libprotocol_cli_la_SOURCES = polypcore/protocol-cli.c polypcore/protocol-cli.h
+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_cli_la_LIBADD = $(AM_LIBADD) libsocket-server.la libiochannel.la libcli.la libpulsecore.la
-libprotocol_http_la_SOURCES = polypcore/protocol-http.c polypcore/protocol-http.h
+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_http_la_LIBADD = $(AM_LIBADD) libsocket-server.la libioline.la libpulsecore.la libiochannel.la
-libprotocol_native_la_SOURCES = polypcore/protocol-native.c polypcore/protocol-native.h polypcore/native-common.h
+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
+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 = polypcore/tagstruct.c polypcore/tagstruct.h
+libtagstruct_la_SOURCES = pulsecore/tagstruct.c pulsecore/tagstruct.h
libtagstruct_la_LDFLAGS = -avoid-version
-libtagstruct_la_LIBADD = $(AM_LIBADD) libpolypcore.la $(WINSOCK_LIBS)
+libtagstruct_la_LIBADD = $(AM_LIBADD) libpulsecore.la $(WINSOCK_LIBS)
-libprotocol_esound_la_SOURCES = polypcore/protocol-esound.c polypcore/protocol-esound.h polypcore/esound.h
+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
+libprotocol_esound_la_LIBADD = $(AM_LIBADD) libsocket-server.la libiochannel.la libauthkey.la libpulsecore.la
-libauthkey_la_SOURCES = polypcore/authkey.c polypcore/authkey.h
+libauthkey_la_SOURCES = pulsecore/authkey.c pulsecore/authkey.h
libauthkey_la_LDFLAGS = -avoid-version
-libauthkey_la_LIBADD = $(AM_LIBADD) libpolypcore.la
+libauthkey_la_LIBADD = $(AM_LIBADD) libpulsecore.la
-libauthkey_prop_la_SOURCES = polypcore/authkey-prop.c polypcore/authkey-prop.h
+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
+libx11wrap_la_LIBADD = $(AM_LIBADD) $(X_PRE_LIBS) -lX11 $(X_LIBS) $(X_EXTRA_LIBS) libpulsecore.la
-libx11prop_la_SOURCES = polypcore/x11prop.c polypcore/x11prop.h
+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 @@ $(SYMDEF_FILES): modules/module-defs.h.m4
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 @@ module_x11_publish_la_LIBADD = $(AM_LIBADD) $(X_PRE_LIBS) -lX11 $(X_LIBS) $(X_EX
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_la_LIBADD = $(AM_LIBADD) libiochannel.la liboss-util.la
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 @@ module_solaris_la_LIBADD = $(AM_LIBADD) libiochannel.la
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 @@ esdcompat: daemon/esdcompat.in Makefile
-e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
-e 's,@POLYPAUDIO_BINARY\@,$(POLYPAUDIO_BINARY),g' < $< > $@
-client.conf: polyp/client.conf.in Makefile
+client.conf: pulse/client.conf.in Makefile
sed -e 's,@POLYPAUDIO_BINARY\@,$(POLYPAUDIO_BINARY),g' < $< > $@
if OS_IS_WIN32
@@ -1195,11 +1195,11 @@ daemon.conf: daemon/daemon.conf.in Makefile
-e 's,@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
diff --git a/src/daemon/Makefile b/src/daemon/Makefile
index cd2a5c9..c110232 120000
--- a/src/daemon/Makefile
+++ b/src/daemon/Makefile
@@ -1 +1 @@
-../polyp/Makefile
\ No newline at end of file
+../pulse/Makefile
\ No newline at end of file
diff --git a/src/daemon/caps.c b/src/daemon/caps.c
index 5e24da8..dc74bc7 100644
--- a/src/daemon/caps.c
+++ b/src/daemon/caps.c
@@ -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