summaryrefslogtreecommitdiffstats
path: root/polyp/source-output.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2004-09-17 21:10:05 +0000
committerLennart Poettering <lennart@poettering.net>2004-09-17 21:10:05 +0000
commit61ec86c90f1964ab9663b7a72a0885078d372683 (patch)
treeb5409bf14cb0f01d3256f5901b00e58300d7617a /polyp/source-output.c
parent08953564bb85356869a1f043b82d1f365c8729a1 (diff)
add resample_method option module-combine
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@215 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'polyp/source-output.c')
-rw-r--r--polyp/source-output.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/polyp/source-output.c b/polyp/source-output.c
index 252c155c..13b39658 100644
--- a/polyp/source-output.c
+++ b/polyp/source-output.c
@@ -33,7 +33,7 @@
#include "subscribe.h"
#include "log.h"
-struct pa_source_output* pa_source_output_new(struct pa_source *s, const char *name, const struct pa_sample_spec *spec) {
+struct pa_source_output* pa_source_output_new(struct pa_source *s, const char *name, const struct pa_sample_spec *spec, int resample_method) {
struct pa_source_output *o;
struct pa_resampler *resampler = NULL;
int r;
@@ -44,8 +44,11 @@ struct pa_source_output* pa_source_output_new(struct pa_source *s, const char *n
return NULL;
}
+ if (resample_method < 0)
+ resample_method = s->core->resample_method;
+
if (!pa_sample_spec_equal(&s->sample_spec, spec))
- if (!(resampler = pa_resampler_new(&s->sample_spec, spec, s->core->memblock_stat, s->core->resample_method)))
+ if (!(resampler = pa_resampler_new(&s->sample_spec, spec, s->core->memblock_stat, resample_method)))
return NULL;
o = pa_xmalloc(sizeof(struct pa_source_output));