[pulseaudio-commits] 2 commits - src/daemon

[Tanu Kaskinen]

 src/daemon/system.pa.in |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 459cea16ee8be1024c35e86ab9a3676ceebcb550
Author: Tanu Kaskinen <tanuk at iki.fi>
Date:   Thu Oct 27 17:59:29 2016 +0300

    system.pa: load module-card-restore
    
    Apparently nobody remembered to update system.pa when
    module-card-restore was created.

diff --git a/src/daemon/system.pa.in b/src/daemon/system.pa.in
index fc5019cf..071c11c2 100755
--- a/src/daemon/system.pa.in
+++ b/src/daemon/system.pa.in
@@ -22,6 +22,7 @@ changequote(`[', `]')dnl Set up m4 quoting
 ### Automatically restore the volume of streams and devices
 load-module module-device-restore
 load-module module-stream-restore
+load-module module-card-restore
 
 ### Automatically load driver modules depending on the hardware available
 ifelse(@HAVE_UDEV@, 1, [dnl

commit b35b9641e3857deceecb32c50fc38136006c5a54
Author: Tanu Kaskinen <tanuk at iki.fi>
Date:   Thu Oct 27 17:59:28 2016 +0300

    system.pa: load module-device-restore before module-udev-detect
    
    module-device-restore doesn't restore the state of devices that already
    exist during the module loading, so the module has to be loaded early.

diff --git a/src/daemon/system.pa.in b/src/daemon/system.pa.in
index 06e3f1e6..fc5019cf 100755
--- a/src/daemon/system.pa.in
+++ b/src/daemon/system.pa.in
@@ -19,6 +19,10 @@
 # mode.
 changequote(`[', `]')dnl Set up m4 quoting
 
+### Automatically restore the volume of streams and devices
+load-module module-device-restore
+load-module module-stream-restore
+
 ### Automatically load driver modules depending on the hardware available
 ifelse(@HAVE_UDEV@, 1, [dnl
 .ifexists module-udev-detect at PA_SOEXT@
@@ -45,10 +49,6 @@ load-module module-esound-protocol-unix
 .endif
 load-module module-native-protocol-unix
 
-### Automatically restore the volume of streams and devices
-load-module module-stream-restore
-load-module module-device-restore
-
 ### 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