summaryrefslogtreecommitdiffstats
path: root/src/daemon
diff options
context:
space:
mode:
Diffstat (limited to 'src/daemon')
-rwxr-xr-xsrc/daemon/default.pa.in5
-rw-r--r--src/daemon/main.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in
index 7032038d..ae54c0a8 100755
--- a/src/daemon/default.pa.in
+++ b/src/daemon/default.pa.in
@@ -72,9 +72,12 @@ load-module module-native-protocol-unix
#load-module module-null-sink sink_name=rtp format=s16be channels=2 rate=44100 description="RTP Multicast Sink"
#load-module module-rtp-send source=rtp.monitor
+### Enable flat volumes where possible
+load-module module-flat-volumes
+
### Automatically restore the volume of streams and devices
-load-module module-stream-restore
load-module module-device-restore
+load-module module-stream-restore
### Automatically restore the default sink/source when changed by the user during runtime
load-module module-default-device-restore
diff --git a/src/daemon/main.c b/src/daemon/main.c
index fad635f0..bc8bc63e 100644
--- a/src/daemon/main.c
+++ b/src/daemon/main.c
@@ -646,9 +646,9 @@ int main(int argc, char *argv[]) {
conf->disable_shm = TRUE;
}
- if (conf->system_instance && conf->exit_idle_time > 0) {
+ if (conf->system_instance && conf->exit_idle_time >= 0) {
pa_log_notice(_("Running in system mode, forcibly disabling exit idle time!"));
- conf->exit_idle_time = 0;
+ conf->exit_idle_time = -1;
}
if (conf->cmd == PA_CMD_START) {