[pulseaudio-commits] r1896 - /branches/lennart/src/pulsecore/sink-input.c

[svnmailer-noreply at 0pointer.de]

Author: lennart
Date: Mon Sep 24 19:14:00 2007
New Revision: 1896

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=1896&root=pulseaudio&view=rev
Log:
fix stream corking: ignore pa_sink_input() when we are in corked state

Modified:
    branches/lennart/src/pulsecore/sink-input.c

Modified: branches/lennart/src/pulsecore/sink-input.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/src/pulsecore/sink-input.c?rev=1896&root=pulseaudio&r1=1895&r2=1896&view=diff
==============================================================================
--- branches/lennart/src/pulsecore/sink-input.c (original)
+++ branches/lennart/src/pulsecore/sink-input.c Mon Sep 24 19:14:00 2007
@@ -397,7 +397,7 @@
     pa_assert(chunk);
     pa_assert(volume);
 
-    if (!i->peek || !i->drop || i->thread_info.state == PA_SINK_INPUT_UNLINKED || i->thread_info.state == PA_SINK_INPUT_CORKED)
+    if (!i->peek || !i->drop || i->thread_info.state == PA_SINK_INPUT_CORKED)
         goto finish;
 
     pa_assert(i->thread_info.state == PA_SINK_INPUT_RUNNING || i->thread_info.state == PA_SINK_INPUT_DRAINED);
@@ -518,6 +518,9 @@
     pa_assert(pa_frame_aligned(length, &i->sink->sample_spec));
     pa_assert(length > 0);
 
+    if (!i->peek || !i->drop || i->thread_info.state == PA_SINK_INPUT_CORKED)
+        return;
+
     if (i->thread_info.move_silence > 0) {
 
         if (i->thread_info.move_silence >= length) {