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

9 files changed, 15 insertions, 25 deletions

diff --git a/src/modules/module-alsa-sink.c b/src/modules/module-alsa-sink.c
index e14cc5c81..8da3d2360 100644
--- a/src/modules/module-alsa-sink.c
+++ b/src/modules/module-alsa-sink.c
@@ -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) {
diff --git a/src/modules/module-alsa-source.c b/src/modules/module-alsa-source.c
index b4ef09d99..4a8678c9c 100644
--- a/src/modules/module-alsa-source.c
+++ b/src/modules/module-alsa-source.c
@@ -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) {
diff --git a/src/modules/module-combine.c b/src/modules/module-combine.c
index 0a5bd4720..9368aed86 100644
--- a/src/modules/module-combine.c
+++ b/src/modules/module-combine.c
@@ -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;
diff --git a/src/modules/module-esound-sink.c b/src/modules/module-esound-sink.c
index 9f0c2c5b0..c774d8c1b 100644
--- a/src/modules/module-esound-sink.c
+++ b/src/modules/module-esound-sink.c
@@ -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)
diff --git a/src/modules/module-oss-mmap.c b/src/modules/module-oss-mmap.c
index 21a23d75a..c783a2f1f 100644
--- a/src/modules/module-oss-mmap.c
+++ b/src/modules/module-oss-mmap.c
@@ -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) {
diff --git a/src/modules/module-oss.c b/src/modules/module-oss.c
index 89a8152bc..ce11ee025 100644
--- a/src/modules/module-oss.c
+++ b/src/modules/module-oss.c
@@ -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) {
diff --git a/src/modules/module-pipe-sink.c b/src/modules/module-pipe-sink.c
index cc5276d48..c90039fd7 100644
--- a/src/modules/module-pipe-sink.c
+++ b/src/modules/module-pipe-sink.c
@@ -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)
diff --git a/src/modules/module-solaris.c b/src/modules/module-solaris.c
index 21a72b38a..53c73af79 100644
--- a/src/modules/module-solaris.c
+++ b/src/modules/module-solaris.c
@@ -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) {
diff --git a/src/modules/module-waveout.c b/src/modules/module-waveout.c
index 27e8de580..5f55c2027 100644
--- a/src/modules/module-waveout.c
+++ b/src/modules/module-waveout.c
@@ -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)