summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2003-01-15 14:57:29 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2003-01-15 14:57:29 +0000
commit731fbe16e2a84cc6296d36fd470222db7def1c09 (patch)
treef509ebd14c7a02549d1f8dc818af76ba3c97ce31
parente173c7f036c9af67d9ed7ce206904883982b90a5 (diff)
downloaddrakx-backup-do-not-use-731fbe16e2a84cc6296d36fd470222db7def1c09.tar
drakx-backup-do-not-use-731fbe16e2a84cc6296d36fd470222db7def1c09.tar.gz
drakx-backup-do-not-use-731fbe16e2a84cc6296d36fd470222db7def1c09.tar.bz2
drakx-backup-do-not-use-731fbe16e2a84cc6296d36fd470222db7def1c09.tar.xz
drakx-backup-do-not-use-731fbe16e2a84cc6296d36fd470222db7def1c09.zip
- factorize snd devices listing in detect_devices::getSoundDevices()
so that each caller is ppc aware - factorize sound slots configuration into harddrake::sound::configure_sound_slots() so that harddrake service will eventually set them at bootstrapping time
-rw-r--r--perl-install/harddrake/sound.pm9
-rw-r--r--perl-install/install2.pm5
-rw-r--r--perl-install/install_steps_interactive.pm2
3 files changed, 12 insertions, 4 deletions
diff --git a/perl-install/harddrake/sound.pm b/perl-install/harddrake/sound.pm
index cbf2f3ed0..5a65ff702 100644
--- a/perl-install/harddrake/sound.pm
+++ b/perl-install/harddrake/sound.pm
@@ -21,6 +21,7 @@ use run_program;
use modules;
use standalone;
use list_modules;
+use detect_devices;
my $has_nvaudio = -x '/lib/modules/' . c::kernel_version() . '/';
@@ -259,4 +260,12 @@ initlevel 3
")));
}
+
+sub configure_sound_slots {
+ each_index {
+ modules::add_alias("sound-slot-$::i", $_->{driver});
+ } getSoundDevices();
+}
+
+
1;
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 6662cd98d..06e0be85d 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -504,9 +504,8 @@ sub main {
eval { modules::load("af_packet") };
- each_index {
- modules::add_alias("sound-slot-$::i", $_->{driver});
- } modules::probe_category('multimedia/sound');
+ require harddrake::sound;
+ harddrake::sound::configure_sound_slots();
#- needed very early for install_steps_gtk
eval { $o->{mouse} = mouse::detect() } if !$o->{nomouseprobe} && !$o->{mouse} && !$::testing;
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index dd26fce10..8de24ec4a 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -827,7 +827,7 @@ sub summary {
return N("Remote CUPS server"); #- fall back in case of something wrong.
};
- my @sound_cards = (arch() =~ /ppc/ ? \&modules::load_category : \&modules::probe_category)->('multimedia/sound');
+ my @sound_cards = getSoundDevices();
#- if no sound card are detected AND the user selected things needing a sound card,
#- propose a special case for ISA cards