merge glitch-free branch back into trunk

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@2445 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2008-05-15 23:34:41 +00:00
parent 91f092eadc
commit 045c1d602d
189 changed files with 12559 additions and 4959 deletions

View file

@ -44,7 +44,7 @@ static void producer(void *_q) {
pa_asyncq_push(q, PA_UINT_TO_PTR(i+1), 1);
}
pa_asyncq_push(q, PA_UINT_TO_PTR(-1), 1);
pa_asyncq_push(q, PA_UINT_TO_PTR(-1), TRUE);
printf("pushed end\n");
}
@ -56,7 +56,7 @@ static void consumer(void *_q) {
sleep(1);
for (i = 0;; i++) {
p = pa_asyncq_pop(q, 1);
p = pa_asyncq_pop(q, TRUE);
if (p == PA_UINT_TO_PTR(-1))
break;