[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.12-99-g3853070
Lennart Poettering
gitmailer-noreply at 0pointer.de
Tue Sep 30 19:15:29 PDT 2008
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 4b67ea166ab9e95f2e483c23449a2fbc0af48f7e (commit)
- Log -----------------------------------------------------------------
3853070... don't hit an assert if a kernel driver reports invalid dB information, instead just warn the user
5d18b62... remove useless log message
-----------------------------------------------------------------------
Summary of changes:
src/modules/module-alsa-sink.c | 20 ++++++++++++--------
src/modules/module-alsa-source.c | 21 ++++++++++++---------
src/modules/rtp/module-rtp-recv.c | 2 +-
3 files changed, 25 insertions(+), 18 deletions(-)
-----------------------------------------------------------------------
commit 5d18b6203350e061cad8ecb1da42102229f0e068
Author: Lennart Poettering <lennart at poettering.net>
Date: Wed Oct 1 03:54:01 2008 +0200
remove useless log message
diff --git a/src/modules/rtp/module-rtp-recv.c b/src/modules/rtp/module-rtp-recv.c
index 0163789..e35773c 100644
--- a/src/modules/rtp/module-rtp-recv.c
+++ b/src/modules/rtp/module-rtp-recv.c
@@ -249,7 +249,7 @@ static int rtpoll_work_cb(pa_rtpoll_item *i) {
pa_memblockq_seek(s->memblockq, (int64_t) chunk.length, PA_SEEK_RELATIVE);
}
- pa_log("blocks in q: %u", pa_memblockq_get_nblocks(s->memblockq));
+/* pa_log("blocks in q: %u", pa_memblockq_get_nblocks(s->memblockq)); */
pa_memblock_unref(chunk.memblock);
commit 3853070a21b1b71623c9f8f260bf46aeb6934716
Author: Lennart Poettering <lennart at poettering.net>
Date: Wed Oct 1 04:15:05 2008 +0200
don't hit an assert if a kernel driver reports invalid dB information, instead just warn the user
diff --git a/src/modules/module-alsa-sink.c b/src/modules/module-alsa-sink.c
index a4180d3..8f90774 100644
--- a/src/modules/module-alsa-sink.c
+++ b/src/modules/module-alsa-sink.c
@@ -1474,14 +1474,15 @@ int pa__init(pa_module*m) {
pa_assert(u->mixer_elem);
if (snd_mixer_selem_has_playback_volume(u->mixer_elem)) {
- pa_bool_t suitable = TRUE;
+ pa_bool_t suitable = FALSE;
- if (snd_mixer_selem_get_playback_volume_range(u->mixer_elem, &u->hw_volume_min, &u->hw_volume_max) < 0) {
+ if (snd_mixer_selem_get_playback_volume_range(u->mixer_elem, &u->hw_volume_min, &u->hw_volume_max) < 0)
pa_log_info("Failed to get volume range. Falling back to software volume control.");
- suitable = FALSE;
- } else {
+ else if (u->hw_volume_min >= u->hw_volume_max)
+ pa_log_warn("Your kernel driver is broken: it reports a volume range from %li to %li which makes no sense.", u->hw_volume_min, u->hw_volume_max);
+ else {
pa_log_info("Volume ranges from %li to %li.", u->hw_volume_min, u->hw_volume_max);
- pa_assert(u->hw_volume_min < u->hw_volume_max);
+ suitable = TRUE;
}
if (snd_mixer_selem_get_playback_dB_range(u->mixer_elem, &u->hw_dB_min, &u->hw_dB_max) < 0)
@@ -1492,9 +1493,12 @@ int pa__init(pa_module*m) {
VALGRIND_MAKE_MEM_DEFINED(&u->hw_dB_max, sizeof(u->hw_dB_max));
#endif
- pa_log_info("Volume ranges from %0.2f dB to %0.2f dB.", (double) u->hw_dB_min/100.0, (double) u->hw_dB_max/100.0);
- pa_assert(u->hw_dB_min < u->hw_dB_max);
- u->hw_dB_supported = TRUE;
+ if (u->hw_dB_min >= u->hw_dB_max)
+ pa_log_warn("Your kernel driver is broken: it reports a volume range from %0.2f dB to %0.2f dB which makes no sense.", (double) u->hw_dB_min/100.0, (double) u->hw_dB_max/100.0);
+ else {
+ pa_log_info("Volume ranges from %0.2f dB to %0.2f dB.", (double) u->hw_dB_min/100.0, (double) u->hw_dB_max/100.0);
+ u->hw_dB_supported = TRUE;
+ }
}
if (suitable &&
diff --git a/src/modules/module-alsa-source.c b/src/modules/module-alsa-source.c
index 6492839..d5e2170 100644
--- a/src/modules/module-alsa-source.c
+++ b/src/modules/module-alsa-source.c
@@ -1295,14 +1295,15 @@ int pa__init(pa_module*m) {
pa_assert(u->mixer_elem);
if (snd_mixer_selem_has_capture_volume(u->mixer_elem)) {
- pa_bool_t suitable = TRUE;
+ pa_bool_t suitable = FALSE;
- if (snd_mixer_selem_get_capture_volume_range(u->mixer_elem, &u->hw_volume_min, &u->hw_volume_max) < 0) {
+ if (snd_mixer_selem_get_capture_volume_range(u->mixer_elem, &u->hw_volume_min, &u->hw_volume_max) < 0)
pa_log_info("Failed to get volume range. Falling back to software volume control.");
- suitable = FALSE;
- } else {
+ else if (u->hw_volume_min >= u->hw_volume_max)
+ pa_log_warn("Your kernel driver is broken: it reports a volume range from %li to %li which makes no sense.", u->hw_volume_min, u->hw_volume_max);
+ else {
pa_log_info("Volume ranges from %li to %li.", u->hw_volume_min, u->hw_volume_max);
- pa_assert(u->hw_volume_min < u->hw_volume_max);
+ suitable = TRUE;
}
if (snd_mixer_selem_get_capture_dB_range(u->mixer_elem, &u->hw_dB_min, &u->hw_dB_max) < 0)
@@ -1313,9 +1314,12 @@ int pa__init(pa_module*m) {
VALGRIND_MAKE_MEM_DEFINED(&u->hw_dB_max, sizeof(u->hw_dB_max));
#endif
- pa_log_info("Volume ranges from %0.2f dB to %0.2f dB.", (double) u->hw_dB_min/100.0, (double) u->hw_dB_max/100.0);
- pa_assert(u->hw_dB_min < u->hw_dB_max);
- u->hw_dB_supported = TRUE;
+ if (u->hw_dB_min >= u->hw_dB_max)
+ pa_log_warn("Your kernel driver is broken: it reports a volume range from %0.2f dB to %0.2f dB which makes no sense.", (double) u->hw_dB_min/100.0, (double) u->hw_dB_max/100.0);
+ else {
+ pa_log_info("Volume ranges from %0.2f dB to %0.2f dB.", (double) u->hw_dB_min/100.0, (double) u->hw_dB_max/100.0);
+ u->hw_dB_supported = TRUE;
+ }
}
if (suitable &&
@@ -1326,7 +1330,6 @@ int pa__init(pa_module*m) {
suitable = FALSE;
}
-
if (suitable) {
u->mixer_seperate_channels = pa_alsa_calc_mixer_map(u->mixer_elem, &map, u->mixer_map, FALSE) >= 0;
--
hooks/post-receive
PulseAudio Sound Server
More information about the pulseaudio-commits
mailing list