This is an automated email from the git hooks/post-receive script. It was
generated because of a push to the "PulseAudio Sound Server" repository.
The master branch has been updated
from 611154caca20fc6b3c4240bf3e9c7e78cc403327 (commit)
- Log -----------------------------------------------------------------
98821c7... print the right software volume
-----------------------------------------------------------------------
Summary of changes:
src/modules/alsa/alsa-sink.c | 4 ++--
src/modules/alsa/alsa-source.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
-----------------------------------------------------------------------
commit 98821c783da026a3f56ac48724806317ce052786
Author: Lennart Poettering <[email protected]>
Date: Wed Jan 28 01:31:54 2009 +0100
print the right software volume
diff --git a/src/modules/alsa/alsa-sink.c b/src/modules/alsa/alsa-sink.c
index 4328957..b097f22 100644
--- a/src/modules/alsa/alsa-sink.c
+++ b/src/modules/alsa/alsa-sink.c
@@ -929,11 +929,11 @@ static void sink_set_volume_cb(pa_sink *s) {
char t[PA_CVOLUME_SNPRINT_MAX];
/* Match exactly what the user requested by software */
- pa_sw_cvolume_divide(&s->soft_volume, &s->virtual_volume, &r);
+ pa_sw_cvolume_divide(&s->soft_volume, &s->virtual_volume,
&s->hardware_volume);
pa_log_debug("Requested volume: %s", pa_cvolume_snprint(t, sizeof(t),
&s->virtual_volume));
pa_log_debug("Got hardware volume: %s", pa_cvolume_snprint(t,
sizeof(t), &u->hardware_volume));
- pa_log_debug("Calculated software volume: %s", pa_cvolume_snprint(t,
sizeof(t), &r));
+ pa_log_debug("Calculated software volume: %s", pa_cvolume_snprint(t,
sizeof(t), &s->soft_volume));
} else
diff --git a/src/modules/alsa/alsa-source.c b/src/modules/alsa/alsa-source.c
index 4204297..96bf6a3 100644
--- a/src/modules/alsa/alsa-source.c
+++ b/src/modules/alsa/alsa-source.c
@@ -876,11 +876,11 @@ static void source_set_volume_cb(pa_source *s) {
/* Match exactly what the user requested by software */
- pa_sw_cvolume_divide(&s->soft_volume, &s->virtual_volume, &r);
+ pa_sw_cvolume_divide(&s->soft_volume, &s->virtual_volume,
&s->hardware_volume);
pa_log_debug("Requested volume: %s", pa_cvolume_snprint(t, sizeof(t),
&s->virtual_volume));
pa_log_debug("Got hardware volume: %s", pa_cvolume_snprint(t,
sizeof(t), &u->hardware_volume));
- pa_log_debug("Calculated software volume: %s", pa_cvolume_snprint(t,
sizeof(t), &r));
+ pa_log_debug("Calculated software volume: %s", pa_cvolume_snprint(t,
sizeof(t), &s->soft_volume));
} else
--
hooks/post-receive
PulseAudio Sound Server
_______________________________________________
pulseaudio-commits mailing list
[email protected]
https://tango.0pointer.de/mailman/listinfo/pulseaudio-commits
