From 10b5e997d7a8a4e955ce49cc816fdcd36225ff6e Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 19 Jun 2006 22:11:49 +0000 Subject: replace a few remaining uppercase "Polypaudio" occurences with "PulseAudio" git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1036 fefdeb5f-60dc-0310-8127-8f9354f1896f --- src/utils/pacat.c | 2 +- src/utils/pacmd.c | 4 ++-- src/utils/pactl.c | 2 +- src/utils/padsp | 4 ++-- src/utils/padsp.c | 12 ++++++------ src/utils/paplay.c | 2 +- src/utils/pax11publish.c | 8 ++++---- 7 files changed, 17 insertions(+), 17 deletions(-) (limited to 'src/utils') diff --git a/src/utils/pacat.c b/src/utils/pacat.c index 5e4596d1..10edd71d 100644 --- a/src/utils/pacat.c +++ b/src/utils/pacat.c @@ -38,7 +38,7 @@ #define TIME_EVENT_USEC 50000 #if PA_API_VERSION != 9 -#error Invalid Polypaudio API version +#error Invalid PulseAudio API version #endif static enum { RECORD, PLAYBACK } mode = PLAYBACK; diff --git a/src/utils/pacmd.c b/src/utils/pacmd.c index e4a0970d..fe8038e0 100644 --- a/src/utils/pacmd.c +++ b/src/utils/pacmd.c @@ -49,7 +49,7 @@ int main(PA_GCC_UNUSED int argc, PA_GCC_UNUSED char*argv[]) { fd_set ifds, ofds; if (pa_pid_file_check_running(&pid) < 0) { - pa_log(__FILE__": no Polypaudio daemon running"); + pa_log(__FILE__": no PulseAudio daemon running"); goto fail; } @@ -74,7 +74,7 @@ int main(PA_GCC_UNUSED int argc, PA_GCC_UNUSED char*argv[]) { break; if (pa_pid_file_kill(SIGUSR2, NULL) < 0) { - pa_log(__FILE__": failed to kill Polypaudio daemon."); + pa_log(__FILE__": failed to kill PulseAudio daemon."); goto fail; } diff --git a/src/utils/pactl.c b/src/utils/pactl.c index 6e40f3fe..94d22f98 100644 --- a/src/utils/pactl.c +++ b/src/utils/pactl.c @@ -38,7 +38,7 @@ #include #if PA_API_VERSION != 9 -#error Invalid Polypaudio API version +#error Invalid PulseAudio API version #endif #define BUFSIZE 1024 diff --git a/src/utils/padsp b/src/utils/padsp index 6e7e9f06..d9ebcbc5 100644 --- a/src/utils/padsp +++ b/src/utils/padsp @@ -54,13 +54,13 @@ while getopts 'hs:n:m:MSDd' param ; do export PADSP_DEBUG ;; *) - echo "$0 - redirect OSS audio devices to Polypaudio" + echo "$0 - redirect OSS audio devices to PulseAudio" echo " " echo "$0 [options] application [arguments]" echo " " echo "options:" echo " -h show brief help" - echo " -s [:] contact a specific Polypaudio server" + echo " -s [:] contact a specific PulseAudio server" echo " -n client name to report to the server" echo " -m stream name to report to the server" echo " -M disable /dev/mixer emulation" diff --git a/src/utils/padsp.c b/src/utils/padsp.c index 13f571e1..d9dcc764 100644 --- a/src/utils/padsp.c +++ b/src/utils/padsp.c @@ -1262,18 +1262,18 @@ fail: static int sndstat_open(int flags, int *_errno) { static const char sndstat[] = - "Sound Driver:3.8.1a-980706 (Polypaudio Virtual OSS)\n" + "Sound Driver:3.8.1a-980706 (PulseAudio Virtual OSS)\n" "Kernel: POSIX\n" "Config options: 0\n" "\n" "Installed drivers:\n" - "Type 255: Polypaudio Virtual OSS\n" + "Type 255: PulseAudio Virtual OSS\n" "\n" "Card config:\n" - "Polypaudio Virtual OSS\n" + "PulseAudio Virtual OSS\n" "\n" "Audio devices:\n" - "0: Polypaudio Virtual OSS\n" + "0: PulseAudio Virtual OSS\n" "\n" "Synth devices: NOT ENABLED IN CONFIG\n" "\n" @@ -1282,7 +1282,7 @@ static int sndstat_open(int flags, int *_errno) { "Timers:\n" "\n" "Mixers:\n" - "0: Polypaudio Virtual OSS\n"; + "0: PulseAudio Virtual OSS\n"; char fn[] = "/tmp/padsp-sndstat-XXXXXX"; mode_t u; @@ -1501,7 +1501,7 @@ static int mixer_ioctl(fd_info *i, unsigned long request, void*argp, int *_errno memset(mi, 0, sizeof(mixer_info)); strncpy(mi->id, "POLYPAUDIO", sizeof(mi->id)); - strncpy(mi->name, "Polypaudio Virtual OSS", sizeof(mi->name)); + strncpy(mi->name, "PulseAudio Virtual OSS", sizeof(mi->name)); pa_threaded_mainloop_lock(i->mainloop); mi->modify_counter = i->volume_modify_count; pa_threaded_mainloop_unlock(i->mainloop); diff --git a/src/utils/paplay.c b/src/utils/paplay.c index 4b4a1ea6..7b34016c 100644 --- a/src/utils/paplay.c +++ b/src/utils/paplay.c @@ -38,7 +38,7 @@ #include #if PA_API_VERSION != 9 -#error Invalid Polypaudio API version +#error Invalid PulseAudio API version #endif static pa_context *context = NULL; diff --git a/src/utils/pax11publish.c b/src/utils/pax11publish.c index 770455b9..d2ed6c93 100644 --- a/src/utils/pax11publish.c +++ b/src/utils/pax11publish.c @@ -54,10 +54,10 @@ int main(int argc, char *argv[]) { break; case 'h': printf("%s [-D display] [-S server] [-O sink] [-I source] [-c file] [-d|-e|-i|-r]\n\n" - " -d Show current Polypaudio data attached to X11 display (default)\n" - " -e Export local Polypaudio data to X11 display\n" - " -i Import Polypaudio data from X11 display to local environment variables and cookie file.\n" - " -r Remove Polypaudio data from X11 display\n", + " -d Show current PulseAudio data attached to X11 display (default)\n" + " -e Export local PulseAudio data to X11 display\n" + " -i Import PulseAudio data from X11 display to local environment variables and cookie file.\n" + " -r Remove PulseAudio data from X11 display\n", pa_path_get_filename(argv[0])); ret = 0; goto finish; -- cgit