[pulseaudio-commits] r2321 - /branches/glitch-free/src/utils/padsp.c

[svnmailer-noreply at 0pointer.de]

Author: lennart
Date: Thu May  1 21:15:49 2008
New Revision: 2321

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=2321&root=pulseaudio&view=rev
Log:
check for $PULSE_INTERNAL before enabling padsp

Modified:
    branches/glitch-free/src/utils/padsp.c

Modified: branches/glitch-free/src/utils/padsp.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/glitch-free/src/utils/padsp.c?rev=2321&root=pulseaudio&r1=2320&r2=2321&view=diff
==============================================================================
--- branches/glitch-free/src/utils/padsp.c (original)
+++ branches/glitch-free/src/utils/padsp.c Thu May  1 21:15:49 2008
@@ -302,7 +302,6 @@
     if (!sym_resolved) {
         sym = (int*) dlsym(RTLD_DEFAULT, "__padsp_disabled__");
         sym_resolved = 1;
-
     }
     pthread_mutex_unlock(&func_mutex);
 
@@ -316,7 +315,7 @@
     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 @@
     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 @@
     if (padsp_disabled() & 4)
         return 0;
 
-    if (getenv("PADSP_NO_MIXER"))
+    if (getenv("PADSP_NO_MIXER") || getenv("PULSE_INTERNAL"))
         return 0;
 
     return 1;