summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMarc-André Lureau <marc-andre.lureau@nokia.com>2009-05-12 01:48:05 +0300
committerLennart Poettering <lennart@poettering.net>2009-05-12 01:33:37 +0200
commit4c3aef367ba344eccdab5f7f25ec656816c78403 (patch)
treebb85be29b91862aaa9213d6446714bb3a5c0dce1 /src
parenta7a7358fb32e0e2b7c21dfa76ff993253994d488 (diff)
suspend-on-idle: add per-device timeout property
Diffstat (limited to 'src')
-rw-r--r--src/modules/module-suspend-on-idle.c16
1 files changed, 13 insertions, 3 deletions
diff --git a/src/modules/module-suspend-on-idle.c b/src/modules/module-suspend-on-idle.c
index 7e17f8f7..cc69d74c 100644
--- a/src/modules/module-suspend-on-idle.c
+++ b/src/modules/module-suspend-on-idle.c
@@ -27,6 +27,7 @@
#include <pulse/timeval.h>
#include <pulsecore/core.h>
+#include <pulsecore/core-util.h>
#include <pulsecore/sink-input.h>
#include <pulsecore/source-output.h>
#include <pulsecore/modargs.h>
@@ -98,17 +99,26 @@ static void timeout_cb(pa_mainloop_api*a, pa_time_event* e, const struct timeval
static void restart(struct device_info *d) {
struct timeval tv;
+ const char *s;
+ uint32_t timeout;
pa_assert(d);
+ pa_assert(d->sink || d->source);
pa_gettimeofday(&tv);
d->last_use = tv;
- pa_timeval_add(&tv, d->userdata->timeout*1000000);
+
+ s = pa_proplist_gets(d->sink ? d->sink->proplist : d->source->proplist, "module-suspend-on-idle.timeout");
+ if (!s || pa_atou(s, &timeout) < 0)
+ timeout = d->userdata->timeout;
+
+ pa_timeval_add(&tv, timeout * PA_USEC_PER_SEC);
+
d->userdata->core->mainloop->time_restart(d->time_event, &tv);
if (d->sink)
- pa_log_debug("Sink %s becomes idle.", d->sink->name);
+ pa_log_debug("Sink %s becomes idle, timeout in %u seconds.", d->sink->name, timeout);
if (d->source)
- pa_log_debug("Source %s becomes idle.", d->source->name);
+ pa_log_debug("Source %s becomes idle, timeout in %u seconds.", d->source->name, timeout);
}
static void resume(struct device_info *d) {