summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2006-06-19 23:51:58 +0000
committerLennart Poettering <lennart@poettering.net>2006-06-19 23:51:58 +0000
commit3cf16214334b4a1c51e56b0536abd8223d6813dd (patch)
tree6d7933a5ba84c4b2b0a0cc4dd6c0dac16492d7fd /src
parentfe1dadbadd9f694d533dc2191451d2a020d99c2f (diff)
* 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
Diffstat (limited to 'src')
-rw-r--r--src/daemon/daemon-conf.c6
-rw-r--r--src/modules/module-jack-sink.c2
-rw-r--r--src/modules/module-jack-source.c2
-rw-r--r--src/modules/module-match.c4
-rw-r--r--src/modules/module-volume-restore.c2
-rw-r--r--src/modules/module-zeroconf-publish.c6
-rw-r--r--src/pulse/browser.c6
-rw-r--r--src/pulse/client-conf.c4
-rw-r--r--src/pulse/client-conf.h2
-rw-r--r--src/pulse/context.h12
-rw-r--r--src/pulse/def.h2
-rw-r--r--src/pulse/introspect.h2
-rw-r--r--src/pulse/mainloop-api.h8
-rw-r--r--src/pulsecore/cli.c2
-rw-r--r--src/pulsecore/core-error.c2
-rw-r--r--src/pulsecore/core-util.c6
-rw-r--r--src/pulsecore/core.h4
-rw-r--r--src/pulsecore/native-common.h2
18 files changed, 37 insertions, 37 deletions
diff --git a/src/daemon/daemon-conf.c b/src/daemon/daemon-conf.c
index fd83f28f..4d458a5c 100644
--- 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 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",
diff --git a/src/pulse/browser.c b/src/pulse/browser.c
index d063465d..96625869 100644
--- 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 752d0134..9f5cf53d 100644
--- 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 9d45af47..a532f0df 100644
--- 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 ad8c9f3f..661ff617 100644
--- 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 3a17f43b..b98337d2 100644
--- 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 23d736c6..e9a14490 100644
--- 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 a732b215..4aaeccf5 100644
--- 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 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