diff options
| author | Lennart Poettering <lennart@poettering.net> | 2008-05-01 19:15:49 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2008-05-01 19:15:49 +0000 |
| commit | 4f99c431d0122ba1256b5f8793adfa86d21e17ce (patch) | |
| tree | 0dfe2e855d078c4d83c659070184fbce446f3c55 | |
| parent | 18ad6f845eee212f38053ee0ff0f066f20da3a97 (diff) | |
check for $PULSE_INTERNAL before enabling padsp
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/glitch-free@2321 fefdeb5f-60dc-0310-8127-8f9354f1896f
| -rw-r--r-- | src/utils/padsp.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/utils/padsp.c b/src/utils/padsp.c index 6ab022ee..e43a0de2 100644 --- a/src/utils/padsp.c +++ b/src/utils/padsp.c @@ -302,7 +302,6 @@ static int padsp_disabled(void) { if (!sym_resolved) { sym = (int*) dlsym(RTLD_DEFAULT, "__padsp_disabled__"); sym_resolved = 1; - } pthread_mutex_unlock(&func_mutex); @@ -316,7 +315,7 @@ static int dsp_cloak_enable(void) { if (padsp_disabled() & 1) return 0; - if (getenv("PADSP_NO_DSP")) + if (getenv("PADSP_NO_DSP") || getenv("PULSE_INTERNAL")) return 0; return 1; @@ -326,7 +325,7 @@ static int sndstat_cloak_enable(void) { if (padsp_disabled() & 2) return 0; - if (getenv("PADSP_NO_SNDSTAT")) + if (getenv("PADSP_NO_SNDSTAT") || getenv("PULSE_INTERNAL")) return 0; return 1; @@ -336,7 +335,7 @@ static int mixer_cloak_enable(void) { if (padsp_disabled() & 4) return 0; - if (getenv("PADSP_NO_MIXER")) + if (getenv("PADSP_NO_MIXER") || getenv("PULSE_INTERNAL")) return 0; return 1; |