[pulseaudio-discuss] [PATCH 2/6] build: Get rid of default.pa.win32

[Maarten Bosmans]

---
 src/Makefile.am             |   15 ++++-----------
 src/daemon/default.pa.in    |   15 +++++++++++++++
 src/daemon/default.pa.win32 |   43 -------------------------------------------
 3 files changed, 19 insertions(+), 54 deletions(-)
 delete mode 100644 src/daemon/default.pa.win32

diff --git a/src/Makefile.am b/src/Makefile.am
index 139234f..e004a65 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -92,7 +92,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 \
@@ -1887,19 +1886,13 @@ start-pulseaudio-kde: daemon/start-pulseaudio-kde.in Makefile
 client.conf: pulse/client.conf.in Makefile
 	$(AM_V_GEN) $(AWK_in) $< > $@
 
-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
+daemon.conf: daemon/daemon.conf.in Makefile
 	$(AM_V_GEN) $(AWK_in) $< > $@
-system.pa: daemon/system.pa.in Makefile
+
+default.pa: daemon/default.pa.in Makefile
 	$(AM_V_GEN) $(AWK_in) $< > $@
-endif
 
-daemon.conf: daemon/daemon.conf.in Makefile
+system.pa: daemon/system.pa.in Makefile
 	$(AM_V_GEN) $(AWK_in) $< > $@
 
 install-exec-hook:
diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in
index 32ba582..8ee3bdc 100755
--- a/src/daemon/default.pa.in
+++ b/src/daemon/default.pa.in
@@ -22,10 +22,15 @@
 .nofail
 
 ### Load something into the sample cache
+ at if @OS_IS_WIN32@
+load-sample x11-bell %WINDIR%\Media\ding.wav
+load-sample-dir-lazy %WINDIR%\Media\*.wav
+ at else
 #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
+ at endif
 
 .fail
 
@@ -77,6 +82,15 @@ load-module module-native-protocol-unix
 #load-module module-native-protocol-tcp
 #load-module module-zeroconf-publish
 
+ at if @OS_IS_WIN32@
+# Load audio drivers statically
+load-module module-waveout sink_name=output source_name=input
+
+# 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
+
+ at else
 ### Load the RTP reciever module (also configured via paprefs, see above)
 #load-module module-rtp-recv
 
@@ -137,6 +151,7 @@ load-module module-cork-music-on-phone
 #.fail
 #.endif
 
+ at endif
 ### Make some devices default
 #set-default-sink output
 #set-default-source input
diff --git a/src/daemon/default.pa.win32 b/src/daemon/default.pa.win32
deleted file mode 100644
index d5a1e18..0000000
--- 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
-- 
1.7.1