install a default system.pa

diff --git a/src/.gitignore b/src/.gitignore
index 33a9f2512935febf41d2dbb012b6bccb3df1abd9..6902eb9f7ea1520a9dc5c357bf34d796ae7f91aa 100644 (file)
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -15,6 +15,7 @@ cpulimit-test
 cpulimit-test2
 daemon.conf
 default.pa
+system.pa
 envelope-test
 esdcompat
 flist-test

diff --git a/src/Makefile.am b/src/Makefile.am
index 98d06aa8e9ac14e29e1e9ba6e4571cbb35c0559d..36bfdcabf27d4d7f616f64904fb0c6d4745aec5a 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -96,6 +96,7 @@ EXTRA_DIST = \
                pulse/version.h.in \
                daemon/daemon.conf.in \
                daemon/default.pa.in \
+               daemon/system.pa.in \
                daemon/default.pa.win32 \
                depmod.py \
                daemon/esdcompat.in \
@@ -108,6 +109,7 @@ EXTRA_DIST = \
 
 pulseconf_DATA = \
                default.pa \
+               system.pa \
                daemon.conf \
                client.conf
 
@@ -1543,7 +1545,7 @@ suid: pulseaudio .libs/lt-pulseaudio
        chown root $^
        chmod u+s $^
 
-CLEANFILES = esdcompat client.conf default.pa daemon.conf start-pulseaudio-x11
+CLEANFILES = esdcompat client.conf default.pa system.pa daemon.conf start-pulseaudio-x11
 
 esdcompat: daemon/esdcompat.in Makefile
        sed -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
@@ -1562,11 +1564,17 @@ client.conf: pulse/client.conf.in Makefile
 if OS_IS_WIN32
 default.pa: daemon/default.pa.win32
        cp $< $@
+system.pa: daemon/default.pa.win32
+       cp $< $@
 else
 default.pa: daemon/default.pa.in Makefile
        sed -e 's,@PA_BINARY\@,$(PA_BINARY),g' \
             -e 's,@PA_DLSEARCHPATH\@,$(modlibexecdir),g' \
            -e 's,@PA_SOEXT\@,.so,g' < $< > $@
+system.pa: daemon/system.pa.in Makefile
+       sed -e 's,@PA_BINARY\@,$(PA_BINARY),g' \
+            -e 's,@PA_DLSEARCHPATH\@,$(modlibexecdir),g' \
+           -e 's,@PA_SOEXT\@,.so,g' < $< > $@
 endif
 
 daemon.conf: daemon/daemon.conf.in Makefile

diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in
index 498499e751d2bd7fca86b6dd0f362b0d66b0f932..917fc309f7cf82b9f2d0835f58193f4ff3c10242 100755 (executable)
--- a/src/daemon/default.pa.in
+++ b/src/daemon/default.pa.in
@@ -16,6 +16,9 @@
 # along with PulseAudio; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
 
+# This startup script is used only if PulseAudio is started per-user
+# (i.e. not in system mode)
+
 .nofail
 
 ### Load something into the sample cache

diff --git a/src/daemon/system.pa.in b/src/daemon/system.pa.in
new file mode 100755 (executable)
index 0000000..f6052c4
--- /dev/null
+++ b/src/daemon/system.pa.in
@@ -0,0 +1,54 @@
+#!@PA_BINARY@ -nF
+#
+# This file is part of PulseAudio.
+#
+# PulseAudio is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# PulseAudio is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with PulseAudio; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+
+# This startup script is used only if PulseAudio is started in system
+# mode.
+
+### Automatically load driver modules depending on the hardware available
+.ifexists module-hal-detect@PA_SOEXT@
+load-module module-hal-detect
+.else
+### Alternatively use the static hardware detection module (for systems that
+### lack HAL support)
+load-module module-detect
+.endif
+
+### Load several protocols
+.ifexists module-esound-protocol-unix@PA_SOEXT@
+load-module module-esound-protocol-unix
+.endif
+load-module module-native-protocol-unix
+
+### Automatically restore the volume of playback streams
+load-module module-volume-restore
+
+### Automatically restore the default sink/source when changed by the user during runtime
+load-module module-default-device-restore
+
+### Automatically move streams to the default sink if the sink they are
+### connected to dies, similar for sources
+load-module module-rescue-streams
+
+### Make sure we always have a sink around, even if it is a null sink.
+load-module module-always-sink
+
+### Automatically suspend sinks/sources that become idle for too long
+load-module module-suspend-on-idle
+
+### Enable positioned event sounds
+load-module module-position-event-sounds