merge 'lennart' branch back into trunk.

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1971 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2007-10-28 19:13:50 +00:00
parent 6687dd0131
commit a67c21f093
294 changed files with 79057 additions and 11614 deletions

View file

@ -48,8 +48,10 @@
static pa_context *context = NULL;
static pa_mainloop_api *mainloop_api = NULL;
static char *device = NULL, *sample_name = NULL, *sink_name = NULL, *source_name = NULL;
static char *device = NULL, *sample_name = NULL, *sink_name = NULL, *source_name = NULL, *module_name = NULL, *module_args = NULL;
static uint32_t sink_input_idx = PA_INVALID_INDEX, source_output_idx = PA_INVALID_INDEX;
static uint32_t module_index;
static int suspend;
static SNDFILE *sndfile = NULL;
static pa_stream *sample_stream = NULL;
@ -69,7 +71,11 @@ static enum {
REMOVE_SAMPLE,
LIST,
MOVE_SINK_INPUT,
MOVE_SOURCE_OUTPUT
MOVE_SOURCE_OUTPUT,
LOAD_MODULE,
UNLOAD_MODULE,
SUSPEND_SINK,
SUSPEND_SOURCE,
} action = NONE;
static void quit(int ret) {
@ -354,7 +360,7 @@ static void get_sink_input_info_callback(pa_context *c, const pa_sink_input_info
i->sink,
pa_sample_spec_snprint(s, sizeof(s), &i->sample_spec),
pa_channel_map_snprint(cm, sizeof(cm), &i->channel_map),
pa_cvolume_snprint(cv, sizeof(cv), &i->volume),
i->mute ? "muted" : pa_cvolume_snprint(cv, sizeof(cv), &i->volume),
(double) i->buffer_usec,
(double) i->sink_usec,
i->resample_method ? i->resample_method : "n/a");
@ -492,6 +498,18 @@ static void simple_callback(pa_context *c, int success, void *userdata) {
complete_action();
}
static void index_callback(pa_context *c, uint32_t idx, void *userdata) {
if (idx == PA_INVALID_INDEX) {
fprintf(stderr, "Failure: %s\n", pa_strerror(pa_context_errno(c)));
quit(1);
return;
}
printf("%u\n", idx);
complete_action();
}
static void stream_state_callback(pa_stream *s, void *userdata) {
assert(s);
@ -594,6 +612,28 @@ static void context_state_callback(pa_context *c, void *userdata) {
pa_operation_unref(pa_context_move_source_output_by_name(c, source_output_idx, source_name, simple_callback, NULL));
break;
case LOAD_MODULE:
pa_operation_unref(pa_context_load_module(c, module_name, module_args, index_callback, NULL));
break;
case UNLOAD_MODULE:
pa_operation_unref(pa_context_unload_module(c, module_index, simple_callback, NULL));
break;
case SUSPEND_SINK:
if (sink_name)
pa_operation_unref(pa_context_suspend_sink_by_name(c, sink_name, suspend, simple_callback, NULL));
else
pa_operation_unref(pa_context_suspend_sink_by_index(c, PA_INVALID_INDEX, suspend, simple_callback, NULL));
break;
case SUSPEND_SOURCE:
if (source_name)
pa_operation_unref(pa_context_suspend_source_by_name(c, source_name, suspend, simple_callback, NULL));
else
pa_operation_unref(pa_context_suspend_source_by_index(c, PA_INVALID_INDEX, suspend, simple_callback, NULL));
break;
default:
assert(0);
}
@ -624,12 +664,16 @@ static void help(const char *argv0) {
"%s [options] play-sample NAME [SINK]\n"
"%s [options] move-sink-input ID SINK\n"
"%s [options] move-source-output ID SOURCE\n"
"%s [options] remove-sample NAME\n\n"
"%s [options] remove-sample NAME\n"
"%s [options] load-module NAME [ARGS ...]\n"
"%s [options] unload-module ID\n"
"%s [options] suspend-sink [SINK] 1|0\n"
"%s [options] suspend-source [SOURCE] 1|0\n\n"
" -h, --help Show this help\n"
" --version Show version\n\n"
" -s, --server=SERVER The name of the server to connect to\n"
" -n, --client-name=NAME How to call this client on the server\n",
argv0, argv0, argv0, argv0, argv0, argv0, argv0, argv0);
argv0, argv0, argv0, argv0, argv0, argv0, argv0, argv0, argv0, argv0, argv0, argv0);
}
enum { ARG_VERSION = 256 };
@ -728,7 +772,7 @@ int main(int argc, char *argv[]) {
sample_length = sfinfo.frames*pa_frame_size(&sample_spec);
} else if (!strcmp(argv[optind], "play-sample")) {
action = PLAY_SAMPLE;
if (optind+1 >= argc) {
if (argc != optind+2 && argc != optind+3) {
fprintf(stderr, "You have to specify a sample name to play\n");
goto quit;
}
@ -740,7 +784,7 @@ int main(int argc, char *argv[]) {
} else if (!strcmp(argv[optind], "remove-sample")) {
action = REMOVE_SAMPLE;
if (optind+1 >= argc) {
if (argc != optind+2) {
fprintf(stderr, "You have to specify a sample name to remove\n");
goto quit;
}
@ -748,7 +792,7 @@ int main(int argc, char *argv[]) {
sample_name = pa_xstrdup(argv[optind+1]);
} else if (!strcmp(argv[optind], "move-sink-input")) {
action = MOVE_SINK_INPUT;
if (optind+2 >= argc) {
if (argc != optind+3) {
fprintf(stderr, "You have to specify a sink input index and a sink\n");
goto quit;
}
@ -757,13 +801,72 @@ int main(int argc, char *argv[]) {
sink_name = pa_xstrdup(argv[optind+2]);
} else if (!strcmp(argv[optind], "move-source-output")) {
action = MOVE_SOURCE_OUTPUT;
if (optind+2 >= argc) {
if (argc != optind+3) {
fprintf(stderr, "You have to specify a source output index and a source\n");
goto quit;
}
source_output_idx = atoi(argv[optind+1]);
source_name = pa_xstrdup(argv[optind+2]);
} else if (!strcmp(argv[optind], "load-module")) {
int i;
size_t n = 0;
char *p;
action = LOAD_MODULE;
if (argc <= optind+1) {
fprintf(stderr, "You have to specify a module name and arguments.\n");
goto quit;
}
module_name = argv[optind+1];
for (i = optind+2; i < argc; i++)
n += strlen(argv[i])+1;
if (n > 0) {
p = module_args = pa_xnew0(char, n);
for (i = optind+2; i < argc; i++)
p += sprintf(p, "%s%s", p == module_args ? "" : " ", argv[i]);
}
} else if (!strcmp(argv[optind], "unload-module")) {
action = UNLOAD_MODULE;
if (argc != optind+2) {
fprintf(stderr, "You have to specify a module index\n");
goto quit;
}
module_index = atoi(argv[optind+1]);
} else if (!strcmp(argv[optind], "suspend-sink")) {
action = SUSPEND_SINK;
if (argc > optind+3 || optind+1 >= argc) {
fprintf(stderr, "You may not specify more than one sink. You have to specify at least one boolean value.\n");
goto quit;
}
suspend = !!atoi(argv[argc-1]);
if (argc > optind+2)
sink_name = pa_xstrdup(argv[optind+1]);
} else if (!strcmp(argv[optind], "suspend-source")) {
action = SUSPEND_SOURCE;
if (argc > optind+3 || optind+1 >= argc) {
fprintf(stderr, "You may not specify more than one source. You have to specify at least one boolean value.\n");
goto quit;
}
suspend = !!atoi(argv[argc-1]);
if (argc > optind+2)
source_name = pa_xstrdup(argv[optind+1]);
}
}
@ -819,6 +922,8 @@ quit:
pa_xfree(sample_name);
pa_xfree(sink_name);
pa_xfree(source_name);
pa_xfree(module_args);
pa_xfree(client_name);
return ret;
}

View file

@ -61,6 +61,10 @@
# define SIOCINQ FIONREAD
#endif
/* make sure gcc doesn't redefine open and friends as macros */
#undef open
#undef open64
typedef enum {
FD_INFO_MIXER,
FD_INFO_STREAM,
@ -259,9 +263,9 @@ if (!(i)->context || pa_context_get_state((i)->context) != PA_CONTEXT_READY || \
static void debug(int level, const char *format, ...) PA_GCC_PRINTF_ATTR(2,3);
#define DEBUG_LEVEL_ALWAYS 0
#define DEBUG_LEVEL_NORMAL 1
#define DEBUG_LEVEL_VERBOSE 2
#define DEBUG_LEVEL_ALWAYS 0
#define DEBUG_LEVEL_NORMAL 1
#define DEBUG_LEVEL_VERBOSE 2
static void debug(int level, const char *format, ...) {
va_list ap;
@ -421,7 +425,7 @@ static void fd_info_unref(fd_info *i) {
pthread_mutex_lock(&i->mutex);
assert(i->ref >= 1);
r = --i->ref;
debug(DEBUG_LEVEL_VERBOSE, __FILE__": ref--, now %i\n", i->ref);
debug(DEBUG_LEVEL_VERBOSE, __FILE__": ref--, now %i\n", i->ref);
pthread_mutex_unlock(&i->mutex);
if (r <= 0)
@ -1395,7 +1399,7 @@ static int sndstat_open(int flags, int *_errno) {
if (flags != O_RDONLY
#ifdef O_LARGEFILE
&& flags != (O_RDONLY|O_LARGEFILE)
&& flags != (O_RDONLY|O_LARGEFILE)
#endif
) {
*_errno = EACCES;
@ -1436,34 +1440,23 @@ fail:
return -1;
}
int open(const char *filename, int flags, ...) {
va_list args;
mode_t mode = 0;
static int real_open(const char *filename, int flags, mode_t mode) {
int r, _errno = 0;
debug(DEBUG_LEVEL_VERBOSE, __FILE__": open(%s)\n", filename);
va_start(args, flags);
if (flags & O_CREAT) {
if (sizeof(mode_t) < sizeof(int))
mode = va_arg(args, int);
else
mode = va_arg(args, mode_t);
}
va_end(args);
if (!function_enter()) {
LOAD_OPEN_FUNC();
return _open(filename, flags, mode);
}
if (dsp_cloak_enable() && (strcmp(filename, "/dev/dsp") == 0 || strcmp(filename, "/dev/adsp") == 0)) {
if (dsp_cloak_enable() && (strcmp(filename, "/dev/dsp") == 0 || strcmp(filename, "/dev/adsp") == 0))
r = dsp_open(flags, &_errno);
} else if (mixer_cloak_enable() && strcmp(filename, "/dev/mixer") == 0) {
else if (mixer_cloak_enable() && strcmp(filename, "/dev/mixer") == 0)
r = mixer_open(flags, &_errno);
} else if (sndstat_cloak_enable() && strcmp(filename, "/dev/sndstat") == 0) {
else if (sndstat_cloak_enable() && strcmp(filename, "/dev/sndstat") == 0)
r = sndstat_open(flags, &_errno);
} else {
else {
function_exit();
LOAD_OPEN_FUNC();
return _open(filename, flags, mode);
@ -1477,6 +1470,22 @@ int open(const char *filename, int flags, ...) {
return r;
}
int open(const char *filename, int flags, ...) {
va_list args;
mode_t mode = 0;
if (flags & O_CREAT) {
va_start(args, flags);
if (sizeof(mode_t) < sizeof(int))
mode = va_arg(args, int);
else
mode = va_arg(args, mode_t);
va_end(args);
}
return real_open(filename, flags, mode);
}
static int mixer_ioctl(fd_info *i, unsigned long request, void*argp, int *_errno) {
int ret = -1;
@ -2023,9 +2032,9 @@ static int dsp_ioctl(fd_info *i, unsigned long request, void*argp, int *_errno)
*(int*) argp = DSP_CAP_DUPLEX | DSP_CAP_TRIGGER
#ifdef DSP_CAP_MULTI
| DSP_CAP_MULTI
| DSP_CAP_MULTI
#endif
;
;
break;
case SNDCTL_DSP_GETODELAY: {
@ -2497,10 +2506,14 @@ int open64(const char *filename, int flags, ...) {
debug(DEBUG_LEVEL_VERBOSE, __FILE__": open64(%s)\n", filename);
va_start(args, flags);
if (flags & O_CREAT)
mode = va_arg(args, mode_t);
va_end(args);
if (flags & O_CREAT) {
va_start(args, flags);
if (sizeof(mode_t) < sizeof(int))
mode = va_arg(args, int);
else
mode = va_arg(args, mode_t);
va_end(args);
}
if (strcmp(filename, "/dev/dsp") != 0 &&
strcmp(filename, "/dev/adsp") != 0 &&
@ -2510,7 +2523,7 @@ int open64(const char *filename, int flags, ...) {
return _open64(filename, flags, mode);
}
return open(filename, flags, mode);
return real_open(filename, flags, mode);
}
#endif
@ -2602,7 +2615,7 @@ FILE* fopen(const char *filename, const char *mode) {
if ((((mode[1] == 'b') || (mode[1] == 't')) && (mode[2] == '+')) || (mode[1] == '+'))
m = O_RDWR;
if ((fd = open(filename, m)) < 0)
if ((fd = real_open(filename, m, 0)) < 0)
return NULL;
if (!(f = fdopen(fd, mode))) {

View file

@ -123,7 +123,7 @@ static void stream_write_callback(pa_stream *s, size_t length, void *userdata) {
else
pa_xfree(data);
if (bytes < length) {
if (bytes < (sf_count_t) length) {
sf_close(sndfile);
sndfile = NULL;
pa_operation_unref(pa_stream_drain(s, stream_drain_complete, NULL));

316
src/utils/pasuspender.c Normal file
View file

@ -0,0 +1,316 @@
/* $Id$ */
/***
This file is part of PulseAudio.
Copyright 2004-2006 Lennart Poettering
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA.
***/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <sys/types.h>
#include <sys/wait.h>
#include <signal.h>
#include <string.h>
#include <errno.h>
#include <unistd.h>
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
#include <limits.h>
#include <getopt.h>
#include <sndfile.h>
#ifdef __linux__
#include <sys/prctl.h>
#endif
#include <pulse/pulseaudio.h>
#include <pulsecore/macro.h>
#if PA_API_VERSION < 10
#error Invalid PulseAudio API version
#endif
#define BUFSIZE 1024
static pa_context *context = NULL;
static pa_mainloop_api *mainloop_api = NULL;
static char **child_argv = NULL;
static int child_argc = 0;
static pid_t child_pid = (pid_t) -1;
static int child_ret = 0;
static int dead = 1;
static void quit(int ret) {
pa_assert(mainloop_api);
mainloop_api->quit(mainloop_api, ret);
}
static void context_drain_complete(pa_context *c, void *userdata) {
pa_context_disconnect(c);
}
static void drain(void) {
pa_operation *o;
if (!(o = pa_context_drain(context, context_drain_complete, NULL)))
pa_context_disconnect(context);
else
pa_operation_unref(o);
}
static void start_child(void) {
if ((child_pid = fork()) < 0) {
fprintf(stderr, "fork(): %s\n", strerror(errno));
quit(1);
} else if (child_pid == 0) {
/* Child */
#ifdef __linux__
prctl(PR_SET_PDEATHSIG, SIGTERM, 0, 0, 0);
#endif
if (execvp(child_argv[0], child_argv) < 0)
fprintf(stderr, "execvp(): %s\n", strerror(errno));
_exit(1);
} else {
/* parent */
dead = 0;
}
}
static void suspend_complete(pa_context *c, int success, void *userdata) {
static int n = 0;
n++;
if (!success) {
fprintf(stderr, "Failure to suspend: %s\n", pa_strerror(pa_context_errno(c)));
quit(1);
return;
}
if (n >= 2)
start_child();
}
static void resume_complete(pa_context *c, int success, void *userdata) {
static int n = 0;
n++;
if (!success) {
fprintf(stderr, "Failure to resume: %s\n", pa_strerror(pa_context_errno(c)));
quit(1);
return;
}
if (n >= 2)
drain(); /* drain and quit */
}
static void context_state_callback(pa_context *c, void *userdata) {
pa_assert(c);
switch (pa_context_get_state(c)) {
case PA_CONTEXT_CONNECTING:
case PA_CONTEXT_AUTHORIZING:
case PA_CONTEXT_SETTING_NAME:
break;
case PA_CONTEXT_READY:
if (pa_context_is_local(c)) {
pa_operation_unref(pa_context_suspend_sink_by_index(c, PA_INVALID_INDEX, 1, suspend_complete, NULL));
pa_operation_unref(pa_context_suspend_source_by_index(c, PA_INVALID_INDEX, 1, suspend_complete, NULL));
} else
start_child();
break;
case PA_CONTEXT_TERMINATED:
quit(0);
break;
case PA_CONTEXT_FAILED:
default:
fprintf(stderr, "Connection failure: %s\n", pa_strerror(pa_context_errno(c)));
pa_context_unref(context);
context = NULL;
if (child_pid == (pid_t) -1)
/* not started yet, then we do it now */
start_child();
else if (dead)
/* already started, and dead, so let's quit */
quit(1);
break;
}
}
static void sigint_callback(pa_mainloop_api *m, pa_signal_event *e, int sig, void *userdata) {
fprintf(stderr, "Got SIGINT, exiting.\n");
quit(0);
}
static void sigchld_callback(pa_mainloop_api *m, pa_signal_event *e, int sig, void *userdata) {
int status = 0;
pid_t p;
p = waitpid(-1, &status, WNOHANG);
if (p != child_pid)
return;
dead = 1;
if (WIFEXITED(status))
child_ret = WEXITSTATUS(status);
else if (WIFSIGNALED(status)) {
fprintf(stderr, "WARNING: Child process terminated by signal %u\n", WTERMSIG(status));
child_ret = 1;
}
if (context) {
if (pa_context_is_local(context)) {
/* A context is around, so let's resume */
pa_operation_unref(pa_context_suspend_sink_by_index(context, PA_INVALID_INDEX, 0, resume_complete, NULL));
pa_operation_unref(pa_context_suspend_source_by_index(context, PA_INVALID_INDEX, 0, resume_complete, NULL));
} else
drain();
} else
/* Hmm, no context here, so let's terminate right away */
quit(0);
}
static void help(const char *argv0) {
printf("%s [options] ... \n\n"
" -h, --help Show this help\n"
" --version Show version\n"
" -s, --server=SERVER The name of the server to connect to\n\n",
argv0);
}
enum {
ARG_VERSION = 256
};
int main(int argc, char *argv[]) {
pa_mainloop* m = NULL;
int c, ret = 1;
char *server = NULL, *bn;
static const struct option long_options[] = {
{"server", 1, NULL, 's'},
{"version", 0, NULL, ARG_VERSION},
{"help", 0, NULL, 'h'},
{NULL, 0, NULL, 0}
};
if (!(bn = strrchr(argv[0], '/')))
bn = argv[0];
else
bn++;
while ((c = getopt_long(argc, argv, "s:h", long_options, NULL)) != -1) {
switch (c) {
case 'h' :
help(bn);
ret = 0;
goto quit;
case ARG_VERSION:
printf("pasuspender "PACKAGE_VERSION"\nCompiled with libpulse %s\nLinked with libpulse %s\n", pa_get_headers_version(), pa_get_library_version());
ret = 0;
goto quit;
case 's':
pa_xfree(server);
server = pa_xstrdup(optarg);
break;
default:
goto quit;
}
}
child_argv = argv + optind;
child_argc = argc - optind;
if (child_argc <= 0) {
help(bn);
ret = 0;
goto quit;
}
if (!(m = pa_mainloop_new())) {
fprintf(stderr, "pa_mainloop_new() failed.\n");
goto quit;
}
pa_assert_se(mainloop_api = pa_mainloop_get_api(m));
pa_assert_se(pa_signal_init(mainloop_api) == 0);
pa_signal_new(SIGINT, sigint_callback, NULL);
pa_signal_new(SIGCHLD, sigchld_callback, NULL);
#ifdef SIGPIPE
signal(SIGPIPE, SIG_IGN);
#endif
if (!(context = pa_context_new(mainloop_api, bn))) {
fprintf(stderr, "pa_context_new() failed.\n");
goto quit;
}
pa_context_set_state_callback(context, context_state_callback, NULL);
pa_context_connect(context, server, PA_CONTEXT_NOAUTOSPAWN, NULL);
if (pa_mainloop_run(m, &ret) < 0) {
fprintf(stderr, "pa_mainloop_run() failed.\n");
goto quit;
}
quit:
if (context)
pa_context_unref(context);
if (m) {
pa_signal_done();
pa_mainloop_free(m);
}
pa_xfree(server);
if (!dead)
kill(child_pid, SIGTERM);
return ret == 0 ? child_ret : ret;
}