diff options
| author | Jaska Uimonen <jaska.uimonen@helsinki.fi> | 2012-06-05 17:22:35 +0300 |
|---|---|---|
| committer | Jaska Uimonen <jaska.uimonen@intel.com> | 2013-04-15 15:07:47 +0300 |
| commit | 5dcebbb97c9da0f436b85c7b49c3ea611cbf808c (patch) | |
| tree | 1af53014ea5baa6d409d9677c30859a56d0fb17e | |
| parent | f43819070bb312ccf0c315df35c03499880e8361 (diff) | |
| download | pulseaudio-panda-5dcebbb97c9da0f436b85c7b49c3ea611cbf808c.tar.gz pulseaudio-panda-5dcebbb97c9da0f436b85c7b49c3ea611cbf808c.tar.bz2 pulseaudio-panda-5dcebbb97c9da0f436b85c7b49c3ea611cbf808c.zip | |
configuration: IVI additions to default config files.
| -rwxr-xr-x | src/daemon/default.pa.in | 21 | ||||
| -rwxr-xr-x | src/daemon/system.pa.in | 19 |
2 files changed, 29 insertions, 11 deletions
diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in index 88b5944f..df222027 100755 --- a/src/daemon/default.pa.in +++ b/src/daemon/default.pa.in @@ -35,10 +35,10 @@ 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 +### Do not 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 @@ -139,8 +139,8 @@ 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 +### Do not 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 @@ -157,8 +157,8 @@ load-module module-systemd-login ### Enable positioned event sounds load-module module-position-event-sounds -### Cork music/video streams when a phone stream is active -load-module module-role-cork +### Do not 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 @@ -193,6 +193,11 @@ ifelse(@HAVE_X11@, 1, [dnl #.endif ])dnl +### Load the Murphy IVI module if it exists +.ifexists module-murphy-ivi@PA_SOEXT@ +load-module module-murphy-ivi dbus_bus_type=system +.endif + load-module module-switch-on-port-available ### Make some devices default diff --git a/src/daemon/system.pa.in b/src/daemon/system.pa.in index e881a127..d9de6874 100755 --- a/src/daemon/system.pa.in +++ b/src/daemon/system.pa.in @@ -36,15 +36,23 @@ load-module module-hal-detect load-module module-detect .endif +ifelse(@HAVE_BLUEZ@, 1, [dnl +### Automatically load driver modules for Bluetooth hardware +.ifexists module-bluetooth-discover@PA_SOEXT@ +load-module module-bluetooth-discover +.endif +])dnl + + ### Load several protocols .ifexists module-esound-protocol-unix@PA_SOEXT@ 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 +### Do not 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 @@ -69,3 +77,8 @@ load-module module-suspend-on-idle ### Enable positioned event sounds load-module module-position-event-sounds + +### Load the Murphy IVI module if it exists +.ifexists module-murphy-ivi@PA_SOEXT@ +load-module module-murphy-ivi dbus_bus_type=system +.endif |