summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2008-10-04 01:48:13 +0200
committerLennart Poettering <lennart@poettering.net>2008-10-04 01:48:13 +0200
commit83b1d7a305dfdf0a6958ba28a84cd1a074ca7aff (patch)
tree6084b9f20ca0213ca6e8ce2b299953c076695c48 /src
parentda4ad5ed01c02f6390c0e4e741734184707f655e (diff)
get rid of pa_alsa_volume_divide() since we have pa_sw_volume_divide() now
Diffstat (limited to 'src')
-rw-r--r--src/modules/alsa-util.c24
-rw-r--r--src/modules/alsa-util.h2
-rw-r--r--src/modules/module-alsa-sink.c2
-rw-r--r--src/modules/module-alsa-source.c2
4 files changed, 2 insertions, 28 deletions
diff --git a/src/modules/alsa-util.c b/src/modules/alsa-util.c
index c3eb72f5..ffe7795e 100644
--- a/src/modules/alsa-util.c
+++ b/src/modules/alsa-util.c
@@ -1109,27 +1109,3 @@ pa_rtpoll_item* pa_alsa_build_pollfd(snd_pcm_t *pcm, pa_rtpoll *rtpoll) {
return item;
}
-
-pa_cvolume *pa_alsa_volume_divide(pa_cvolume *r, const pa_cvolume *t) {
- unsigned i;
-
- pa_assert(r);
- pa_assert(t);
- pa_assert(r->channels == t->channels);
-
- for (i = 0; i < r->channels; i++) {
- double a, b, c;
-
- a = pa_sw_volume_to_linear(r->values[i]); /* the hw volume */
- b = pa_sw_volume_to_linear(t->values[i]); /* the intended volume */
-
- if (a <= 0)
- c = 0;
- else
- c = b / a;
-
- r->values[i] = pa_sw_volume_from_linear(c);
- }
-
- return r;
-}
diff --git a/src/modules/alsa-util.h b/src/modules/alsa-util.h
index 7991a107..b66adc13 100644
--- a/src/modules/alsa-util.h
+++ b/src/modules/alsa-util.h
@@ -92,6 +92,4 @@ int pa_alsa_recover_from_poll(snd_pcm_t *pcm, int revents);
pa_rtpoll_item* pa_alsa_build_pollfd(snd_pcm_t *pcm, pa_rtpoll *rtpoll);
-pa_cvolume *pa_alsa_volume_divide(pa_cvolume *r, const pa_cvolume *t);
-
#endif
diff --git a/src/modules/module-alsa-sink.c b/src/modules/module-alsa-sink.c
index be463bbf..c42da36f 100644
--- a/src/modules/module-alsa-sink.c
+++ b/src/modules/module-alsa-sink.c
@@ -936,7 +936,7 @@ static int sink_set_volume_cb(pa_sink *s) {
/* Match exactly what the user requested by software */
- pa_alsa_volume_divide(&r, &s->volume);
+ pa_sw_cvolume_divide(&r, &s->volume, &r);
pa_sink_set_soft_volume(s, &r);
pa_log_debug("Requested volume: %s", pa_cvolume_snprint(t, sizeof(t), &s->volume));
diff --git a/src/modules/module-alsa-source.c b/src/modules/module-alsa-source.c
index d5e21704..e1fe4d68 100644
--- a/src/modules/module-alsa-source.c
+++ b/src/modules/module-alsa-source.c
@@ -881,7 +881,7 @@ static int source_set_volume_cb(pa_source *s) {
/* Match exactly what the user requested by software */
- pa_alsa_volume_divide(&r, &s->volume);
+ pa_sw_cvolume_divide(&r, &s->volume, &r);
pa_source_set_soft_volume(s, &r);
pa_log_debug("Requested volume: %s", pa_cvolume_snprint(t, sizeof(t), &s->volume));