From 3cf16214334b4a1c51e56b0536abd8223d6813dd Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 19 Jun 2006 23:51:58 +0000
Subject: * more s/pulseaudio/PulseAudio/ replacements * name the per-user dir
 ~/.pulse (instead of .pulseaudio), just like /etc/pulse/

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1039 fefdeb5f-60dc-0310-8127-8f9354f1896f
---
 src/pulsecore/cli.c           | 2 +-
 src/pulsecore/core-error.c    | 2 +-
 src/pulsecore/core-util.c     | 6 +++---
 src/pulsecore/core.h          | 4 ++--
 src/pulsecore/native-common.h | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/pulsecore')

diff --git a/src/pulsecore/cli.c b/src/pulsecore/cli.c
index fbfa5009..7c284066 100644
--- a/src/pulsecore/cli.c
+++ b/src/pulsecore/cli.c
@@ -84,7 +84,7 @@ pa_cli* pa_cli_new(pa_core *core, pa_iochannel *io, pa_module *m) {
     c->client->owner = m;
     
     pa_ioline_set_callback(c->line, line_callback, c);
-    pa_ioline_puts(c->line, "Welcome to pulseaudio! 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;
     
diff --git a/src/pulsecore/core-error.c b/src/pulsecore/core-error.c
index e42070d1..61878c9e 100644
--- a/src/pulsecore/core-error.c
+++ b/src/pulsecore/core-error.c
@@ -68,7 +68,7 @@ static void inittls(void) {
     HANDLE mutex;
     char name[64];
 
-    sprintf(name, "pulseaudio%d", (int)GetCurrentProcessId());
+    sprintf(name, "pulse%d", (int)GetCurrentProcessId());
 
     mutex = CreateMutex(NULL, FALSE, name);
     if (!mutex) {
diff --git a/src/pulsecore/core-util.c b/src/pulsecore/core-util.c
index 8e3587eb..d4b140de 100644
--- a/src/pulsecore/core-util.c
+++ b/src/pulsecore/core-util.c
@@ -79,10 +79,10 @@
 #include "core-util.h"
 
 #ifndef OS_IS_WIN32
-#define PA_RUNTIME_PATH_PREFIX "/tmp/pulseaudio-"
+#define PA_RUNTIME_PATH_PREFIX "/tmp/pulse-"
 #define PATH_SEP '/'
 #else
-#define PA_RUNTIME_PATH_PREFIX "%TEMP%\\pulseaudio-"
+#define PA_RUNTIME_PATH_PREFIX "%TEMP%\\pulse-"
 #define PATH_SEP '\\'
 #endif
 
@@ -961,7 +961,7 @@ int pa_endswith(const char *s, const char *sfx) {
     return l1 >= l2 && strcmp(s+l1-l2, sfx) == 0;
 }
 
-/* if fn is null return the pulseaudio run time path in s (/tmp/pulseaudio)
+/* if fn is null return the PulseAudio run time path in s (/tmp/pulse)
  * 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) {
diff --git a/src/pulsecore/core.h b/src/pulsecore/core.h
index 627d4239..261c5f75 100644
--- a/src/pulsecore/core.h
+++ b/src/pulsecore/core.h
@@ -33,13 +33,13 @@ typedef struct pa_core pa_core;
 #include <pulsecore/queue.h>
 #include <pulsecore/core-subscribe.h>
 
-/* The core structure of pulseaudio. Every pulseaudio 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
-     * pulseaudio. Not cryptographically secure in any way. */
+     * PulseAudio. Not cryptographically secure in any way. */
     uint32_t cookie;
     
     pa_mainloop_api *mainloop;
diff --git a/src/pulsecore/native-common.h b/src/pulsecore/native-common.h
index b35931d0..5fdb6f42 100644
--- a/src/pulsecore/native-common.h
+++ b/src/pulsecore/native-common.h
@@ -112,7 +112,7 @@ enum {
 };
 
 #define PA_NATIVE_COOKIE_LENGTH 256
-#define PA_NATIVE_COOKIE_FILE ".pulseaudio-cookie"
+#define PA_NATIVE_COOKIE_FILE ".pulse-cookie"
 
 #define PA_NATIVE_DEFAULT_PORT 4713
 
-- 
cgit