mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

replace "spawn" parameter of pa_context_new() with a proper flags parameter

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@523 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2006-02-20 16:10:20 +00:00
parent e078f084e4
commit 6d09602460
3 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/polyp/context.c
View file

@ -593,7 +593,7 @@ finish:
pa_context_unref(c); pa_context_unref(c);
} }
int pa_context_connect(pa_context *c, const char *server, int spawn, const pa_spawn_api *api) { int pa_context_connect(pa_context *c, const char *server, pa_context_flags_t flags, const pa_spawn_api *api) {
int r = -1; int r = -1;
assert(c && c->ref >= 1 && c->state == PA_CONTEXT_UNCONNECTED); assert(c && c->ref >= 1 && c->state == PA_CONTEXT_UNCONNECTED);
@ -632,7 +632,7 @@ int pa_context_connect(pa_context *c, const char *server, int spawn, const pa_sp
c->server_list = pa_strlist_prepend(c->server_list, pa_runtime_path(PA_NATIVE_DEFAULT_UNIX_SOCKET, ufn, sizeof(ufn))); c->server_list = pa_strlist_prepend(c->server_list, pa_runtime_path(PA_NATIVE_DEFAULT_UNIX_SOCKET, ufn, sizeof(ufn)));
/* Wrap the connection attempts in a single transaction for sane autospawn locking */ /* Wrap the connection attempts in a single transaction for sane autospawn locking */
if (spawn && c->conf->autospawn) { if (!(flags & PA_CONTEXT_NOAUTOSPAWN) && c->conf->autospawn) {
char lf[PATH_MAX]; char lf[PATH_MAX];
pa_runtime_path(AUTOSPAWN_LOCK, lf, sizeof(lf)); pa_runtime_path(AUTOSPAWN_LOCK, lf, sizeof(lf));

10
src/polyp/context.h
View file

@ -84,11 +84,11 @@ pa_context_state_t pa_context_get_state(pa_context *c);
/** Connect the context to the specified server. If server is NULL, /** Connect the context to the specified server. If server is NULL,
connect to the default server. This routine may but will not always connect to the default server. This routine may but will not always
return synchronously on error. Use pa_context_set_state_callback() to return synchronously on error. Use pa_context_set_state_callback() to
be notified when the connection is established. If spawn is non-zero be notified when the connection is established. If flags doesn't have
and no specific server is specified or accessible a new daemon is PA_NOAUTOSPAWN set and no specific server is specified or accessible a
spawned. If api is non-NULL, the functions specified in the structure new daemon is spawned. If api is non-NULL, the functions specified in
are used when forking a new child process. */ the structure are used when forking a new child process. */
int pa_context_connect(pa_context *c, const char *server, int spawn, const pa_spawn_api *api); int pa_context_connect(pa_context *c, const char *server, pa_context_flags_t flags, const pa_spawn_api *api);
/** Terminate the context connection immediately */ /** Terminate the context connection immediately */
void pa_context_disconnect(pa_context *c); void pa_context_disconnect(pa_context *c);

5
src/polyp/def.h
View file

@ -64,6 +64,11 @@ typedef enum pa_operation_state {
/** An invalid index */ /** An invalid index */
#define PA_INVALID_INDEX ((uint32_t) -1) #define PA_INVALID_INDEX ((uint32_t) -1)
/** Some special flags for contexts. \ since 0.8 */
typedef enum pa_context_flags {
PA_CONTEXT_NOAUTOSPAWN = 1 /**< Disabled autospawning of the polypaudio daemon if required */
} pa_context_flags_t;
/** The direction of a pa_stream object */ /** The direction of a pa_stream object */
typedef enum pa_stream_direction { typedef enum pa_stream_direction {
PA_STREAM_NODIRECTION, /**< Invalid direction */ PA_STREAM_NODIRECTION, /**< Invalid direction */