diff options
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/NEWS | 3 | ||||
| -rw-r--r-- | perl-install/harddrake/sound.pm | 160 |
2 files changed, 4 insertions, 159 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 22da1490b..7dbc7dfbe 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,6 @@ +- draksound: + o do not offer to switch to OSS + Version 16.1 - 28 November 2013 - mcc: diff --git a/perl-install/harddrake/sound.pm b/perl-install/harddrake/sound.pm index 8a560f03d..8c2c9fbc7 100644 --- a/perl-install/harddrake/sound.pm +++ b/perl-install/harddrake/sound.pm @@ -22,162 +22,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; @@ -259,9 +103,7 @@ sub load { } sub get_alternative { - my ($driver) = @_; - my $list = $alsa2oss{$driver} || $oss2alsa{$driver}; - $list ? @$list : "unknown"; + "unknown"; } sub do_switch { |