summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWang Xingchao <xingchao.wang@intel.com>2011-08-05 10:33:17 -0400
committerColin Guthrie <colin@mageia.org>2011-08-11 15:31:48 +0200
commitbe3879e04e890553abcd9dd27307126bf86aac41 (patch)
tree90cbdbf3e55408533f210e36d2121214dace723c
parente564129b8ff6525eaecdd997a907cd6065cb587e (diff)
alsa: resets POLLOUT event
revents marked as POLLOUT|POLLERR|POLLWRNORM in "underrun" case that will trigger unexpected log "ALSA woke us up to write new data to the device, but there was acturally nothing to write...". This patch avoids this log message.
-rw-r--r--src/modules/alsa/alsa-sink.c1
-rw-r--r--src/modules/alsa/alsa-source.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/modules/alsa/alsa-sink.c b/src/modules/alsa/alsa-sink.c
index 395432a5..c4aa75b4 100644
--- a/src/modules/alsa/alsa-sink.c
+++ b/src/modules/alsa/alsa-sink.c
@@ -1670,6 +1670,7 @@ static void thread_func(void *userdata) {
u->first = TRUE;
u->since_start = 0;
+ revents = 0;
} else if (revents && u->use_tsched && pa_log_ratelimit(PA_LOG_DEBUG))
pa_log_debug("Wakeup from ALSA!");
diff --git a/src/modules/alsa/alsa-source.c b/src/modules/alsa/alsa-source.c
index bdd4493d..1dd63f0d 100644
--- a/src/modules/alsa/alsa-source.c
+++ b/src/modules/alsa/alsa-source.c
@@ -1445,6 +1445,7 @@ static void thread_func(void *userdata) {
goto fail;
u->first = TRUE;
+ revents = 0;
} else if (revents && u->use_tsched && pa_log_ratelimit(PA_LOG_DEBUG))
pa_log_debug("Wakeup from ALSA!");