summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2006-08-25 12:12:13 +0000
committerLennart Poettering <lennart@poettering.net>2006-08-25 12:12:13 +0000
commit8ead68fcb3fb7da981a42f4b502bdeabf96a62fb (patch)
treeef00a57be0e9fa2cb0f08943df83a23ef7801a52
parentaec3888ef2deb1dba51922fcf149115acea6476b (diff)
activate HAL in the default config
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1331 fefdeb5f-60dc-0310-8127-8f9354f1896f
-rwxr-xr-xsrc/daemon/default.pa.in19
1 files changed, 13 insertions, 6 deletions
diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in
index 74148cd1..03122669 100755
--- a/src/daemon/default.pa.in
+++ b/src/daemon/default.pa.in
@@ -27,7 +27,11 @@
#load-module module-pipe-sink
### Automatically load driver modules depending on the hardware available
-load-module module-detect
+load-module module-hal-detect
+
+### Alternatively use the static hardware detection module (for systems that
+### lack HAL support
+#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
@@ -41,21 +45,24 @@ load-module module-detect
load-module module-esound-protocol-unix
load-module module-native-protocol-unix
+### Network access (may be configured with paprefs, so leave this commented
+### here if you plan to use paprefs)
#load-module module-esound-protocol-tcp
#load-module module-native-protocol-tcp
#load-module module-zeroconf-publish
-### Load the RTP reciever module
+### Load the RTP reciever module (also configured via paprefs, see above)
#load-module module-rtp-recv
-### Load the RTP sender module
-#load-module module-null-sink sink_name=rtp
-#load-module module-rtp-send source=rtp_monitor
+### Load the RTP sender module (also configured via paprefs, see above)
+#load-module module-null-sink sink_name=rtp format=s16be channels=2 rate=44100 description="RTP Multicast Sink"
+#load-module module-rtp-send source=rtp.monitor
### Automatically restore the volume of playback streams
load-module module-volume-restore
-### Automatically move streams to the default sink if the sink they are connected to dies
+### Automatically move streams to the default sink if the sink they are
+### connected to dies, similar for sources
load-module module-rescue-streams
### Make some devices default