[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.15-test5-78-g39576ec

[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  4edb109239c746c6fb69aa15067c5a125aeefe22 (commit)

- Log -----------------------------------------------------------------
39576ec on monitor source be fine with any latency range set by the sink
6defb1a add missing whitespace
2c1eaa7 copy latency flags from sink to monitor source
-----------------------------------------------------------------------

Summary of changes:
 src/pulsecore/cli-text.c |    2 +-
 src/pulsecore/sink.c     |    8 +++++++-
 src/pulsecore/source.c   |    3 ++-
 3 files changed, 10 insertions(+), 3 deletions(-)

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

commit 2c1eaa75933d8e630e9ba3075aa3b7c5ff458873
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Mar 25 16:30:28 2009 +0100

    copy latency flags from sink to monitor source

diff --git a/src/pulsecore/sink.c b/src/pulsecore/sink.c
index 68f8856..1fe8f59 100644
--- a/src/pulsecore/sink.c
+++ b/src/pulsecore/sink.c
@@ -260,7 +260,7 @@ pa_sink* pa_sink_new(
     pa_proplist_setf(source_data.proplist, PA_PROP_DEVICE_DESCRIPTION, "Monitor of %s", dn ? dn : s->name);
     pa_proplist_sets(source_data.proplist, PA_PROP_DEVICE_CLASS, "monitor");
 
-    s->monitor_source = pa_source_new(core, &source_data, PA_SOURCE_LATENCY);
+    s->monitor_source = pa_source_new(core, &source_data, 0);
 
     pa_source_new_data_done(&source_data);
 
@@ -360,6 +360,12 @@ void pa_sink_put(pa_sink* s) {
         if (s->flags & PA_SINK_DECIBEL_VOLUME)
             s->flags |= PA_SINK_FLAT_VOLUME;
 
+    if (s->flags & PA_SINK_LATENCY)
+        s->monitor_source->flags |= PA_SOURCE_LATENCY;
+
+    if (s->flags & PA_SINK_DYNAMIC_LATENCY)
+        s->monitor_source->flags |= PA_SOURCE_DYNAMIC_LATENCY;
+
     pa_assert_se(sink_set_state(s, PA_SINK_IDLE) == 0);
 
     pa_source_put(s->monitor_source);

commit 6defb1a6bf5c9e51354fc4c1efd3797c6b6b1ee0
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Mar 25 16:30:46 2009 +0100

    add missing whitespace

diff --git a/src/pulsecore/cli-text.c b/src/pulsecore/cli-text.c
index 8d39dcf..324f83c 100644
--- a/src/pulsecore/cli-text.c
+++ b/src/pulsecore/cli-text.c
@@ -255,7 +255,7 @@ char *pa_sink_list_to_string(pa_core *c) {
             sink->flags & PA_SINK_HW_VOLUME_CTRL ? "HW_VOLUME_CTRL " : "",
             sink->flags & PA_SINK_DECIBEL_VOLUME ? "DECIBEL_VOLUME " : "",
             sink->flags & PA_SINK_LATENCY ? "LATENCY " : "",
-            sink->flags & PA_SINK_FLAT_VOLUME ? "FLAT_VOLUME" : "",
+            sink->flags & PA_SINK_FLAT_VOLUME ? "FLAT_VOLUME " : "",
             sink->flags & PA_SINK_DYNAMIC_LATENCY ? "DYNAMIC_LATENCY" : "",
             sink_state_to_string(pa_sink_get_state(sink)),
             pa_cvolume_snprint(cv, sizeof(cv), pa_sink_get_volume(sink, FALSE)),

commit 39576ec829b7576d4ab240526bc6cd76dae5c35b
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Mar 25 16:31:16 2009 +0100

    on monitor source be fine with any latency range set by the sink

diff --git a/src/pulsecore/source.c b/src/pulsecore/source.c
index 5b4378a..1c3377b 100644
--- a/src/pulsecore/source.c
+++ b/src/pulsecore/source.c
@@ -1204,7 +1204,8 @@ void pa_source_set_latency_range_within_thread(pa_source *s, pa_usec_t min_laten
     /* Hmm, let's see if someone forgot to set PA_SOURCE_DYNAMIC_LATENCY here... */
     pa_assert((min_latency == ABSOLUTE_MIN_LATENCY &&
                max_latency == ABSOLUTE_MAX_LATENCY) ||
-              (s->flags & PA_SOURCE_DYNAMIC_LATENCY));
+              (s->flags & PA_SOURCE_DYNAMIC_LATENCY) ||
+              s->monitor_of);
 
     s->thread_info.min_latency = min_latency;
     s->thread_info.max_latency = max_latency;

-- 
hooks/post-receive
PulseAudio Sound Server