mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-08 13:29:59 -05:00
* 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
This commit is contained in:
parent
fe1dadbadd
commit
3cf1621433
18 changed files with 37 additions and 37 deletions
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 */
|
||||
|
|
|
|||
|
|
@ -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() */
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
*
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue