add conditional murphy module loading to default.pa.in

Change-Id: I8199f4530ef5f10cf65488969b3a8998e05cb65c

diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in
index f50d929..9f227ac 100755 (executable)
--- a/src/daemon/default.pa.in
+++ b/src/daemon/default.pa.in
@@ -35,18 +35,6 @@ load-sample-dir-lazy %WINDIR%\Media\*.wav
 
 .fail
 
-### Automatically restore the volume of streams and devices
-load-module module-device-restore
-load-module module-stream-restore
-load-module module-card-restore
-
-### Automatically augment property information from .desktop files
-### stored in /usr/share/application
-load-module module-augment-properties
-
-### Should be after module-*-restore but before module-*-detect
-load-module module-switch-on-port-available
-
 ### Load audio drivers statically
 ### (it's probably better to not load these drivers manually, but instead
 ### use module-udev-detect -- see below -- for doing this automatically)
@@ -81,16 +69,12 @@ load-module module-detect
 ### Automatically connect sink and source if JACK server is present
 .ifexists module-jackdbus-detect@PA_SOEXT@
 .nofail
-load-module module-jackdbus-detect channels=2
+load-module module-jackdbus-detect
 .fail
 .endif
 
 ifelse(@HAVE_BLUEZ@, 1, [dnl
 ### Automatically load driver modules for Bluetooth hardware
-.ifexists module-bluetooth-policy@PA_SOEXT@
-load-module module-bluetooth-policy
-.endif
-
 .ifexists module-bluetooth-discover@PA_SOEXT@
 load-module module-bluetooth-discover
 .endif
@@ -142,9 +126,6 @@ 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
 
-### Honour intended role device property
-load-module module-intended-roles
-
 ### Automatically suspend sinks/sources that become idle for too long
 load-module module-suspend-on-idle
 
@@ -196,6 +177,28 @@ ifelse(@HAVE_X11@, 1, [dnl
 #.endif
 ])dnl
 
+load-module module-switch-on-port-available
+
+### Load the Murphy IVI module if it exists
+.ifexists module-murphy-ivi@PA_SOEXT@
+load-module module-murphy-ivi
+.else
+### Automatically restore the volume of streams and devices
+load-module module-device-restore
+load-module module-stream-restore
+load-module module-card-restore
+
+### Automatically augment property information from .desktop files
+### stored in /usr/share/application
+.nofail
+load-module module-augment-properties
+.fail
+
+### Honour intended role device property
+load-module module-intended-roles
+
+.endif
+
 ### Make some devices default
 #set-default-sink output
 #set-default-source input