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

fix a few more copy/paste errors

Browse source
This commit is contained in:
Lennart Poettering 2008-08-05 14:26:43 +02:00
parent 78236af734
commit f57b9153a8
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/pulsecore/source-output.c
View file

@ -441,7 +441,7 @@ void pa_source_output_push(pa_source_output *o, const pa_memchunk *chunk) {
} }
/* Called from thread context */ /* Called from thread context */
void pa_source_output_process_rewind(pa_source_output *o, size_t nbytes /* in sink sample spec */) { void pa_source_output_process_rewind(pa_source_output *o, size_t nbytes /* in source sample spec */) {
pa_source_output_assert_ref(o); pa_source_output_assert_ref(o);
pa_assert(PA_SOURCE_OUTPUT_IS_LINKED(o->thread_info.state)); pa_assert(PA_SOURCE_OUTPUT_IS_LINKED(o->thread_info.state));
@ -512,7 +512,7 @@ pa_usec_t pa_source_output_set_requested_latency(pa_source_output *o, pa_usec_t
if (PA_SOURCE_OUTPUT_IS_LINKED(o->state)) if (PA_SOURCE_OUTPUT_IS_LINKED(o->state))
pa_assert_se(pa_asyncmsgq_send(o->source->asyncmsgq, PA_MSGOBJECT(o), PA_SOURCE_OUTPUT_MESSAGE_SET_REQUESTED_LATENCY, &usec, 0, NULL) == 0); pa_assert_se(pa_asyncmsgq_send(o->source->asyncmsgq, PA_MSGOBJECT(o), PA_SOURCE_OUTPUT_MESSAGE_SET_REQUESTED_LATENCY, &usec, 0, NULL) == 0);
else { else {
/* If this sink input is not realized yet, we have to touch /* If this source output is not realized yet, we have to touch
* the thread info data directly */ * the thread info data directly */
usec = fixup_latency(o->source, usec); usec = fixup_latency(o->source, usec);
@ -532,7 +532,7 @@ pa_usec_t pa_source_output_get_requested_latency(pa_source_output *o) {
if (PA_SOURCE_OUTPUT_IS_LINKED(o->state)) if (PA_SOURCE_OUTPUT_IS_LINKED(o->state))
pa_assert_se(pa_asyncmsgq_send(o->source->asyncmsgq, PA_MSGOBJECT(o), PA_SOURCE_OUTPUT_MESSAGE_GET_REQUESTED_LATENCY, &usec, 0, NULL) == 0); pa_assert_se(pa_asyncmsgq_send(o->source->asyncmsgq, PA_MSGOBJECT(o), PA_SOURCE_OUTPUT_MESSAGE_GET_REQUESTED_LATENCY, &usec, 0, NULL) == 0);
else else
/* If this sink input is not realized yet, we have to touch /* If this source output is not realized yet, we have to touch
* the thread info data directly */ * the thread info data directly */
usec = o->thread_info.requested_source_latency; usec = o->thread_info.requested_source_latency;

6
src/pulsecore/source.c
View file

@ -260,7 +260,7 @@ static int source_set_state(pa_source *s, pa_source_state_t state) {
for (o = PA_SOURCE_OUTPUT(pa_idxset_first(s->outputs, &idx)); o; o = PA_SOURCE_OUTPUT(pa_idxset_next(s->outputs, &idx))) for (o = PA_SOURCE_OUTPUT(pa_idxset_first(s->outputs, &idx)); o; o = PA_SOURCE_OUTPUT(pa_idxset_next(s->outputs, &idx)))
if (o->suspend) if (o->suspend)
o->suspend(o, state == PA_SINK_SUSPENDED); o->suspend(o, state == PA_SOURCE_SUSPENDED);
} }
if (state != PA_SOURCE_UNLINKED) /* if we enter UNLINKED state pa_source_unlink() will fire the apropriate events */ if (state != PA_SOURCE_UNLINKED) /* if we enter UNLINKED state pa_source_unlink() will fire the apropriate events */
@ -273,7 +273,7 @@ static int source_set_state(pa_source *s, pa_source_state_t state) {
void pa_source_put(pa_source *s) { void pa_source_put(pa_source *s) {
pa_source_assert_ref(s); pa_source_assert_ref(s);
pa_assert(s->state == PA_SINK_INIT); pa_assert(s->state == PA_SOURCE_INIT);
/* The following fields must be initialized properly when calling _put() */ /* The following fields must be initialized properly when calling _put() */
pa_assert(s->asyncmsgq); pa_assert(s->asyncmsgq);
@ -932,7 +932,7 @@ void pa_source_set_latency_range(pa_source *s, pa_usec_t min_latency, pa_usec_t
pa_assert(!min_latency || !max_latency || pa_assert(!min_latency || !max_latency ||
min_latency <= max_latency); min_latency <= max_latency);
if (PA_SINK_IS_LINKED(s->state)) { if (PA_SOURCE_IS_LINKED(s->state)) {
pa_usec_t r[2]; pa_usec_t r[2];
r[0] = min_latency; r[0] = min_latency;