summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-03-11 14:58:20 +0000
committerThierry Vignaud <tv@mandriva.org>2008-03-11 14:58:20 +0000
commitffbff73124b5ff7d92283ba6a141131f9ff2b0d4 (patch)
tree21151d4330fc435389e05941202339d6498ef9b3
parent0a374a5afce0ebe9bf0c3c5718b635fc7f2bc6c6 (diff)
downloaddrakx-backup-do-not-use-ffbff73124b5ff7d92283ba6a141131f9ff2b0d4.tar
drakx-backup-do-not-use-ffbff73124b5ff7d92283ba6a141131f9ff2b0d4.tar.gz
drakx-backup-do-not-use-ffbff73124b5ff7d92283ba6a141131f9ff2b0d4.tar.bz2
drakx-backup-do-not-use-ffbff73124b5ff7d92283ba6a141131f9ff2b0d4.tar.xz
drakx-backup-do-not-use-ffbff73124b5ff7d92283ba6a141131f9ff2b0d4.zip
(switch) factorize common options
-rw-r--r--perl-install/harddrake/sound.pm10
1 files changed, 6 insertions, 4 deletions
diff --git a/perl-install/harddrake/sound.pm b/perl-install/harddrake/sound.pm
index ca1c2352a..8cd3d5283 100644
--- a/perl-install/harddrake/sound.pm
+++ b/perl-install/harddrake/sound.pm
@@ -235,15 +235,17 @@ sub switch {
push @alternative, $driver;
my %des = modules::category2modules_and_description('multimedia/sound');
+ my @common = (
+ get_any_driver_entry($in, $modules_conf, $driver, $device),
+ );
+
if ($new_driver eq 'unknown') {
$in->ask_from_({
title => N("No alternative driver"),
messages => N("There's no known OSS/ALSA alternative driver for your sound card (%s) which currently uses \"%s\"",
$device->{description}, $driver),
},
- [
- get_any_driver_entry($in, $modules_conf, $driver, $device),
- ]
+ \@common,
);
} elsif ($in->ask_from_({ title => N("Sound configuration"),
messages =>
@@ -281,7 +283,7 @@ To use alsa, one can either use:
val => N("Trouble shooting"), disabled => sub {},
clicked => sub { &trouble($in) }
},
- get_any_driver_entry($in, $modules_conf, $driver, $device),
+ @common,
]))
{
return if $new_driver eq $device->{current_driver};