summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPierre Ossman <ossman@cendio.se>2006-06-20 13:02:34 +0000
committerPierre Ossman <ossman@cendio.se>2006-06-20 13:02:34 +0000
commit3ff68bd7a57186c6c6def975be3fc7e826c8bbcd (patch)
treefea3f94f30e07f2993ca8393cf4c153aee59cdcb /src
parent230f97a4a4dc22510a19add8b2df0533a359846c (diff)
Fix the final few occurences of polyp.
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1042 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src')
-rwxr-xr-xsrc/daemon/default.pa.in2
-rwxr-xr-xsrc/daemon/esdcompat.in2
-rw-r--r--src/modules/rtp/module-rtp-send.c2
-rw-r--r--src/pulse/client.conf.in2
-rw-r--r--src/utils/padsp4
5 files changed, 6 insertions, 6 deletions
diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in
index 623cd114..6beeb90f 100755
--- a/src/daemon/default.pa.in
+++ b/src/daemon/default.pa.in
@@ -1,4 +1,4 @@
-#!@POLYPAUDIO_BINARY@ -nF
+#!@PULSEAUDIO_BINARY@ -nF
#
# This file is part of PulseAudio.
diff --git a/src/daemon/esdcompat.in b/src/daemon/esdcompat.in
index 673f8c8a..edae8615 100755
--- a/src/daemon/esdcompat.in
+++ b/src/daemon/esdcompat.in
@@ -95,4 +95,4 @@ EOF
shift
done
-eval "exec '@POLYPAUDIO_BINARY@'$ARGS"
+eval "exec '@PULSEAUDIO_BINARY@'$ARGS"
diff --git a/src/modules/rtp/module-rtp-send.c b/src/modules/rtp/module-rtp-send.c
index 00da64d5..5c47047f 100644
--- a/src/modules/rtp/module-rtp-send.c
+++ b/src/modules/rtp/module-rtp-send.c
@@ -298,7 +298,7 @@ int pa__init(pa_core *c, pa_module*m) {
r = getsockname(fd, (struct sockaddr*) &sa_dst, &k);
assert(r >= 0);
- n = pa_sprintf_malloc("Polypaudio RTP Stream on %s", pa_get_fqdn(hn, sizeof(hn)));
+ n = pa_sprintf_malloc("PulseAudio RTP Stream on %s", pa_get_fqdn(hn, sizeof(hn)));
p = pa_sdp_build(af,
af == AF_INET ? (void*) &((struct sockaddr_in*) &sa_dst)->sin_addr : (void*) &((struct sockaddr_in6*) &sa_dst)->sin6_addr,
diff --git a/src/pulse/client.conf.in b/src/pulse/client.conf.in
index d881c44e..21786ebf 100644
--- a/src/pulse/client.conf.in
+++ b/src/pulse/client.conf.in
@@ -21,7 +21,7 @@
## commented out. Use either ; or # for commenting
## Path to the pulseaudio daemon to run when autospawning.
-; daemon-binary = @POLYPAUDIO_BINARY@
+; daemon-binary = @PULSEAUDIO_BINARY@
## Extra arguments to pass to the pulseaudio daemon
; extra-arguments = --log-target=syslog --exit-idle-time=5
diff --git a/src/utils/padsp b/src/utils/padsp
index d9ebcbc5..bae5a728 100644
--- a/src/utils/padsp
+++ b/src/utils/padsp
@@ -22,8 +22,8 @@
while getopts 'hs:n:m:MSDd' param ; do
case $param in
s)
- POLYP_SERVER="$OPTARG"
- export POLYP_SERVER
+ PULSE_SERVER="$OPTARG"
+ export PULSE_SERVER
;;
n)
PADSP_CLIENT_NAME="$OPTARG"