make speex-float-3 the default resampler

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1973 fefdeb5f-60dc-0310-8127-8f9354f1896f

diff --git a/src/pulsecore/core.c b/src/pulsecore/core.c
index e9008833d2a6ab43217187b67fe199804b1c21c1..e67f15b565d2038aaa38bffdb8c36855bdec7da1 100644 (file)
--- a/src/pulsecore/core.c
+++ b/src/pulsecore/core.c
@@ -132,7 +132,7 @@ pa_core* pa_core_new(pa_mainloop_api *m, int shared) {
     c->module_idle_time = 20;
     c->scache_idle_time = 20;
 
-    c->resample_method = PA_RESAMPLER_SPEEX_FLOAT_BASE;
+    c->resample_method = PA_RESAMPLER_SPEEX_FLOAT_BASE + 3;
 
     c->is_system_instance = 0;
     c->disallow_module_loading = 0;

diff --git a/src/pulsecore/resampler.c b/src/pulsecore/resampler.c
index 5bbc6bf4412f0962bf77ca8691111aad1f8ecacf..b44471984143bc1cdd99b49dc9fa6a7bbad23d96 100644 (file)
--- a/src/pulsecore/resampler.c
+++ b/src/pulsecore/resampler.c
@@ -195,7 +195,7 @@ pa_resampler* pa_resampler_new(
     }
 
     if (resample_method == PA_RESAMPLER_AUTO)
-        resample_method = PA_RESAMPLER_SPEEX_FLOAT_BASE + 0;
+        resample_method = PA_RESAMPLER_SPEEX_FLOAT_BASE + 3;
 
     r = pa_xnew(pa_resampler, 1);
     r->mempool = pool;
@@ -439,10 +439,10 @@ pa_resample_method_t pa_parse_resample_method(const char *string) {
             return m;
 
     if (!strcmp(string, "speex-fixed"))
-        return PA_RESAMPLER_SPEEX_FIXED_BASE + 0;
+        return PA_RESAMPLER_SPEEX_FIXED_BASE + 3;
 
     if (!strcmp(string, "speex-float"))
-        return PA_RESAMPLER_SPEEX_FLOAT_BASE + 0;
+        return PA_RESAMPLER_SPEEX_FLOAT_BASE + 3;
 
     return PA_RESAMPLER_INVALID;
 }