diff options
Diffstat (limited to 'perl-install/standalone/draksound')
| -rwxr-xr-x | perl-install/standalone/draksound | 33 |
1 files changed, 14 insertions, 19 deletions
diff --git a/perl-install/standalone/draksound b/perl-install/standalone/draksound index d10db41ec..dc276ed40 100755 --- a/perl-install/standalone/draksound +++ b/perl-install/standalone/draksound @@ -1,6 +1,6 @@ #!/usr/bin/perl # DrakxSound -# Copyright (C) 2002-2004 MandrakeSoft (tvignaud@mandrakesoft.com) +# Copyright (C) 2002-2008 Mandriva (thierry.vignaud.com) # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -19,7 +19,7 @@ use lib qw(/usr/lib/libDrakX); use standalone; #- warning, standalone must be loaded very first, for 'explanations' - + use strict; use interactive; use common; @@ -29,31 +29,26 @@ use detect_devices; my $in = 'interactive'->vnew('su'); -modules::mergein_conf('/etc/modules.conf'); +$ugtk3::wm_icon = 'draksound-16'; +my $modules_conf = modules::any_conf->read; -my @devices = grep { $_->{media_type} eq 'MULTIMEDIA_AUDIO' } detect_devices::probeall(); -if (@devices) { +if (my @devices = detect_devices::probe_category('multimedia/sound')) { # TODO: That need some work for multiples sound cards map_index { # allocate sound-slot in the same order as install2.pm # fill $device->{driver} with the right sound-slot-XX or default driver if missing sound-slot [real fix'll be in harddrake service] - my $driver = modules::get_alias("sound-slot-$::i"); - $driver = modules::get_alias($driver) if $driver =~ /sound-card/; # alsaconf ... + my $driver = $modules_conf->get_alias("sound-slot-$::i"); + $driver = $modules_conf->get_alias($driver) if $driver =~ /sound-card/; # alsaconf ... + $driver =~ s/-/_/g; $_->{current_driver} = $driver if $driver; - $_->{sound_slot_index} = $::i; - harddrake::sound::config($in, $_, $::i); - } modules::probe_category('multimedia/sound'); + $_->{sound_slot_index} = $::i; + harddrake::sound::config($in, $modules_conf, $_); + } @devices; } else { $in->ask_warn(N("No Sound Card detected!"), - formatAlaTeX(N("No Sound Card has been detected on your machine. Please verify that a Linux-supported Sound Card is correctly plugged in. - - -You can visit our hardware database at: - - -http://www.linux-mandrake.com/en/hardware.php3") . -N("\n\n\nNote: if you've an ISA PnP sound card, you'll have to use the sndconfig program. Just type \"sndconfig\" in a console."))); + formatAlaTeX( + N("No Sound Card has been detected on your machine. Please verify that a Linux-supported Sound Card is correctly plugged in"))); } -modules::write_conf(); +$modules_conf->write; $in->exit(0); |