daemon: use pa_streq instead of plain strcmp

[pulseaudio] / src / daemon / default.pa.in

diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in
index 6155b3126e4ec9c7e3b04c365d1ac18b5778a541..e3f1f4f4def0289f3136a02d81bee125654d194a 100755 (executable)
--- a/src/daemon/default.pa.in
+++ b/src/daemon/default.pa.in
@@ -68,20 +68,18 @@ ifelse(@HAVE_UDEV@, 1, [dnl
 .ifexists module-udev-detect@PA_SOEXT@
 load-module module-udev-detect
 .else
-], @HAVE_HAL@, 1, [dnl
-.ifexists module-hal-detect@PA_SOEXT@
-load-module module-hal-detect
-.else
 ], [dnl
 .ifexists module-detect@PA_SOEXT@
 ])dnl
-### Use the static hardware detection module (for systems that lack udev/hal support)
+### Use the static hardware detection module (for systems that lack udev support)
 load-module module-detect
 .endif
 
 ### Automatically connect sink and source if JACK server is present
 .ifexists module-jackdbus-detect@PA_SOEXT@
+.nofail
 load-module module-jackdbus-detect
+.fail
 .endif
 
 ifelse(@HAVE_BLUEZ@, 1, [dnl
@@ -98,11 +96,6 @@ load-module module-esound-protocol-unix
 .endif
 load-module module-native-protocol-unix
 ])dnl
-ifelse(@HAVE_DBUS@, 1, [dnl
-.ifexists module-dbus-protocol@PA_SOEXT@
-load-module module-dbus-protocol
-.endif
-])dnl
 
 ### Network access (may be configured with paprefs, so leave this commented
 ### here if you plan to use paprefs)
@@ -129,7 +122,10 @@ load-module module-gconf
 .fail
 .endif
 
-### Automatically restore the default sink/source when changed by the user during runtime
+### Automatically restore the default sink/source when changed by the user
+### during runtime
+### NOTE: This should be loaded as early as possible so that subsequent modules
+### that look up the default sink/source get the right value
 load-module module-default-device-restore
 
 ### Automatically move streams to the default sink if the sink they are
@@ -150,12 +146,15 @@ load-module module-suspend-on-idle
 .ifexists module-console-kit@PA_SOEXT@
 load-module module-console-kit
 .endif
+.ifexists module-systemd-login@PA_SOEXT@
+load-module module-systemd-login
+.endif
 
 ### Enable positioned event sounds
 load-module module-position-event-sounds
 
-### Cork music streams when a phone stream is active
-load-module module-cork-music-on-phone
+### Cork music/video streams when a phone stream is active
+load-module module-role-cork
 
 ### Modules to allow autoloading of filters (such as echo cancellation)
 ### on demand. module-filter-heuristics tries to determine what filters
@@ -165,6 +164,13 @@ load-module module-filter-heuristics
 load-module module-filter-apply
 ])dnl
 
+ifelse(@HAVE_DBUS@, 1, [dnl
+### Load DBus protocol
+.ifexists module-dbus-protocol@PA_SOEXT@
+load-module module-dbus-protocol
+.endif
+])dnl
+
 ifelse(@HAVE_X11@, 1, [dnl
 # X11 modules should not be started from default.pa so that one daemon
 # can be shared by multiple sessions.
@@ -183,6 +189,8 @@ ifelse(@HAVE_X11@, 1, [dnl
 #.endif
 ])dnl
 
+load-module module-switch-on-port-available
+
 ### Make some devices default
 #set-default-sink output
 #set-default-source input