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/modules/module-jack-sink.c        | 2 +-
 src/modules/module-jack-source.c      | 2 +-
 src/modules/module-match.c            | 4 ++--
 src/modules/module-volume-restore.c   | 2 +-
 src/modules/module-zeroconf-publish.c | 6 +++---
 5 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/modules')

diff --git a/src/modules/module-jack-sink.c b/src/modules/module-jack-sink.c
index c6a161ff..74f25d53 100644
--- a/src/modules/module-jack-sink.c
+++ b/src/modules/module-jack-sink.c
@@ -261,7 +261,7 @@ int pa__init(pa_core *c, pa_module*m) {
     }
         
     server_name = pa_modargs_get_value(ma, "server_name", NULL);
-    client_name = pa_modargs_get_value(ma, "client_name", "pulseaudio");
+    client_name = pa_modargs_get_value(ma, "client_name", "PulseAudio");
 
     u = pa_xnew0(struct userdata, 1);
     m->userdata = u;
diff --git a/src/modules/module-jack-source.c b/src/modules/module-jack-source.c
index 6f31f6c3..9c7f449f 100644
--- a/src/modules/module-jack-source.c
+++ b/src/modules/module-jack-source.c
@@ -259,7 +259,7 @@ int pa__init(pa_core *c, pa_module*m) {
     }
         
     server_name = pa_modargs_get_value(ma, "server_name", NULL);
-    client_name = pa_modargs_get_value(ma, "client_name", "pulseaudio");
+    client_name = pa_modargs_get_value(ma, "client_name", "PulseAudio");
 
     u = pa_xnew0(struct userdata, 1);
     m->userdata = u;
diff --git a/src/modules/module-match.c b/src/modules/module-match.c
index ddeda734..28d6a08b 100644
--- a/src/modules/module-match.c
+++ b/src/modules/module-match.c
@@ -53,11 +53,11 @@ PA_MODULE_VERSION(PACKAGE_VERSION)
 #define WHITESPACE "\n\r \t"
 
 #ifndef DEFAULT_CONFIG_DIR
-#define DEFAULT_CONFIG_DIR "/etc/pulseaudio"
+#define DEFAULT_CONFIG_DIR "/etc/pulse"
 #endif
 
 #define DEFAULT_MATCH_TABLE_FILE DEFAULT_CONFIG_DIR"/match.table"
-#define DEFAULT_MATCH_TABLE_FILE_USER ".pulseaudio/match.table"
+#define DEFAULT_MATCH_TABLE_FILE_USER ".pulse/match.table"
 
 static const char* const valid_modargs[] = {
     "table",
diff --git a/src/modules/module-volume-restore.c b/src/modules/module-volume-restore.c
index ede2fcf2..2f45082b 100644
--- a/src/modules/module-volume-restore.c
+++ b/src/modules/module-volume-restore.c
@@ -53,7 +53,7 @@ PA_MODULE_VERSION(PACKAGE_VERSION)
 
 #define WHITESPACE "\n\r \t"
 
-#define DEFAULT_VOLUME_TABLE_FILE ".pulseaudio/volume.table"
+#define DEFAULT_VOLUME_TABLE_FILE ".pulse/volume.table"
 
 static const char* const valid_modargs[] = {
     "table",
diff --git a/src/modules/module-zeroconf-publish.c b/src/modules/module-zeroconf-publish.c
index 14cbef46..32fb1f41 100644
--- a/src/modules/module-zeroconf-publish.c
+++ b/src/modules/module-zeroconf-publish.c
@@ -53,9 +53,9 @@ PA_MODULE_DESCRIPTION("mDNS/DNS-SD Service Publisher")
 PA_MODULE_VERSION(PACKAGE_VERSION)
 PA_MODULE_USAGE("port=<IP port number>")
 
-#define SERVICE_NAME_SINK "_pulseaudio-sink._tcp"
-#define SERVICE_NAME_SOURCE "_pulseaudio-source._tcp"
-#define SERVICE_NAME_SERVER "_pulseaudio-server._tcp"
+#define SERVICE_NAME_SINK "_pulse-sink._tcp"
+#define SERVICE_NAME_SOURCE "_pulse-source._tcp"
+#define SERVICE_NAME_SERVER "_pulse-server._tcp"
 
 static const char* const valid_modargs[] = {
     "port",
-- 
cgit