[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.11-58-gf57b915

[Lennart Poettering]

This is an automated email from the git hooks/post-receive script. It was
generated because of a push to the "PulseAudio Sound Server" repository.

The master branch has been updated
      from  78236af7349984c849b40765d6d0393be139fe0f (commit)

- Log -----------------------------------------------------------------
f57b915... fix a few more copy/paste errors
-----------------------------------------------------------------------

Summary of changes:
 src/pulsecore/source-output.c |    6 +++---
 src/pulsecore/source.c        |    6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

-----------------------------------------------------------------------

commit f57b9153a844f3026af1d90b0d56e038f49ff54e
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Aug 5 14:26:43 2008 +0200

    fix a few more copy/paste errors

diff --git a/src/pulsecore/source-output.c b/src/pulsecore/source-output.c
index 368c9cf..dbf3af9 100644
--- a/src/pulsecore/source-output.c
+++ b/src/pulsecore/source-output.c
@@ -441,7 +441,7 @@ void pa_source_output_push(pa_source_output *o, const pa_memchunk *chunk) {
 }
 
 /* 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_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))
         pa_assert_se(pa_asyncmsgq_send(o->source->asyncmsgq, PA_MSGOBJECT(o), PA_SOURCE_OUTPUT_MESSAGE_SET_REQUESTED_LATENCY, &usec, 0, NULL) == 0);
     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 */
 
         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))
         pa_assert_se(pa_asyncmsgq_send(o->source->asyncmsgq, PA_MSGOBJECT(o), PA_SOURCE_OUTPUT_MESSAGE_GET_REQUESTED_LATENCY, &usec, 0, NULL) == 0);
     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 */
         usec = o->thread_info.requested_source_latency;
 
diff --git a/src/pulsecore/source.c b/src/pulsecore/source.c
index 95007af..3162069 100644
--- a/src/pulsecore/source.c
+++ b/src/pulsecore/source.c
@@ -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)))
             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 */
@@ -273,7 +273,7 @@ static int source_set_state(pa_source *s, pa_source_state_t state) {
 void pa_source_put(pa_source *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() */
     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 ||
               min_latency <= max_latency);
 
-    if (PA_SINK_IS_LINKED(s->state)) {
+    if (PA_SOURCE_IS_LINKED(s->state)) {
         pa_usec_t r[2];
 
         r[0] = min_latency;

-- 
hooks/post-receive
PulseAudio Sound Server