Makefile.am | 3 +++
src/modules/module-udev-detect.c | 17 ++++++++++++++---
src/tests/test-daemon.sh | 6 ++++--
3 files changed, 21 insertions(+), 5 deletions(-)
New commits:
commit 3b3d26813f3e2091f42fa3e6a6f4b8cc04a913e9
Author: Tanu Kaskinen <ta...@iki.fi>
Date: Tue Jan 29 10:56:22 2013 +0200
tests: Indicate failure in test-daemon.sh by returning 1 if any test fails.
diff --git a/src/tests/test-daemon.sh b/src/tests/test-daemon.sh
index 264e169..c1907a1 100755
--- a/src/tests/test-daemon.sh
+++ b/src/tests/test-daemon.sh
@@ -52,8 +52,10 @@ sleep 5
unset DISPLAY
+EXIT_CODE=0
+
for ONE_TEST in $@; do
- ${ONE_TEST}
+ ${ONE_TEST} || EXIT_CODE=1
done
# terminate the designated pulseaudio daemon
@@ -68,4 +70,4 @@ sleep 2
## be sure it really died
kill -9 $DBUS_SESSION_BUS_PID > /dev/null 2>&1 || true
-exit 0
+exit $EXIT_CODE
commit 3d81bdd04addc2d51eab4fc7daff9f98ea54811c
Author: Tanu Kaskinen <ta...@iki.fi>
Date: Tue Jan 29 10:53:19 2013 +0200
build-sys: Add check-daemon target to the top-level Makefile.am.
diff --git a/Makefile.am b/Makefile.am
index 6de3e7a..b0b2553 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -86,6 +86,9 @@ dist-hook:
echo $(VERSION) > $(distdir)/.tarball-version
echo $(VERSION) > $(distdir)/.version
+check-daemon:
+ $(MAKE) -C src check-daemon
+
.PHONY: homepage distcleancheck doxygen
# see git-version-gen
commit 4963db8dc0febe9e90c5256dd2aecb4bcf408b37
Author: Tanu Kaskinen <ta...@iki.fi>
Date: Wed Feb 6 14:11:40 2013 +0200
udev: Add use_ucm module argument
diff --git a/src/modules/module-udev-detect.c b/src/modules/module-udev-detect.c
index ea4893e..185c179 100644
--- a/src/modules/module-udev-detect.c
+++ b/src/modules/module-udev-detect.c
@@ -47,7 +47,8 @@ PA_MODULE_USAGE(
"tsched=<enable system timer based scheduling mode?> "
"fixed_latency_range=<disable latency range changes on underrun?> "
"ignore_dB=<ignore dB information from the device?> "
- "deferred_volume=<syncronize sw and hw volume changes in IO-thread?>");
+ "deferred_volume=<syncronize sw and hw volume changes in IO-thread?> "
+ "use_ucm=<use ALSA UCM for card configuration?>");
struct device {
char *path;
@@ -66,6 +67,7 @@ struct userdata {
pa_bool_t fixed_latency_range:1;
pa_bool_t ignore_dB:1;
pa_bool_t deferred_volume:1;
+ bool use_ucm:1;
struct udev* udev;
struct udev_monitor *monitor;
@@ -80,6 +82,7 @@ static const char* const valid_modargs[] = {
"fixed_latency_range",
"ignore_dB",
"deferred_volume",
+ "use_ucm",
NULL
};
@@ -396,6 +399,7 @@ static void card_changed(struct userdata *u, struct
udev_device *dev) {
"fixed_latency_range=%s "
"ignore_dB=%s "
"deferred_volume=%s "
+ "use_ucm=%s "
"card_properties=\"module-udev-detect.discovered=1\"",
path_get_card_id(path),
n,
@@ -403,7 +407,8 @@ static void card_changed(struct userdata *u, struct
udev_device *dev) {
pa_yes_no(u->use_tsched),
pa_yes_no(u->fixed_latency_range),
pa_yes_no(u->ignore_dB),
- pa_yes_no(u->deferred_volume));
+ pa_yes_no(u->deferred_volume),
+ pa_yes_no(u->use_ucm));
pa_xfree(n);
pa_hashmap_put(u->devices, d->path, d);
@@ -670,7 +675,7 @@ int pa__init(pa_module *m) {
struct udev_list_entry *item = NULL, *first = NULL;
int fd;
pa_bool_t use_tsched = TRUE, fixed_latency_range = FALSE, ignore_dB =
FALSE, deferred_volume = m->core->deferred_volume;
-
+ bool use_ucm = true;
pa_assert(m);
@@ -708,6 +713,12 @@ int pa__init(pa_module *m) {
}
u->deferred_volume = deferred_volume;
+ if (pa_modargs_get_value_boolean(ma, "use_ucm", &use_ucm) < 0) {
+ pa_log("Failed to parse use_ucm= argument.");
+ goto fail;
+ }
+ u->use_ucm = use_ucm;
+
if (!(u->udev = udev_new())) {
pa_log("Failed to initialize udev library.");
goto fail;
_______________________________________________
pulseaudio-commits mailing list
pulseaudio-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/pulseaudio-commits
