diff options
author | Colin Guthrie <colin@mageia.org> | 2011-05-18 23:08:56 +0000 |
---|---|---|
committer | Colin Guthrie <colin@mageia.org> | 2011-05-18 23:08:56 +0000 |
commit | 608b47b56f9a701356a8eda0764bc3317003e022 (patch) | |
tree | 5759ede6f4e49ba9003304865c6d4289bb0c7a00 /perl-install | |
parent | 37091eb0b2c22ce3ee8d8af9febdc73264db79a1 (diff) | |
download | drakx-backup-do-not-use-608b47b56f9a701356a8eda0764bc3317003e022.tar drakx-backup-do-not-use-608b47b56f9a701356a8eda0764bc3317003e022.tar.gz drakx-backup-do-not-use-608b47b56f9a701356a8eda0764bc3317003e022.tar.bz2 drakx-backup-do-not-use-608b47b56f9a701356a8eda0764bc3317003e022.tar.xz drakx-backup-do-not-use-608b47b56f9a701356a8eda0764bc3317003e022.zip |
draksound: Rename PA variable to better reflect what it is.
Diffstat (limited to 'perl-install')
-rw-r--r-- | perl-install/harddrake/sound.pm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/perl-install/harddrake/sound.pm b/perl-install/harddrake/sound.pm index d100079f4..9ffaf0fe0 100644 --- a/perl-install/harddrake/sound.pm +++ b/perl-install/harddrake/sound.pm @@ -211,17 +211,17 @@ sub set_pulseaudio { } -my $pa_defaultsconfig_file = "$::prefix/etc/pulse/default.pa"; +my $pa_startup_scriptfile = "$::prefix/etc/pulse/default.pa"; sub is_pulseaudio_glitchfree_enabled() { - return -f $pa_defaultsconfig_file && - cat_($pa_defaultsconfig_file) !~ /^load-module\s+module-(udev|hal)-detect\s+tsched=0/m; + return -f $pa_startup_scriptfile && + cat_($pa_startup_scriptfile) !~ /^load-module\s+module-(udev|hal)-detect\s+tsched=0/m; } sub set_pulseaudio_glitchfree { my ($val) = @_; - if ( ! -f $pa_defaultsconfig_file ) { + if ( ! -f $pa_startup_scriptfile ) { return; } @@ -231,7 +231,7 @@ sub set_pulseaudio_glitchfree { } else { s/^(load-module\s+module-(udev|hal)-detect).*/$1 tsched=0/; } - } $pa_defaultsconfig_file; + } $pa_startup_scriptfile; } my $pa_client_conffile = "$::prefix/etc/pulse/client.conf"; @@ -312,7 +312,7 @@ sub switch { push @alternative, $driver; my %des = modules::category2modules_and_description('multimedia/sound'); - my $is_pulseaudio_installed = ( -f $pa_defaultsconfig_file && -f $pa_client_conffile && -d '/etc/sound/profiles/pulse' ); + my $is_pulseaudio_installed = ( -f $pa_startup_scriptfile && -f $pa_client_conffile && -d '/etc/sound/profiles/pulse' ); my $is_pulseaudio_enabled = is_pulseaudio_enabled(); my $is_pulseaudio_glitchfree_enabled = is_pulseaudio_glitchfree_enabled(); |