mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-04 13:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

reorder a few things to get rid of an uneeded comparison

Browse source
This commit is contained in:
Lennart Poettering 2008-06-26 19:03:16 +02:00
parent 97084e87c4
commit 4b8c4ef932
1 changed files with 10 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/pulse/stream.c
View file

@ -1371,8 +1371,8 @@ static void stream_get_timing_info_callback(pa_pdispatch *pd, uint32_t command,
int n, j; int n, j;
uint32_t ctag = tag; uint32_t ctag = tag;
/* Go through the saved correction values and add up the total correction.*/ /* Go through the saved correction values and add up the
* total correction.*/
for (n = 0, j = o->stream->current_write_index_correction+1; for (n = 0, j = o->stream->current_write_index_correction+1;
n < PA_MAX_WRITE_INDEX_CORRECTIONS; n < PA_MAX_WRITE_INDEX_CORRECTIONS;
n++, j = (j + 1) % PA_MAX_WRITE_INDEX_CORRECTIONS) { n++, j = (j + 1) % PA_MAX_WRITE_INDEX_CORRECTIONS) {
@ -1388,7 +1388,6 @@ static void stream_get_timing_info_callback(pa_pdispatch *pd, uint32_t command,
/* Now fix the write index */ /* Now fix the write index */
if (o->stream->write_index_corrections[j].corrupt) { if (o->stream->write_index_corrections[j].corrupt) {
/* A corrupting seek was made */ /* A corrupting seek was made */
i->write_index = 0;
i->write_index_corrupt = TRUE; i->write_index_corrupt = TRUE;
} else if (o->stream->write_index_corrections[j].absolute) { } else if (o->stream->write_index_corrections[j].absolute) {
/* An absolute seek was made */ /* An absolute seek was made */
@ -1399,21 +1398,8 @@ static void stream_get_timing_info_callback(pa_pdispatch *pd, uint32_t command,
i->write_index += o->stream->write_index_corrections[j].value; i->write_index += o->stream->write_index_corrections[j].value;
} }
} }
}
if (o->stream->direction == PA_STREAM_RECORD) {
/* Read index correction */
if (!i->read_index_corrupt)
i->read_index -= pa_memblockq_get_length(o->stream->record_memblockq);
}
/* pa_log("post corrupt w:%u r:%u\n", i->write_index_corrupt || !o->stream->timing_info_valid, i->read_index_corrupt || !o->stream->timing_info_valid); */
/* Clear old correction entries */ /* Clear old correction entries */
if (o->stream->direction == PA_STREAM_PLAYBACK) {
int n;
for (n = 0; n < PA_MAX_WRITE_INDEX_CORRECTIONS; n++) { for (n = 0; n < PA_MAX_WRITE_INDEX_CORRECTIONS; n++) {
if (!o->stream->write_index_corrections[n].valid) if (!o->stream->write_index_corrections[n].valid)
continue; continue;
@ -1423,6 +1409,13 @@ static void stream_get_timing_info_callback(pa_pdispatch *pd, uint32_t command,
} }
} }
if (o->stream->direction == PA_STREAM_RECORD) {
/* Read index correction */
if (!i->read_index_corrupt)
i->read_index -= pa_memblockq_get_length(o->stream->record_memblockq);
}
/* Update smoother */ /* Update smoother */
if (o->stream->smoother) { if (o->stream->smoother) {
pa_usec_t u, x; pa_usec_t u, x;