[etoys-dev] [SVN][660] * on Linux, prefer PulseAudio driver over OSS

[commits at etoys.squeak.org]

Repository: http://etoys.squeak.org/svn

Revision: 660
Author:   bf
Date:     2010-10-14 07:19:46 +0000 (Thu, 14 Oct 2010)
Log Message:
-----------
* on Linux, prefer PulseAudio driver over OSS
* remove unneeded VM modules

Modified Paths:
--------------
    trunk/VM/to-go/etoys.sh

Removed Paths:
-------------
    trunk/VM/Linux-i686/so.vm-display-custom
    trunk/VM/Linux-i686/so.vm-sound-custom

-------------- next part --------------
Deleted: trunk/VM/Linux-i686/so.vm-display-custom
===================================================================
(Binary files differ)

Deleted: trunk/VM/Linux-i686/so.vm-sound-custom
===================================================================
(Binary files differ)

Modified: trunk/VM/to-go/etoys.sh
===================================================================
--- trunk/VM/to-go/etoys.sh	2010-10-14 06:14:04 UTC (rev 659)
+++ trunk/VM/to-go/etoys.sh	2010-10-14 07:19:46 UTC (rev 660)
@@ -89,11 +89,15 @@
     esac
 fi
 
-# if pulseaudio is running, fall back to OSS
+# if pulseaudio is running, use it if VM has the driver, or fall back to OSS
 if pulseaudio --check 2>/dev/null ; then
-    VMOPTIONS="$VMOPTIONS -vm-sound-oss"
-    if padsp true 2>/dev/null ; then
-        WRAPPER=padsp
+    if "$VM" -help 2> /dev/null | grep -q vm-sound-pulse ; then
+        VMOPTIONS="$VMOPTIONS -vm-sound-pulse"
+    else
+        VMOPTIONS="$VMOPTIONS -vm-sound-oss"
+        if padsp true 2>/dev/null ; then
+            WRAPPER=padsp
+        fi
     fi
 fi