update default configuration

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

diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in
index af2a67893e88c84a8c19b700226dd8478334e1df..47d3e7971c79e01fb40ab08acfd54d48f9722bf1 100755 (executable)
--- a/src/daemon/default.pa.in
+++ b/src/daemon/default.pa.in
@@ -1,5 +1,4 @@
-#!@PA_BINARY@ -nF 
-
+#!@PA_BINARY@ -nF
 #
 # This file is part of PulseAudio.
 #
@@ -17,8 +16,19 @@
 # along with PulseAudio; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
 
+.nofail
+
+### Load something into the sample cache
+load-sample-lazy x11-bell /usr/share/sounds/gtk-events/activate.wav
+load-sample-lazy pulse-hotplug /usr/share/sounds/email.wav
+load-sample-lazy pulse-coldplug /usr/share/sounds/login.wav
+load-sample-lazy pulse-access /usr/share/sounds/generic.wav
+
+.fail
 
-### Load audio drivers statically
+### Load audio drivers statically (it's probably better to not load
+### these drivers manually, but instead use module-hal-detect --
+### see below -- for doing this automatically)
 #load-module module-alsa-sink
 #load-module module-alsa-source device=hw:1,0
 #load-module module-oss device="/dev/dsp" sink_name=output source_name=input
@@ -30,17 +40,9 @@
 @HAVE_HAL_TRUE@load-module module-hal-detect
 
 ### Alternatively use the static hardware detection module (for systems that
-### lack HAL support
+### lack HAL support)
 @HAVE_HAL_FALSE@load-module module-detect
 
-### Load audio drivers automatically on access
-#add-autoload-sink output module-oss device="/dev/dsp" sink_name=output source_name=input
-#add-autoload-source input module-oss device="/dev/dsp" sink_name=output source_name=input
-#add-autoload-sink output module-oss-mmap device="/dev/dsp" sink_name=output source_name=input
-#add-autoload-source input module-oss-mmap device="/dev/dsp" sink_name=output source_name=input
-#add-autoload-sink output module-alsa-sink sink_name=output
-#add-autoload-source input module-alsa-source source_name=input
-
 ### Load several protocols
 load-module module-esound-protocol-unix
 load-module module-native-protocol-unix
@@ -65,15 +67,8 @@ load-module module-volume-restore
 ### connected to dies, similar for sources
 load-module module-rescue-streams
 
-### Make some devices default
-#set-default-sink output
-#set-default-source input
-
-.nofail
-
-### Load something to the sample cache
-load-sample x11-bell /usr/share/sounds/gtk-events/activate.wav
-#load-sample-dir-lazy /usr/share/sounds/*.wav
+### Automatically suspend sinks/sources that become idle for too long
+load-module module-suspend-on-idle
 
 ### Load X11 bell module
 load-module module-x11-bell sample=x11-bell
@@ -85,3 +80,7 @@ load-module module-x11-publish
 ### Please keep in mind that the modules configured by paprefs might conflict with manually
 ### loaded modules.
 load-module module-gconf
+
+### Make some devices default
+#set-default-sink output
+#set-default-source input