* 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

diff --git a/src/daemon/daemon-conf.c b/src/daemon/daemon-conf.c
index fd83f28f2d80c511ca580dbda8df5bda7135d337..4d458a5c09c30d5645a5e61cfa7aa1fc39da20a7 100644 (file)
--- a/src/daemon/daemon-conf.c
+++ b/src/daemon/daemon-conf.c
@@ -41,7 +41,7 @@
 
 #ifndef DEFAULT_CONFIG_DIR
 # ifndef OS_IS_WIN32
-#  define DEFAULT_CONFIG_DIR "/etc/pulseaudio"
+#  define DEFAULT_CONFIG_DIR "/etc/pulse"
 # else
 #  define DEFAULT_CONFIG_DIR "%POLYP_ROOT%"
 # endif
@@ -54,9 +54,9 @@
 #endif
 
 #define DEFAULT_SCRIPT_FILE DEFAULT_CONFIG_DIR PATH_SEP "default.pa"
-#define DEFAULT_SCRIPT_FILE_USER ".pulseaudio" PATH_SEP "default.pa"
+#define DEFAULT_SCRIPT_FILE_USER ".pulse" PATH_SEP "default.pa"
 #define DEFAULT_CONFIG_FILE DEFAULT_CONFIG_DIR PATH_SEP "daemon.conf"
-#define DEFAULT_CONFIG_FILE_USER ".pulseaudio" PATH_SEP "daemon.conf"
+#define DEFAULT_CONFIG_FILE_USER ".pulse" PATH_SEP "daemon.conf"
 
 #define ENV_SCRIPT_FILE "POLYP_SCRIPT"
 #define ENV_CONFIG_FILE "POLYP_CONFIG"

diff --git a/src/modules/module-jack-sink.c b/src/modules/module-jack-sink.c
index c6a161ff6948609030e45e2fc6adee83a40777da..74f25d536027463e7b4dfd059f9eee292a571dbe 100644 (file)
--- 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 6f31f6c3adf74908103d6fc87429305328aa90f2..9c7f449f37a9180ab39650adc1e775336ed7c984 100644 (file)
--- 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 ddeda734788cf281b860cfe6f3f047a6b51879ad..28d6a08be78b769c8d9c72d3727b754cbcb86f01 100644 (file)
--- 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 ede2fcf28f319b177d28a7bffaa51b1c6cf0d91b..2f45082b3c84f3cfee3b064ddf09e275918bd1f8 100644 (file)
--- 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 14cbef46ab8fd63a3597c51e29d9e37cbe2ac86e..32fb1f41b35f309f7089e2777a27a380fcf64640 100644 (file)
--- 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",

diff --git a/src/pulse/browser.c b/src/pulse/browser.c
index d063465dcb96c15f0a6df51ad22b0b5cd1a0e9dd..966258692081bcd85537c51d5a1364d328bb9be7 100644 (file)
--- a/src/pulse/browser.c
+++ b/src/pulse/browser.c
@@ -29,9 +29,9 @@
 
 #include "browser.h"
 
-#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."
 
 struct pa_browser {
     int ref;

diff --git a/src/pulse/client-conf.c b/src/pulse/client-conf.c
index 752d0134af46269917000bfa7a522441b24d3812..9f5cf53da6bf9e8e6ec76ce573d0abf9ec1157b4 100644 (file)
--- a/src/pulse/client-conf.c
+++ b/src/pulse/client-conf.c
@@ -41,7 +41,7 @@
 
 #ifndef DEFAULT_CONFIG_DIR
 # ifndef OS_IS_WIN32
-#  define DEFAULT_CONFIG_DIR "/etc/pulseaudio"
+#  define DEFAULT_CONFIG_DIR "/etc/pulse"
 # else
 #  define DEFAULT_CONFIG_DIR "%POLYP_ROOT%"
 # endif
@@ -54,7 +54,7 @@
 #endif
 
 #define DEFAULT_CLIENT_CONFIG_FILE DEFAULT_CONFIG_DIR PATH_SEP "client.conf"
-#define DEFAULT_CLIENT_CONFIG_FILE_USER ".pulseaudio" PATH_SEP "client.conf"
+#define DEFAULT_CLIENT_CONFIG_FILE_USER ".pulse" PATH_SEP "client.conf"
 
 #define ENV_CLIENT_CONFIG_FILE "POLYP_CLIENTCONFIG"
 #define ENV_DEFAULT_SINK "POLYP_SINK"

diff --git a/src/pulse/client-conf.h b/src/pulse/client-conf.h
index 9d45af4785aac277b6f1c39d0f92d9c72f712495..a532f0dfec5e1c98236999a43935d284f33a5ef9 100644 (file)
--- a/src/pulse/client-conf.h
+++ b/src/pulse/client-conf.h
@@ -24,7 +24,7 @@
 
 #include <pulsecore/native-common.h>
 
-/* A structure containing configuration data for pulseaudio clients. */
+/* A structure containing configuration data for PulseAudio clients. */
 
 typedef struct pa_client_conf {
     char *daemon_binary, *extra_arguments, *default_sink, *default_source, *default_server, *cookie_file;

diff --git a/src/pulse/context.h b/src/pulse/context.h
index ad8c9f3fa685e21c8cdf1dd55ab144f93e083329..661ff617016cd317fba84781bc7714c76a5502ef 100644 (file)
--- a/src/pulse/context.h
+++ b/src/pulse/context.h
@@ -32,7 +32,7 @@
  *
  * \section overv_sec Overview
  *
- * The asynchronous API is the native interface to the pulseaudio library.
+ * The asynchronous API is the native interface to the PulseAudio library.
  * It allows full access to all available functions. This also means that
  * it is rather complex and can take some time to fully master.
  *
@@ -52,10 +52,10 @@
  *
  * To actually be able to use these functions, an implementation needs to 
  * be coupled to the abstraction. There are three of these shipped with
- * pulseaudio, but any other can be used with a minimal ammount of work,
+ * PulseAudio, but any other can be used with a minimal ammount of work,
  * provided it supports the three basic events listed above.
  *
- * The implementations shipped with pulseaudio are:
+ * The implementations shipped with PulseAudio are:
  *
  * \li \subpage mainloop - A minimal but fast implementation based on poll().
  * \li \subpage threaded_mainloop - A special version of the previous
@@ -71,7 +71,7 @@
  *
  * \section refcnt_sec Reference Counting
  *
- * Almost all objects in pulseaudio are reference counted. What that means
+ * Almost all objects in PulseAudio are reference counted. What that means
  * is that you rarely malloc() or free() any objects. Instead you increase
  * and decrease their reference counts. Whenever an object's reference
  * count reaches zero, that object gets destroy and any resources it uses
@@ -89,7 +89,7 @@
  *
  * \section context_sec Context
  *
- * A context is the basic object for a connection to a pulseaudio server.
+ * A context is the basic object for a connection to a PulseAudio server.
  * It multiplexes commands, data streams and events through a single
  * channel.
  *
@@ -142,7 +142,7 @@
 
 /** \file
  * Connection contexts for asynchrononous communication with a
- * server. A pa_context object wraps a connection to a pulseaudio
+ * server. A pa_context object wraps a connection to a PulseAudio
  * server using its native protocol. */
 
 /** \example pacat.c

diff --git a/src/pulse/def.h b/src/pulse/def.h
index 3a17f43bfd2b4f4794212d1143bb8fb94d1da5cf..b98337d29f47e6f162a0a408c9375b693e45a894 100644 (file)
--- a/src/pulse/def.h
+++ b/src/pulse/def.h
@@ -66,7 +66,7 @@ typedef enum pa_operation_state {
 
 /** Some special flags for contexts. \since 0.8 */
 typedef enum pa_context_flags {
-    PA_CONTEXT_NOAUTOSPAWN = 1 /**< Disabled autospawning of the pulseaudio daemon if required */
+    PA_CONTEXT_NOAUTOSPAWN = 1 /**< Disabled autospawning of the PulseAudio daemon if required */
 } pa_context_flags_t;
 
 /** The direction of a pa_stream object */ 

diff --git a/src/pulse/introspect.h b/src/pulse/introspect.h
index 23d736c65465a2f4828525ea841741c1f063a88c..e9a1449086b61102fb91f46e12fc7c3df39089f5 100644 (file)
--- a/src/pulse/introspect.h
+++ b/src/pulse/introspect.h
@@ -270,7 +270,7 @@ typedef struct pa_server_info {
     pa_sample_spec sample_spec;         /**< Default sample specification */
     const char *default_sink_name;      /**< Name of default sink. \since 0.4 */
     const char *default_source_name;    /**< Name of default sink. \since 0.4*/
-    uint32_t cookie;                    /**< A random cookie for identifying this instance of pulseaudio. \since 0.8 */
+    uint32_t cookie;                    /**< A random cookie for identifying this instance of PulseAudio. \since 0.8 */
 } pa_server_info;
 
 /** Callback prototype for pa_context_get_server_info() */

diff --git a/src/pulse/mainloop-api.h b/src/pulse/mainloop-api.h
index a732b215eabcb8b00bed18fc73e7ac53f8220620..4aaeccf5822a455706c4fc46ac7d7f947b1a2527 100644 (file)
--- a/src/pulse/mainloop-api.h
+++ b/src/pulse/mainloop-api.h
@@ -29,13 +29,13 @@
 
 /** \file
  * 
- * Main loop abstraction layer. Both the pulseaudio core and the
- * pulseaudio client library use a main loop abstraction layer. Due to
- * this it is possible to embed pulseaudio into other
+ * Main loop abstraction layer. Both the PulseAudio core and the
+ * PulseAudio client library use a main loop abstraction layer. Due to
+ * this it is possible to embed PulseAudio into other
  * applications easily. Two main loop implemenations are
  * currently available:
  * \li A minimal implementation based on the C library's poll() function (See \ref mainloop.h)
- * \li A wrapper around the GLIB main loop. Use this to embed pulseaudio into your GLIB/GTK+/GNOME programs (See \ref glib-mainloop.h)
+ * \li A wrapper around the GLIB main loop. Use this to embed PulseAudio into your GLIB/GTK+/GNOME programs (See \ref glib-mainloop.h)
  *
  * The structure pa_mainloop_api is used as vtable for the main loop abstraction.
  *

diff --git a/src/pulsecore/cli.c b/src/pulsecore/cli.c
index fbfa5009b7b9f046c56ee21371bc9e1bfdb9fec8..7c28406687cad233c9c217cadc60f153d74a867b 100644 (file)
--- 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 e42070d17d465672f995fd059060e28495bad35e..61878c9ed0656eddc7cca9d07c415c2393178b03 100644 (file)
--- 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 8e3587ebe8a98466d8442d674b5a68e875233fe2..d4b140dedfe9f0f6a536ed53861cf821580c9588 100644 (file)
--- 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 627d42396bc6309a7d3f57acc41c6be0bf6226a4..261c5f7521940f286644e4d85a0be67d9b20c7a4 100644 (file)
--- 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 b35931d004109de7f4f617c0d51f65c6d3139c55..5fdb6f427f1ad2b07742cf021ce79f56f80522bf 100644 (file)
--- 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