instead of generating my own list of module descriptions from

list_modules.pm list of sound modules, just
usemodules::category2modules_and_description

4 files changed, 6 insertions, 27 deletions

diff --git a/perl-install/harddrake/Makefile b/perl-install/harddrake/Makefile
deleted file mode 100644
index 313fc2eca..000000000
--- a/perl-install/harddrake/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-sound_drivers.pm: ../../kernel/list_modules.pm gen_snd_list
-	./gen_snd_list > $@
diff --git a/perl-install/harddrake/TODO b/perl-install/harddrake/TODO
index 71e2b4a2b..23c9a0319 100644
--- a/perl-install/harddrake/TODO
+++ b/perl-install/harddrake/TODO
@@ -14,6 +14,7 @@
 *** 2detect/look 4
 **** pcmcia devices
 **** isapnp devices
+*** print "NOT LOADED" if module isn't loaded
 
 ** validation:
 *** see dadou (GUI)
diff --git a/perl-install/harddrake/gen_snd_list b/perl-install/harddrake/gen_snd_list
deleted file mode 100755
index e791ae431..000000000
--- a/perl-install/harddrake/gen_snd_list
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/perl
-# 
-# Copyright (C) 2002 MandrakeSoft (tvignaud@mandrakesoft.com)
-# Released under the GNU General Public License
-
-use lib qw(/usr/lib/libDrakX);
-use common;
-use list_modules;
-use Data::Dumper;
-
-$Data::Dumper::Terse = 1;          # don't output names where feasible
-$Data::Dumper::Purity = 1;         # fill in the holes for eval
-
-# ne '' for missing modules ... if_($i ne '', $i, '<none>')
-print "package harddrake::sound_drivers;\n#This is an autogenrated file by gen_snd_list from list_modules.pm\nour\$sound_drivers = ", Dumper({map { my $i=qx((/sbin/modinfo -d $_)|head -1|tr -d \\\"|perl -pi -e 's!\n!!g'); $_ => $i } category2modules("multimedia/sound")}), ";\n1;";
-#print qq(
-#sub
-#)
diff --git a/perl-install/harddrake/sound.pm b/perl-install/harddrake/sound.pm
index 9069966ef..85f5790d9 100644
--- a/perl-install/harddrake/sound.pm
+++ b/perl-install/harddrake/sound.pm
@@ -21,7 +21,6 @@ use common;
 use interactive;
 use run_program;
 use modules;
-use harddrake::sound_drivers;  # autogenerated
 use standalone;
 
 my %alsa2oss = 
@@ -118,9 +117,6 @@ my %oss2alsa =
 	"ymfpci"  => [ "snd-ymfpci" ]
 	);
 
-my $drivers_description = $harddrake::sound_drivers::sound_drivers;
-
-
 sub get_alternative {
     my ($driver) = @_;
     if ($alsa2oss{$driver}) {
@@ -164,9 +160,11 @@ sub switch {
 						 _("Here you can select an alternative driver (either OSS or ALSA) for your sound card (%s)",
 							  $device->{description}),
 						 [
-						  { label => _("Driver :"), val => \$new_driver, list => $alternative, default => $new_driver, sort =>1, format => sub {  "$_[0] ($drivers_description->{$_[0]})" }, allow_empty_list => 1 }
-						  ]
-						 ))
+						  { label => _("Driver :"), val => \$new_driver, list => $alternative, default => $new_driver, sort =>1, format => sub {
+							 my %des = modules::category2modules_and_description('multimedia/sound');
+							 "$_[0] (". $des{$_[0]};
+						  }, allow_empty_list => 1 }
+						  ]))
 	   {
 		  standalone::explanations("switching audio driver from '$driver' to '$new_driver'\n");
 		  do_switch($driver, $new_driver);