[pulseaudio-commits] Branch 'next' - src/modules

[David Henningsson]

 src/modules/module-suspend-on-idle.c |   13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

New commits:
commit cfccf0ee45a8b9a83cd440ac71a638fb799f05c5
Author: David Henningsson <david.henningsson at canonical.com>
Date:   Tue Feb 25 16:56:49 2014 +0100

    suspend-on-idle: Ensure we still time out if a stream remains corked
    
    If a stream is started corked and remains corked, the sink/source
    remained idle without being properly suspended. This patch fixes
    that issue.
    
    BugLink: https://bugs.launchpad.net/bugs/1284415
    Tested-by: Ricardo Salveti <ricardo.salveti at canonical.com>
    Signed-off-by: David Henningsson <david.henningsson at canonical.com>

diff --git a/src/modules/module-suspend-on-idle.c b/src/modules/module-suspend-on-idle.c
index 0585e51..959de43 100644
--- a/src/modules/module-suspend-on-idle.c
+++ b/src/modules/module-suspend-on-idle.c
@@ -141,10 +141,14 @@ static pa_hook_result_t sink_input_fixate_hook_cb(pa_core *c, pa_sink_input_new_
 
     /* We need to resume the audio device here even for
      * PA_SINK_INPUT_START_CORKED, since we need the device parameters
-     * to be fully available while the stream is set up. */
+     * to be fully available while the stream is set up. In that case,
+     * make sure we close the sink again after the timeout interval. */
 
-    if ((d = pa_hashmap_get(u->device_infos, data->sink)))
+    if ((d = pa_hashmap_get(u->device_infos, data->sink))) {
         resume(d);
+        if (pa_sink_check_suspend(d->sink) <= 0)
+            restart(d);
+    }
 
     return PA_HOOK_OK;
 }
@@ -161,8 +165,11 @@ static pa_hook_result_t source_output_fixate_hook_cb(pa_core *c, pa_source_outpu
     else
         d = pa_hashmap_get(u->device_infos, data->source);
 
-    if (d)
+    if (d) {
         resume(d);
+        if (pa_source_check_suspend(d->source) <= 0)
+            restart(d);
+    }
 
     return PA_HOOK_OK;
 }