mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-03 09:01:50 -05:00
make use of pa_sink_used_by()/pa_source_used_by() wherever applicable
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1227 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
parent
b5207fc9ca
commit
dbe6bdd2bc
9 changed files with 15 additions and 25 deletions
|
|
@ -90,9 +90,7 @@ static const char* const valid_modargs[] = {
|
|||
#define DEFAULT_DEVICE "default"
|
||||
|
||||
static void update_usage(struct userdata *u) {
|
||||
pa_module_set_used(u->module,
|
||||
(u->sink ? pa_idxset_size(u->sink->inputs) : 0) +
|
||||
(u->sink ? pa_idxset_size(u->sink->monitor_source->outputs) : 0));
|
||||
pa_module_set_used(u->module, u->sink ? pa_sink_used_by(u->sink) : 0);
|
||||
}
|
||||
|
||||
static void clear_up(struct userdata *u) {
|
||||
|
|
|
|||
|
|
@ -91,8 +91,7 @@ static const char* const valid_modargs[] = {
|
|||
#define DEFAULT_DEVICE "default"
|
||||
|
||||
static void update_usage(struct userdata *u) {
|
||||
pa_module_set_used(u->module,
|
||||
(u->source ? pa_idxset_size(u->source->outputs) : 0));
|
||||
pa_module_set_used(u->module, u->source ? pa_source_used_by(u->source) : 0);
|
||||
}
|
||||
|
||||
static void clear_up(struct userdata *u) {
|
||||
|
|
|
|||
|
|
@ -99,12 +99,9 @@ static void output_free(struct output *o);
|
|||
static void clear_up(struct userdata *u);
|
||||
|
||||
static void update_usage(struct userdata *u) {
|
||||
pa_module_set_used(u->module,
|
||||
(u->sink ? pa_idxset_size(u->sink->inputs) : 0) +
|
||||
(u->sink ? pa_idxset_size(u->sink->monitor_source->outputs) : 0));
|
||||
pa_module_set_used(u->module, u->sink ? pa_sink_used_by(u->sink) : 0);
|
||||
}
|
||||
|
||||
|
||||
static void adjust_rates(struct userdata *u) {
|
||||
struct output *o;
|
||||
pa_usec_t max_sink_latency = 0, min_total_latency = (pa_usec_t) -1, target_latency;
|
||||
|
|
|
|||
|
|
@ -142,7 +142,7 @@ static int do_write(struct userdata *u) {
|
|||
u->write_index = u->write_length = 0;
|
||||
}
|
||||
} else if (u->state == STATE_RUNNING) {
|
||||
pa_module_set_used(u->module, pa_idxset_size(u->sink->inputs) + pa_idxset_size(u->sink->monitor_source->outputs));
|
||||
pa_module_set_used(u->module, pa_sink_used_by(u->sink));
|
||||
|
||||
if (!u->memchunk.length)
|
||||
if (pa_sink_render(u->sink, 8192, &u->memchunk) < 0)
|
||||
|
|
|
|||
|
|
@ -110,10 +110,9 @@ static const char* const valid_modargs[] = {
|
|||
#define DEFAULT_FRAGSIZE 1024
|
||||
|
||||
static void update_usage(struct userdata *u) {
|
||||
pa_module_set_used(u->module,
|
||||
(u->sink ? pa_idxset_size(u->sink->inputs) : 0) +
|
||||
(u->sink ? pa_idxset_size(u->sink->monitor_source->outputs) : 0) +
|
||||
(u->source ? pa_idxset_size(u->source->outputs) : 0));
|
||||
pa_module_set_used(u->module,
|
||||
(u->sink ? pa_sink_used_by(u->sink) : 0) +
|
||||
(u->source ? pa_source_used_by(u->source) : 0));
|
||||
}
|
||||
|
||||
static void clear_up(struct userdata *u) {
|
||||
|
|
|
|||
|
|
@ -100,10 +100,9 @@ static const char* const valid_modargs[] = {
|
|||
#define DEFAULT_DEVICE "/dev/dsp"
|
||||
|
||||
static void update_usage(struct userdata *u) {
|
||||
pa_module_set_used(u->module,
|
||||
(u->sink ? pa_idxset_size(u->sink->inputs) : 0) +
|
||||
(u->sink ? pa_idxset_size(u->sink->monitor_source->outputs) : 0) +
|
||||
(u->source ? pa_idxset_size(u->source->outputs) : 0));
|
||||
pa_module_set_used(u->module,
|
||||
(u->sink ? pa_sink_used_by(u->sink) : 0) +
|
||||
(u->source ? pa_source_used_by(u->source) : 0));
|
||||
}
|
||||
|
||||
static void clear_up(struct userdata *u) {
|
||||
|
|
|
|||
|
|
@ -91,7 +91,7 @@ static void do_write(struct userdata *u) {
|
|||
if (!pa_iochannel_is_writable(u->io))
|
||||
return;
|
||||
|
||||
pa_module_set_used(u->module, pa_idxset_size(u->sink->inputs) + pa_idxset_size(u->sink->monitor_source->outputs));
|
||||
pa_module_set_used(u->module, pa_sink_used_by(u->sink));
|
||||
|
||||
if (!u->memchunk.length)
|
||||
if (pa_sink_render(u->sink, PIPE_BUF, &u->memchunk) < 0)
|
||||
|
|
|
|||
|
|
@ -110,9 +110,8 @@ static const char* const valid_modargs[] = {
|
|||
|
||||
static void update_usage(struct userdata *u) {
|
||||
pa_module_set_used(u->module,
|
||||
(u->sink ? pa_idxset_size(u->sink->inputs) : 0) +
|
||||
(u->sink ? pa_idxset_size(u->sink->monitor_source->outputs) : 0) +
|
||||
(u->source ? pa_idxset_size(u->source->outputs) : 0));
|
||||
(u->sink ? pa_sink_used_by(u->sink) : 0) +
|
||||
(u->source ? pa_source_used_by(u->source) : 0));
|
||||
}
|
||||
|
||||
static void do_write(struct userdata *u) {
|
||||
|
|
|
|||
|
|
@ -103,9 +103,8 @@ static const char* const valid_modargs[] = {
|
|||
|
||||
static void update_usage(struct userdata *u) {
|
||||
pa_module_set_used(u->module,
|
||||
(u->sink ? pa_idxset_size(u->sink->inputs) : 0) +
|
||||
(u->sink ? pa_idxset_size(u->sink->monitor_source->outputs) : 0) +
|
||||
(u->source ? pa_idxset_size(u->source->outputs) : 0));
|
||||
(u->sink ? pa_sink_used_by(u->sink) : 0) +
|
||||
(u->source ? pa_source_used_by(u->source) : 0));
|
||||
}
|
||||
|
||||
static void do_write(struct userdata *u)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue