summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Guthrie <cguthrie@mandriva.org>2009-08-14 11:40:29 +0000
committerColin Guthrie <cguthrie@mandriva.org>2009-08-14 11:40:29 +0000
commit5b85bc9a48586804b22ff86e34f36e0b202d0c6e (patch)
tree0d0add9bac9287faeff0f19927b9b613526b3dcb
parent241835992ec3555b3163186dd0d1c355ccb184c9 (diff)
downloaddrakx-5b85bc9a48586804b22ff86e34f36e0b202d0c6e.tar
drakx-5b85bc9a48586804b22ff86e34f36e0b202d0c6e.tar.gz
drakx-5b85bc9a48586804b22ff86e34f36e0b202d0c6e.tar.bz2
drakx-5b85bc9a48586804b22ff86e34f36e0b202d0c6e.tar.xz
drakx-5b85bc9a48586804b22ff86e34f36e0b202d0c6e.zip
draksound: Correctly enable/disable glitchfree on both hal and udev detection modules.
-rw-r--r--perl-install/harddrake/sound.pm11
1 files changed, 4 insertions, 7 deletions
diff --git a/perl-install/harddrake/sound.pm b/perl-install/harddrake/sound.pm
index 202ad923e..b165ac677 100644
--- a/perl-install/harddrake/sound.pm
+++ b/perl-install/harddrake/sound.pm
@@ -250,14 +250,11 @@ sub is_pulseaudio_glitchfree_enabled() {
sub set_pulseaudio_glitchfree {
my ($val) = @_;
- my $string = "load-module module-hal-detect tsched=0\n";
substInFile {
- if (/^load-module\s*module-hal-detect/) {
- if ($val) {
- s/\s*tsched=0//;
- } else {
- $_ = $string;
- }
+ if ($val) {
+ s/^(load-module\s+module-(udev|hal)-detect)\s+tsched=0/$1/;
+ } else {
+ s/^(load-module\s+module-(udev|hal)-detect).*/$1 tsched=0/;
}
} $pa_defaultsconfig_file;
}