summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2009-01-26 12:54:44 +0000
committerThierry Vignaud <tv@mandriva.org>2009-01-26 12:54:44 +0000
commit596b88c3e0ceef8472fd221fd20390638407a465 (patch)
treee7b5ec5cf35a08f38146cc2c36d7766752991465 /perl-install
parent56c25db45fddc63000d9c3226bc530a774a7931f (diff)
downloaddrakx-596b88c3e0ceef8472fd221fd20390638407a465.tar
drakx-596b88c3e0ceef8472fd221fd20390638407a465.tar.gz
drakx-596b88c3e0ceef8472fd221fd20390638407a465.tar.bz2
drakx-596b88c3e0ceef8472fd221fd20390638407a465.tar.xz
drakx-596b88c3e0ceef8472fd221fd20390638407a465.zip
(set_PA_autospan, write_config) disable auto spawning when diasbling PA (#47258)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/harddrake/sound.pm16
2 files changed, 18 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 7ec2e0ce2..c45fe1ac1 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -2,6 +2,8 @@
o don't rewrite label when it did not change (#47186)
- drakdvb: introduce new DVB channels scanning tool
(from Pascal Terjan)
+- draksound:
+ o disable auto spawning when diasbling PA (#47258)
Version 11.80 - 21 January 2008
diff --git a/perl-install/harddrake/sound.pm b/perl-install/harddrake/sound.pm
index f40ef1e03..00a778db0 100644
--- a/perl-install/harddrake/sound.pm
+++ b/perl-install/harddrake/sound.pm
@@ -241,6 +241,21 @@ sub set_pulseaudio_routing {
}
+my $pa_client_conffile = '/etc/pulse/client.conf';
+
+sub set_PA_autospan {
+ my ($val) = @_;
+ $val = 'autospawn = ' . bool2yesno($val) . "\n";
+ my $done;
+ substInFile {
+ if (/^autospawn\s*=/) {
+ $_ = $val;
+ $done = 1;
+ }
+ } $pa_client_conffile;
+ append_to_file($pa_client_conffile, $val) if !$done;
+}
+
my $pulse_config_file = "$::prefix/etc/pulse/daemon.conf";
@@ -328,6 +343,7 @@ sub switch {
my $write_config = sub {
set_pulseaudio($is_pulseaudio_enabled);
set_pulseaudio_routing($is_pulseaudio_enabled && $is_pulseaudio_routing_enabled);
+ set_PA_autospan($is_pulseaudio_enabled);
set_5_1_in_pulseaudio($is_5_1_in_pulseaudio_enabled);
set_user_switching($is_user_switching);
if ($is_pulseaudio_routing_enabled) {