diff options
Diffstat (limited to 'perl-install/harddrake/sound.pm')
| -rw-r--r-- | perl-install/harddrake/sound.pm | 235 |
1 files changed, 20 insertions, 215 deletions
diff --git a/perl-install/harddrake/sound.pm b/perl-install/harddrake/sound.pm index 8a560f03d..754c7aa89 100644 --- a/perl-install/harddrake/sound.pm +++ b/perl-install/harddrake/sound.pm @@ -1,14 +1,4 @@ package harddrake::sound; -# lists filled with Danny Tholen help, enhanced by Thierry Vignaud -# -# No ALSA for OSS's -# o isa cards: msnd_pinnacle, pas2, -# o pci cards: ad1889, sam9407 -# No OSS for ALSA's -# o pci cards: snd_als4000, snd_es968, snd_hdsp -# o isa cards: snd_azt2320, snd_cs4231, snd_cs4236, -# snd_dt0197h, snd_korg1212, snd_rme32 -# o pcmcia cards: snd_vxp440 snd_vxpocket # TODO: # o ensure sound is not user (either dsp/midi/sequencer/mixer) @@ -22,165 +12,6 @@ use list_modules; use detect_devices; use log; - -our %alsa2oss = - ( - if_(arch() =~ /ppc/, "snd_powermac" => [ "dmasound_pmac" ]), - if_(arch() =~ /sparc/, - "snd_sun_amd7930" => [ "unknown" ], - "snd_sun_cs4231" => [ "unknown" ], - "snd_sun_dbri" => [ "unknown" ], - ), - "snd_ad1816a" => [ "ad1816" ], # isa - "snd_ad1848" => [ "ad1848", "pss" ], # isa - "snd_ad1889" => [ "ad1889" ], - "snd_ali5451" => [ "trident" ], - "snd_als100" => [ "sb" ], # isa - "snd_als300" => [ "unknown" ], - "snd_als4000" => [ "unknown" ], - "snd_aoa" => [ "unknown" ], - "snd_asihpi" => [ "unknown" ], - "snd_atiixp" => [ "unknown" ], - "snd_au8810" => [ "unknown" ], - "snd_au8820" => [ "unknown" ], - "snd_au8830" => [ "unknown" ], - "snd_audigyls" => [ "unknown" ], # pci, renamed as snd_ca0106 - "snd_azt2320" => [ "unknown" ], # isa - "snd_azt3328" => [ "unknown" ], # isa - "snd_azx" => [ "unknown" ], - "snd_bt87x" => [ "btaudio" ], - "snd_ca0106" => [ "unknown" ], # pci - "snd_cmi8330" => [ "sb" ], # isa - "snd_cmi8788" => [ "unknown" ], # pci - "snd_cmipci" => [ "cmpci" ], - "snd_cs4231" => [ "unknown" ], # isa - "snd_cs4232" => [ "cs4232" ], # isa - "snd_cs4236" => [ "ad1848" ], # isa - "snd_cs4281" => [ "cs4281" ], - "snd_cs46xx" => [ "cs46xx" ], - "snd_cs5530" => [ "unknown" ], - "snd_cs5535audio" => [ "unknown" ], - "snd_darla20" => [ "unknown" ], - "snd_darla24" => [ "unknown" ], - "snd_dt0197h" => [ "unknown" ], # isa - "snd_dt019x" => [ "unknown" ], # isa - "snd_echo3g" => [ "unknown" ], - "snd_emu10k1" => [ "audigy", "emu10k1" ], - "snd_emu10k1x" => [ "unknown" ], - "snd_ens1370" => [ "es1370" ], - "snd_ens1371" => [ "es1371" ], - "snd_es1688" => [ "sb" ], # isa - "snd_es18xx" => [ "sb" ], # isa - "snd_es1938" => [ "esssolo1" ], - "snd_es1968" => [ "maestro" ], # isa - "snd_es968" => [ "sb" ], - "snd_fm801" => [ "forte" ], - "snd_gina20" => [ "unknown" ], - "snd_gina24" => [ "unknown" ], - "snd_gina3g" => [ "unknown" ], - "snd_gusclassic" => [ "gus" ], # isa - "snd_gusextreme" => [ "gus" ], # isa - "snd_gusmax" => [ "gus" ], # isa - "snd_hda_intel" => [ "unknown" ], - "snd_hdspm" => [ "unknown" ], - "snd_hdsp" => [ "unknown" ], - "snd_ice1712" => [ "unknown" ], # isa - "snd_ice1724" => [ "unknown" ], # isa - "snd_indi" => [ "unknown" ], # pci - "snd_indigo" => [ "unknown" ], # pci - "snd_indigodj" => [ "unknown" ], # pci - "snd_indigoio" => [ "unknown" ], # pci - "snd_intel8x0" => [ "ali5455", "i810_audio", "nvaudio" ], - "snd_interwave" => [ "gus" ], # isa - "snd_interwave_stb" => [ "unknown" ], # isa - "snd_korg1212" => [ "unknown" ], # isa - "snd_layla20" => [ "unknown" ], - "snd_layla24" => [ "unknown" ], - "snd_layla3g" => [ "unknown" ], - "snd_maestro3" => [ "maestro3" ], - "snd_mia" => [ "unknown" ], - "snd_mixart" => [ "unknown" ], - "snd_mona" => [ "unknown" ], - "snd_mpu401" => [ "mpu401" ], - "snd_nm256" => [ "nm256_audio" ], - "snd_opl3sa2" => [ "opl3", "opl3sa", "opl3sa2" ], # isa - "snd_opti92x_ad1848" => [ "unknown" ], # isa - "snd_opti92x_cs4231" => [ "unknown" ], # isa - "snd_opti93x" => [ "mad16" ], - "snd_pcxhr" => [ "unknown" ], # pci - "snd_riptide" => [ "unknown" ], - "snd_rme32" => [ "unknown" ], # isa - "snd_rme96" => [ "rme96xx" ], # pci - "snd_rme9652" => [ "rme96xx" ], # pci - "snd_sb16" => ["sscape", "sb"], - "snd_sb8" => [ "sb" ], - "snd_sbawe" => [ "awe_wave" ], - "snd_sgalaxy" => [ "sgalaxy" ], # isa - "snd_sonicvibes" => [ "sonicvibes" ], - "snd_sscape" => [ "sscape" ], # isa - "snd_trident" => [ "trident" ], - "snd_usb_audio" => [ "audio" ], # usb - "snd_usb_caiaq" => [ "unknown" ], - "snd_usb_usx2y" => [ "unknown" ], - "snd_via82xx" => [ "via82cxxx_audio" ], - "snd_vx222" => [ "unknown" ], - "snd_vxp440" => [ "unknown" ], # pcmcia - "snd_vxpocket" => [ "unknown" ], # pcmcia - "snd_wavefront" => [ "wavefront" ], # isa - "snd_ymfpci" => [ "ymfpci" ], - ); - - -our %oss2alsa = - ( - if_(arch() =~ /ppc/, "dmasound_pmac" => [ "snd_powermac" ]), - "ad1816" => [ "snd_ad1816a" ], - "ad1848" => [ "snd_ad1848", "snd_cs4236" ], - "ad1889" => [ "snd_ad1889" ], - "ali5455" => [ "snd_intel8x0" ], - "audigy" => [ "snd_emu10k1" ], - "audio" => [ "snd_usb_audio" ], # usb - "awe_wave" => [ "snd_sbawe" ], - "btaudio" => [ "snd_bt87x" ], - "cmpci" => [ "snd_cmipci" ], - "cs4232" => [ "snd_cs4232" ], - "cs4281" => [ "snd_cs4281" ], - "cs46xx" => [ "snd_cs46xx" ], - "emu10k1" => [ "snd_emu10k1" ], - "es1370" => [ "snd_ens1370" ], - "es1371" => [ "snd_ens1371" ], - "esssolo1" => [ "snd_es1938" ], - "forte" => [ "snd_fm801" ], - "gus" => ["snd_interwave", "snd_gusclassic", "snd_gusmax", "snd_gusextreme"], - "i810_audio" => [ "snd_intel8x0" ], - "ice1712" => [ "snd_ice1712" ], - "mad16" => [ "snd_opti93x" ], - "maestro" => [ "snd_es1968" ], - "maestro3" => [ "snd_maestro3" ], - "mpu401" => [ "snd_mpu401" ], - "msnd_pinnacle" => [ "unknown" ], - "nm256_audio" => [ "snd_nm256" ], - "nvaudio" => [ "snd_intel8x0" ], - "opl3" => [ "snd_opl3sa2" ], - "opl3sa" => [ "snd_opl3sa2" ], - "opl3sa2" => [ "snd_opl3sa2" ], - "pas2" => [ "unknown" ], - "pss" => [ "snd_ad1848" ], - "rme96xx" => [ "snd_rme96", "snd_rme9652" ], - "sam9407" => [ "unknown" ], - "sb" => [ "snd_als100", "snd_cmi8330", "snd_es1688", "snd_es18xx", "snd_es968", "snd_sb8", "snd_sb16" ], - "sgalaxy" => [ "snd_sgalaxy" ], - "sonicvibes" => [ "snd_sonicvibes" ], - "sscape" => [ "snd_sb16", "snd_sscape" ], - "trident" => [ "snd_ali5451", "snd_trident" ], - "via82cxxx_audio" => [ "snd_via82xx" ], - "wavefront" => [ "snd_wavefront" ], - "ymfpci" => [ "snd_ymfpci" ], - ); - -my @blacklist = qw(cs46xx cs4281); -my $blacklisted = 0; - sub is_pulseaudio_enabled() { my $soundprofile = common::read_alternative('soundprofile'); $soundprofile =~ /pulse$/; @@ -251,17 +82,11 @@ sub set_PA_autospan { sub rooted { run_program::rooted($::prefix, @_) } -sub unload { modules::unload(@_) if $::isStandalone || $blacklisted } +sub unload { modules::unload(@_) if $::isStandalone } sub load { my ($modules_conf, $name) = @_; - modules::load_and_configure($modules_conf, $name) if $::isStandalone || $blacklisted; -} - -sub get_alternative { - my ($driver) = @_; - my $list = $alsa2oss{$driver} || $oss2alsa{$driver}; - $list ? @$list : "unknown"; + modules::load_and_configure($modules_conf, $name) if $::isStandalone; } sub do_switch { @@ -270,8 +95,8 @@ sub do_switch { my $_wait = $in->wait_message(N("Please wait"), N("Please Wait... Applying the configuration")); log::explanations("removing old $old_driver\n"); if ($::isStandalone) { - rooted("service sound stop") unless $blacklisted; - rooted("service alsa stop") if $old_driver =~ /^snd_/ && !$blacklisted; + rooted("service sound stop"); + rooted("service alsa stop") if $old_driver =~ /^snd_/; unload($old_driver); # run_program("/sbin/modprobe -r $driver"); # just in case ... } $modules_conf->remove_module($old_driver); @@ -280,25 +105,26 @@ sub do_switch { if ($new_driver =~ /^snd_/) { # new driver is an alsa one $in->do_pkgs->ensure_binary_is_installed(qw(alsa-utils alsactl), 1); $in->do_pkgs->ensure_binary_is_installed(qw(aoss aoss), 1); - rooted("service alsa start") if $::isStandalone && !$blacklisted; + rooted("service alsa start") if $::isStandalone; rooted("/sbin/chkconfig --add alsa") if $::isStandalone; load($modules_conf, $new_driver) if $::isStandalone; # service alsa is buggy } else { rooted("/sbin/chkconfig --del alsa") } log::explanations("loading new $new_driver\n"); rooted("/sbin/chkconfig --add sound"); # just in case ... - rooted("service sound start") if $::isStandalone && !$blacklisted; + rooted("service sound start") if $::isStandalone; } -sub switch { +sub config { my ($in, $modules_conf, $device) = @_; my $driver = $device->{current_driver} || $device->{driver}; - foreach (@blacklist) { $blacklisted = 1 if $driver eq $_ } - my @alternative = $driver ne 'unknown' ? get_alternative($driver) : (); - unless ($driver eq $device->{driver} || member($device->{driver}, @alternative)) { - push @alternative, get_alternative($device->{driver}), $device->{driver}; - } - if (@alternative) { + my @alternative = $driver ne $device->{driver} ? $device->{driver} : (); + if ($driver eq "unknown") { + $in->ask_from(N("No known driver"), + N("There's no known driver for your sound card (%s)", + $device->{description}), + [ get_any_driver_entry($in, $modules_conf, $driver, $device) ]); + } else { my $new_driver = $driver; push @alternative, $driver; my %des = modules::category2modules_and_description('multimedia/sound'); @@ -326,7 +152,6 @@ sub switch { }; my @common = ( - get_any_driver_entry($in, $modules_conf, $driver, $device), { text => N("Enable PulseAudio"), type => 'bool', val => \$is_pulseaudio_enabled, @@ -361,12 +186,11 @@ sub switch { } } elsif ($in->ask_from_({ title => N("Sound configuration"), messages => - N("Here you can select an alternative driver (either OSS or ALSA) for your sound card (%s).", - $device->{description}) . - #-PO: here the first %s is either "OSS" or "ALSA", + $device->{description} . + #-PO: here the first %s is either "ALSA", #-PO: the second %s is the name of the current driver #-PO: and the third %s is the name of the default driver - N("\n\nYour card currently uses the %s\"%s\" driver (the default driver for your card is \"%s\")", ($driver =~ /^snd_/ ? "ALSA " : "OSS "), $driver, $device->{driver}), + N("\n\nYour card currently uses the %s\"%s\" driver (the default driver for your card is \"%s\")", "ALSA ", $driver, $device->{driver}), interactive_help => sub { N("OSS (Open Sound System) was the first sound API. It's an OS independent sound API (it's available on most UNIX(tm) systems) but it's a very basic and limited API. What's more, OSS drivers all reinvent the wheel. @@ -381,47 +205,28 @@ To use alsa, one can either use: }, }, [ + if_(@alternative, { label => N("Driver:"), val => \$new_driver, list => \@alternative, default => $new_driver, sort =>1, - allow_empty_list => 1, format => sub { my ($drv) = @_; $drv eq 'unknown' ? $drv : sprintf(($des{$drv} ? "$des{$drv} (%s [%s])" : "%s [%s]"), $drv, $drv =~ /^snd_/ ? 'ALSA' : 'OSS'); } - }, + }), @common, ])) { $write_config->(); return if $new_driver eq $device->{current_driver}; log::explanations("switching audio driver from '" . $device->{current_driver} . "' to '$new_driver'\n"); - $in->ask_warn(N("Warning"), N("The old \"%s\" driver is blacklisted.\n -It has been reported to oops the kernel on unloading.\n -The new \"%s\" driver will only be used on next bootstrap.", $device->{current_driver}, $new_driver)) if $blacklisted; do_switch($in, $modules_conf, $device->{current_driver}, $new_driver, $device->{sound_slot_index}); $device->{current_driver} = $new_driver; } - } elsif ($driver =~ /^Bad:/) { - $driver =~ s/^Bad://; - $in->ask_warn(N("No open source driver"), - N("There's no free driver for your sound card (%s), but there's a proprietary driver at \"%s\".", - $device->{description}, $driver)); - } elsif ($driver eq "unknown") { - $in->ask_from(N("No known driver"), - N("There's no known driver for your sound card (%s)", - $device->{description}), - [ get_any_driver_entry($in, $modules_conf, $driver, $device) ]); } end: } -sub config { - my ($in, $modules_conf, $device) = @_; - switch($in, $modules_conf, $device); -} - - sub trouble { my ($in) = @_; $in->ask_warn(N("Sound troubleshooting"), @@ -507,7 +312,7 @@ sub configure_sound_slots { my $altered = 0; each_index { my $default_driver = $modules_conf->get_alias("sound-slot-$::i"); - if (!member($default_driver, get_alternative($_->{driver}), $_->{driver})) { + if (!member($default_driver, $_->{driver})) { $altered ||= $default_driver; configure_one_sound_slot($modules_conf, $::i, $_->{driver}); } |