diff options
author | Maarten Bosmans <mkbosmans@gmail.com> | 2011-06-29 15:16:10 +0200 |
---|---|---|
committer | Colin Guthrie <colin@mageia.org> | 2011-06-30 11:54:03 +0100 |
commit | 107106afd4e6f93d495f75c224cde6817319d662 (patch) | |
tree | e2e787206c132af0fd0098c26305abe05e47825c /src | |
parent | 3722dbbcb3bbe889ca9e5ae061aa01f2e9cb29a0 (diff) |
build-sys: Process configuration files with m4
This allows for build-time conditionals to be processed,
eliminating the need for a separate default.pa.win32.
Diffstat (limited to 'src')
-rw-r--r-- | src/Makefile.am | 1 | ||||
-rwxr-xr-x | src/daemon/default.pa.in | 13 | ||||
-rw-r--r-- | src/daemon/default.pa.win32 | 43 |
3 files changed, 12 insertions, 45 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index c2b8224a..0a249f03 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -81,7 +81,6 @@ EXTRA_DIST = \ daemon/daemon.conf.in \ daemon/default.pa.in \ daemon/system.pa.in \ - daemon/default.pa.win32 \ depmod.py \ daemon/esdcompat.in \ daemon/start-pulseaudio-x11.in \ diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in index 32ba5826..3442b219 100755 --- a/src/daemon/default.pa.in +++ b/src/daemon/default.pa.in @@ -18,14 +18,20 @@ # This startup script is used only if PulseAudio is started per-user # (i.e. not in system mode) +changequote(`[', `]')dnl Set up m4 quoting .nofail ### Load something into the sample cache +ifelse(@OS_IS_WIN32@, 1, [dnl +load-sample x11-bell %WINDIR%\Media\ding.wav +load-sample-dir-lazy %WINDIR%\Media\*.wav +], [dnl #load-sample-lazy x11-bell /usr/share/sounds/gtk-events/activate.wav #load-sample-lazy pulse-hotplug /usr/share/sounds/startup3.wav #load-sample-lazy pulse-coldplug /usr/share/sounds/startup3.wav #load-sample-lazy pulse-access /usr/share/sounds/generic.wav +])dnl .fail @@ -45,6 +51,9 @@ load-module module-augment-properties #load-module module-alsa-source device=hw:1,0 #load-module module-oss device="/dev/dsp" sink_name=output source_name=input #load-module module-oss-mmap device="/dev/dsp" sink_name=output source_name=input +ifelse(@HAVE_WAVEOUT@, 1, [dnl +load-module module-waveout sink_name=output source_name=input +])dnl #load-module module-null-sink #load-module module-pipe-sink @@ -77,7 +86,8 @@ load-module module-native-protocol-unix #load-module module-native-protocol-tcp #load-module module-zeroconf-publish -### Load the RTP reciever module (also configured via paprefs, see above) +ifelse(@OS_IS_WIN32@, 0, [dnl +### Load the RTP receiver module (also configured via paprefs, see above) #load-module module-rtp-recv ### Load the RTP sender module (also configured via paprefs, see above) @@ -136,6 +146,7 @@ load-module module-cork-music-on-phone #load-module module-x11-publish #.fail #.endif +])dnl ### Make some devices default #set-default-sink output diff --git a/src/daemon/default.pa.win32 b/src/daemon/default.pa.win32 deleted file mode 100644 index d5a1e183..00000000 --- a/src/daemon/default.pa.win32 +++ /dev/null @@ -1,43 +0,0 @@ -#
-# 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.
-
-
-# Load audio drivers statically
-
-load-module module-waveout sink_name=output source_name=input
-load-module module-null-sink
-
-# Load audio drivers automatically on access
-
-#add-autoload-sink output module-waveout sink_name=output source_name=input
-#add-autoload-source input module-waveout sink_name=output source_name=input
-
-# Load several protocols
-#load-module module-esound-protocol-tcp
-#load-module module-native-protocol-tcp
-#load-module module-simple-protocol-tcp
-#load-module module-cli-protocol-tcp
-
-# Make some devices default
-set-default-sink output
-set-default-source input
-
-.nofail
-
-# Load something to the sample cache
-load-sample x11-bell %WINDIR%\Media\ding.wav
-load-sample-dir-lazy %WINDIR%\Media\*.wav
|