mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-05 13:29:57 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge glitch-free branch back into trunk

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@2445 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2008-05-15 23:34:41 +00:00
parent 91f092eadc
commit 045c1d602d
189 changed files with 12559 additions and 4959 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/utils/padsp.c
View file

@ -53,8 +53,8 @@
#endif
#include <pulse/pulseaudio.h>
#include <pulse/gccmacro.h>
#include <pulsecore/llist.h>
#include <pulsecore/gccmacro.h>
/* On some systems SIOCINQ isn't defined, but FIONREAD is just an alias */
#if !defined(SIOCINQ) && defined(FIONREAD)
@ -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;