[pulseaudio-commits] 2 commits - src/daemon src/pulsecore

[Arun Raghavan]

 src/daemon/main.c             |    1 +
 src/pulsecore/sink-input.c    |    7 ++++---
 src/pulsecore/source-output.c |    7 ++++---
 3 files changed, 9 insertions(+), 6 deletions(-)

New commits:
commit b08237b6c612c349c9a9d19bca435cbb96eb52a7
Author: Arun Raghavan <arun.raghavan at collabora.co.uk>
Date:   Thu Aug 18 12:35:23 2011 +0530

    passthrough: We must not plug in a resampler on stream move

diff --git a/src/pulsecore/sink-input.c b/src/pulsecore/sink-input.c
index 7aee546..4ffa03b 100644
--- a/src/pulsecore/sink-input.c
+++ b/src/pulsecore/sink-input.c
@@ -1608,9 +1608,10 @@ int pa_sink_input_finish_move(pa_sink_input *i, pa_sink *dest, pa_bool_t save) {
         /* Try to reuse the old resampler if possible */
         new_resampler = i->thread_info.resampler;
 
-    else if ((i->flags & PA_SINK_INPUT_VARIABLE_RATE) ||
-             !pa_sample_spec_equal(&i->sample_spec, &dest->sample_spec) ||
-             !pa_channel_map_equal(&i->channel_map, &dest->channel_map)) {
+    else if (!pa_sink_input_is_passthrough(i) &&
+             ((i->flags & PA_SINK_INPUT_VARIABLE_RATE) ||
+              !pa_sample_spec_equal(&i->sample_spec, &dest->sample_spec) ||
+              !pa_channel_map_equal(&i->channel_map, &dest->channel_map))) {
 
         /* Okay, we need a new resampler for the new sink */
 
diff --git a/src/pulsecore/source-output.c b/src/pulsecore/source-output.c
index ce94095..a9e60f8 100644
--- a/src/pulsecore/source-output.c
+++ b/src/pulsecore/source-output.c
@@ -1376,9 +1376,10 @@ int pa_source_output_finish_move(pa_source_output *o, pa_source *dest, pa_bool_t
         /* Try to reuse the old resampler if possible */
         new_resampler = o->thread_info.resampler;
 
-    else if ((o->flags & PA_SOURCE_OUTPUT_VARIABLE_RATE) ||
-             !pa_sample_spec_equal(&o->sample_spec, &dest->sample_spec) ||
-             !pa_channel_map_equal(&o->channel_map, &dest->channel_map)) {
+    else if (!pa_source_output_is_passthrough(o) &&
+             ((o->flags & PA_SOURCE_OUTPUT_VARIABLE_RATE) ||
+              !pa_sample_spec_equal(&o->sample_spec, &dest->sample_spec) ||
+              !pa_channel_map_equal(&o->channel_map, &dest->channel_map))) {
 
         /* Okay, we need a new resampler for the new source */
 

commit 3c854fc00c9b7a598e91d8ec17dc8aef30626559
Author: Arun Raghavan <arun.raghavan at collabora.co.uk>
Date:   Thu Aug 18 12:32:48 2011 +0530

    daemon: Fix compiler warning about missing function prototype

diff --git a/src/daemon/main.c b/src/daemon/main.c
index c620842..e7e5238 100644
--- a/src/daemon/main.c
+++ b/src/daemon/main.c
@@ -72,6 +72,7 @@
 #include <pulsecore/socket.h>
 #include <pulsecore/core-error.h>
 #include <pulsecore/core-rtclock.h>
+#include <pulsecore/core-scache.h>
 #include <pulsecore/core.h>
 #include <pulsecore/module.h>
 #include <pulsecore/cli-command.h>