From: Hemanth Meenakshisundaram <hemanth@highfive.com>
Date: Mon, 21 Apr 2014 00:30:07 +0000 (-0700)
Subject: combine-sink: fix zero adjust_time behaviour.
X-Git-Url: https://code.delx.au/pulseaudio/commitdiff_plain/4bd39f950155be98821a9072bcafed7fccca1a7d

combine-sink: fix zero adjust_time behaviour.

A value of 0 for adjust_time should disable rate adjustment.
Fix a bug where a 0 value causes rate adjustment to be called
continuously instead after an unsuspend event.
---

diff --git a/src/modules/module-combine-sink.c b/src/modules/module-combine-sink.c
index deabcebb..ccb2a493 100644
--- a/src/modules/module-combine-sink.c
+++ b/src/modules/module-combine-sink.c
@@ -610,7 +610,7 @@ static void unsuspend(struct userdata *u) {
     PA_IDXSET_FOREACH(o, u->outputs, idx)
         output_enable(o);
 
-    if (!u->time_event)
+    if (!u->time_event && u->adjust_time > 0)
         u->time_event = pa_core_rttime_new(u->core, pa_rtclock_now() + u->adjust_time, time_callback, u);
 
     pa_log_info("Resumed successfully...");