summaryrefslogtreecommitdiffstats
path: root/perl-install/harddrake
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install/harddrake')
-rw-r--r--perl-install/harddrake/autoconf.pm46
-rwxr-xr-xperl-install/harddrake/check_snd.pl2
-rw-r--r--perl-install/harddrake/data.pm18
-rw-r--r--perl-install/harddrake/sound.pm383
-rw-r--r--perl-install/harddrake/v4l.pm2
5 files changed, 121 insertions, 330 deletions
diff --git a/perl-install/harddrake/autoconf.pm b/perl-install/harddrake/autoconf.pm
index ce22cd5ee..fba5078cd 100644
--- a/perl-install/harddrake/autoconf.pm
+++ b/perl-install/harddrake/autoconf.pm
@@ -24,10 +24,43 @@ sub xconf {
modules::load_category($modules_conf, 'various/agpgart');
}
+sub setup_ethernet_device {
+ my ($in, $device) = @_;
+
+ require network::connection;
+ require network::connection::ethernet;
+ require network::connection::wireless;
+ my @connection_types = qw(network::connection::ethernet network::connection::wireless);
+ my @all_connections = map { $_->get_connections(automatic_only => 1) } @connection_types;
+ my $interface = network::connection::ethernet::device_to_interface($device)
+ or return;
+ my $connection = find { $_->get_interface eq $interface } @all_connections
+ or return;
+
+ require network::connection_manager;
+ my $net = {};
+ network::network::read_net_conf($net);
+ my $cmanager = network::connection_manager->new($in, $net);
+ $cmanager->set_connection($connection);
+
+ # this will installed required packages
+ $cmanager->setup_connection;
+}
+
sub network_conf {
- my ($obj) = @_;
- require network::network;
- network::network::easy_dhcp($obj->{net}, $obj->{modules_conf});
+ my ($modules_conf, $in, $added) = @_;
+ $modules_conf->remove_alias_regexp('^(wlan|eth)[0-9]*$');
+ modules::load_category($modules_conf, 'network/main|gigabit|usb|wireless|firewire|pcmcia');
+
+ setup_ethernet_device($in, $_) foreach @{$added || {}};
+
+ require network::connection::ethernet;
+ network::connection::ethernet::configure_eth_aliases($modules_conf);
+ require network::rfswitch;
+ network::rfswitch::configure();
+ require network::shorewall;
+ network::shorewall::update_interfaces_list();
+ $modules_conf->write;
}
sub mouse_conf {
@@ -46,6 +79,11 @@ sub pcmcia {
sub bluetooth {
my ($enable) = @_;
+ # do not disable bluetooth service if adapter disappears
+ # (for example if disabled by Fn keys)
+ # systemd will automatically disable the service if needed
+ return if !$enable;
+
#- FIXME: make sure these packages are installed when needed
# if ($enable) {
# require do_pkgs;
@@ -75,8 +113,6 @@ sub laptop {
# }
require services;
services::set_status("apmd", -e "/proc/apm");
- services::set_status("cpufreq", $on_laptop);
- services::set_status("apmd", $on_laptop);
services::set_status("laptop-mode", $on_laptop);
services::set_status("numlock", !$on_laptop);
}
diff --git a/perl-install/harddrake/check_snd.pl b/perl-install/harddrake/check_snd.pl
index dfa007b80..4721bed40 100755
--- a/perl-install/harddrake/check_snd.pl
+++ b/perl-install/harddrake/check_snd.pl
@@ -10,7 +10,7 @@ use list_modules;
my @listed_modules = @{$list_modules::l{multimedia}{sound}};
my @drivers = (keys %harddrake::sound::oss2alsa, keys %harddrake::sound::alsa2oss);
-my @alternatives = uniq map { @{$_} } values %harddrake::sound::oss2alsa, values %harddrake::sound::alsa2oss;
+my @alternatives = uniq map { @$_ } values %harddrake::sound::oss2alsa, values %harddrake::sound::alsa2oss;
# check harddrake::sound's data structures're coherent
print "unknown alternative drivers : [", join(', ', difference2(\@alternatives, \@drivers)), "]\n";
diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm
index 9cfebe7fb..30460dc94 100644
--- a/perl-install/harddrake/data.pm
+++ b/perl-install/harddrake/data.pm
@@ -62,7 +62,8 @@ our @tree =
string => N("SATA controllers"),
icon => "ide_hd.png",
configurator => "",
- detector => sub { f(grep { $_->{driver} !~ /^pata/ } detect_devices::probe_category('disk/sata')) },
+ detector => sub { f(grep { $_->{driver} !~ /^pata/ } detect_devices::probe_category('disk/sata')),
+ f(grep { $_->{description} =~ /AHCI/ } @devices) },
checked_on_boot => 1,
},
@@ -384,7 +385,7 @@ our @tree =
string => N("Bluetooth devices"),
icon => "hw_network.png",
configurator => "",
- detector => sub { f(detect_devices::probe_category('bus/bluetooth')) },
+ detector => sub { f(detect_devices::probe_category('bus/bluetooth')), f(grep { $_->{description} =~ /Bluetooth Dongle/ } @devices) },
checked_on_boot => 1,
},
@@ -399,7 +400,8 @@ our @tree =
f(grep {
$_->{media_type} && $_->{media_type} =~ /^NETWORK/
|| $_->{type} && $_->{type} eq 'network'
- || member($_->{driver}, @net_modules);
+ || member($_->{driver}, @net_modules)
+ || $_->{description} =~ /WLAN/;
} @devices);
},
checked_on_boot => 1,
@@ -410,7 +412,7 @@ our @tree =
string => N("Modem"),
icon => "modem.png",
configurator => "$sbindir/drakconnect",
- detector => sub { f(detect_devices::getModem($modules_conf)) },
+ detector => sub { f(detect_devices::getModem($modules_conf)), f(grep { $_->{description} =~ /SoftModem/ } @devices) },
# we do not check these b/c this need user interaction (auth, ...):
checked_on_boot => 0,
},
@@ -432,7 +434,7 @@ our @tree =
string => N("Memory"),
icon => "hw-memory.png",
configurator => "",
- detector => sub { grep { member($_->{name}, 'Cache', 'Memory Module') } detect_devices::dmidecode() },
+ detector => sub { grep { member($_->{name}, 'Cache', 'Memory Module') || $_->{name} eq 'Memory Device' && $_->{Size} ne 'No Module Installed' } detect_devices::dmidecode() },
checked_on_boot => 0,
},
@@ -477,7 +479,7 @@ our @tree =
detector => sub {
f(grep { $_->{description} =~ /Keyboard/i || $_->{media_type} =~ /Subclass\|Keyboard/i ||
# USB devices are filtered out since we already catch them through probeall():
- $_->{bus} ne 'usb' && $_->{driver} =~ /^event|kbd/ && $_->{description} !~ /PC Speaker/;
+ $_->{bus} ne 'usb' && $_->{driver} =~ /^event|kbd|^usbhid/ && $_->{description} !~ /PC Speaker/;
} @devices);
},
checked_on_boot => 0,
@@ -570,9 +572,7 @@ sub custom_id {
N("cpu # ") . $device->{processor} . ": " . $device->{'model name'} :
$device->{"Socket Designation"} ?
"$device->{name} (" . $device->{"Socket Designation"} . ")" :
- $device->{name} ? $device->{name} :
- (($device->{description}) ? $device->{description} :
- (($device->{Vendor}) ? $device->{Vendor} : $str)));
+ $device->{name} || $device->{description} || $device->{Vendor} || $str);
}
1;
diff --git a/perl-install/harddrake/sound.pm b/perl-install/harddrake/sound.pm
index ab3b9bf52..7a9016862 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,184 +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_user_switching_enabled() {
- my $output = run_program::get_stdout('polkit-action', '--action',
- 'org.freedesktop.hal.device-access.sound');
- my ($val) = $output =~ /default_inactive: (.*)/;
- to_bool($val eq 'no');
-}
-
-sub set_user_switching {
- my ($val) = @_;
- if ($val) {
- run_program::get_stdout('polkit-action', '--reset-defaults',
- 'org.freedesktop.hal.device-access.sound');
- } else {
- run_program::get_stdout('polkit-action', '--set-defaults-inactive',
- 'org.freedesktop.hal.device-access.sound', 'yes');
- }
-}
-
-
sub is_pulseaudio_enabled() {
my $soundprofile = common::read_alternative('soundprofile');
$soundprofile =~ /pulse$/;
@@ -209,6 +21,8 @@ sub set_pulseaudio {
my ($val) = @_;
my $alterative = '/etc/sound/profiles/' . ($val ? 'pulse' : 'alsa');
+ return if ! -d $alterative;
+
common::symlinkf_update_alternatives('soundprofile', $alterative);
# (cg) This config file will eventually be dropped, but it is still needed for now
@@ -226,75 +40,35 @@ sub set_pulseaudio {
}
-my $pa_defaultsconfig_file = "$::prefix/etc/pulse/default.pa";
+my $pa_startup_scriptfile = "$::prefix/etc/pulse/default.pa";
sub is_pulseaudio_glitchfree_enabled() {
- return -f $pa_defaultsconfig_file &&
- cat_($pa_defaultsconfig_file) !~ /^load-module\s+module-(udev|hal)-detect\s+tsched=0/m;
+ return -f $pa_startup_scriptfile &&
+ cat_($pa_startup_scriptfile) !~ /^load-module\s+module-(udev|hal)-detect\s+tsched=0/m;
}
sub set_pulseaudio_glitchfree {
my ($val) = @_;
+
+ return if ! -f $pa_startup_scriptfile;
+
substInFile {
if ($val) {
s/^(load-module\s+module-(udev|hal)-detect)\s+tsched=0/$1/;
} else {
s/^(load-module\s+module-(udev|hal)-detect).*/$1 tsched=0/;
}
- } $pa_defaultsconfig_file;
-}
-
-my $pa_client_conffile = "$::prefix/etc/pulse/client.conf";
-
-sub set_PA_autospan {
- my ($val) = @_;
- $val = 'autospawn = ' . bool2yesno($val) . "\n";
- my $done;
- substInFile {
- if (/^autospawn\s*=/) {
- $_ = $val;
- $done = 1;
- }
- } $pa_client_conffile;
- append_to_file($pa_client_conffile, $val) if !$done;
-}
-
-
-my $pulse_config_file = "$::prefix/etc/pulse/daemon.conf";
-
-sub is_5_1_in_pulseaudio_enabled() {
- my ($val) = cat_($pulse_config_file) =~ /^default-sample-channels\s*=\s*(\d+)/m; #^
- $val ||= 2;
- $val == 6;
-}
-
-sub set_5_1_in_pulseaudio {
- my ($val) = @_;
- $val = 'default-sample-channels = ' . ($val ? 6 : 2) . "\n";
- my $done;
- substInFile {
- if (/^default-sample-channels\s*=/) {
- $_ = $val;
- $done = 1;
- }
- } $pulse_config_file;
- append_to_file($pulse_config_file, $val) if !$done;
+ } $pa_startup_scriptfile;
}
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 {
@@ -303,9 +77,7 @@ 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;
- unload($old_driver); # run_program("/sbin/modprobe -r $driver"); # just in case ...
+ unload($old_driver); # run_program("/sbin/modprobe -r $driver");
}
$modules_conf->remove_module($old_driver);
configure_one_sound_slot($modules_conf, $index, $new_driver);
@@ -313,42 +85,35 @@ 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("/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;
+ load($modules_conf, $new_driver) 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');
+ my $is_pulseaudio_installed = (-f $pa_startup_scriptfile && -d '/etc/sound/profiles/pulse');
my $is_pulseaudio_enabled = is_pulseaudio_enabled();
my $is_pulseaudio_glitchfree_enabled = is_pulseaudio_glitchfree_enabled();
- my $is_5_1_in_pulseaudio_enabled = is_5_1_in_pulseaudio_enabled();
- my $is_user_switching = is_user_switching_enabled();
my $old_value = $is_pulseaudio_enabled;
my $write_config = sub {
+ return if !$is_pulseaudio_installed;
set_pulseaudio($is_pulseaudio_enabled);
set_pulseaudio_glitchfree($is_pulseaudio_glitchfree_enabled);
- set_PA_autospan($is_pulseaudio_enabled);
- set_5_1_in_pulseaudio($is_5_1_in_pulseaudio_enabled);
- set_user_switching($is_user_switching);
if ($is_pulseaudio_enabled) {
my $lib = (arch() =~ /x86_64/ ? 'lib64' : 'lib');
$in->do_pkgs->ensure_is_installed($lib . 'alsa-plugins-pulseaudio',
@@ -357,28 +122,19 @@ sub switch {
if ($old_value ne $is_pulseaudio_enabled) {
require any;
any::ask_for_X_restart($in);
- }
+ }
};
my @common = (
- get_any_driver_entry($in, $modules_conf, $driver, $device),
{
text => N("Enable PulseAudio"),
type => 'bool', val => \$is_pulseaudio_enabled,
- },
- {
- text => N("Enable 5.1 sound with Pulse Audio"),
- type => 'bool', val => \$is_5_1_in_pulseaudio_enabled,
- disabled => sub { !$is_pulseaudio_enabled },
- },
- {
- text => N("Enable user switching for audio applications"),
- type => 'bool', val => \$is_user_switching,
+ disabled => sub { !$is_pulseaudio_installed },
},
{
text => N("Use Glitch-Free mode"),
type => 'bool', val => \$is_pulseaudio_glitchfree_enabled,
- disabled => sub { !$is_pulseaudio_enabled },
+ disabled => sub { !$is_pulseaudio_installed || !$is_pulseaudio_enabled },
},
{
advanced => 1,
@@ -387,7 +143,7 @@ sub switch {
},
{
advanced => 1,
- val => N("Trouble shooting"), disabled => sub {},
+ val => N("Troubleshooting"), disabled => sub {},
clicked => sub { &trouble($in) }
},
);
@@ -404,12 +160,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.
@@ -418,77 +173,77 @@ ALSA (Advanced Linux Sound Architecture) is a modularized architecture which
supports quite a large range of ISA, USB and PCI cards.\n
It also provides a much higher API than OSS.\n
To use alsa, one can either use:
-- the old compatibility OSS api
-- the new ALSA api that provides many enhanced features but requires using the ALSA library.
+- the old compatibility OSS API
+- the new ALSA API that provides many enhanced features but requires using the ALSA library.
");
},
},
[
+ 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 trouble shooting"),
+ $in->ask_warn(N("Sound troubleshooting"),
formatAlaTeX(
#-PO: keep the double empty lines between sections, this is formatted a la LaTeX
- N("The classic bug sound tester is to run the following commands:
+ N("Below are some basic tips to help debug audio problems, but for accurate and up-to-date tips and tricks, please see:
+
+https://wiki.mageia.org/en/Support:DebuggingSoundProblems
+
+
+
+- General Recommendation: Enable PulseAudio. If you have opted to not to use PulseAudio, we would strongly advise you enable it. For the vast majority of desktop use cases, PulseAudio is the recommended and best supported option.
+
+
+
+- \"kmix\" (KDE), \"gnome-control-center sound\" (GNOME) and \"pavucontrol\" (generic) will launch graphical applications to allow you to view your sound devices and adjust volume levels
+
+
+- \"ps aux | grep pulseaudio\" will check that PulseAudio is running.
+
+
+- \"pactl stat\" will check that you can connect to the PulseAudio daemon correctly.
+
+
+- \"pactl list sink-inputs\" will tell you which programs are currently playing sound via PulseAudio.
+
+
+- \"systemctl status osspd.service\" will tell you the current state of the OSS Proxy Daemon. This is used to enable sound from legacy applications which use the OSS sound API. You should install the \"ossp\" package if you need this functionality.
+
+
+- \"pacmd ls\" will give you a LOT of debug information about the current state of your audio.
+
+- \"lspcidrake -v | grep -i audio\" will tell you which low-level driver your card uses by default.
-- \"lspcidrake -v | fgrep -i AUDIO\" will tell you which driver your card uses
-by default
-- \"grep sound-slot /etc/modprobe.conf\" will tell you what driver it
-currently uses
+- \"/usr/sbin/lsmod | grep snd\" will enable you to check which sound related kernel modules (drivers) are loaded.
-- \"/sbin/lsmod\" will enable you to check if its module (driver) is
-loaded or not
-- \"/sbin/chkconfig --list sound\" and \"/sbin/chkconfig --list alsa\" will
-tell you if sound and alsa services are configured to be run on
-initlevel 3
+- \"alsamixer -c 0\" will give you a text-based mixer to the low level ALSA mixer controls for first sound card
-- \"aumix -q\" will tell you if the sound volume is muted or not
-- \"/sbin/fuser -v /dev/dsp\" will tell which program uses the sound card.
+- \"/usr/sbin/fuser -v /dev/snd/pcm* /dev/dsp\" will tell which programs are currently using the sound card directly (normally this should only show PulseAudio)
")));
}
@@ -504,7 +259,7 @@ sub get_any_driver_entry {
formatAlaTeX(
#-PO: keep the double empty lines between sections, this is formatted a la LaTeX
N("If you really think that you know which driver is the right one for your card
-you can pick one in the above list.
+you can pick one from the list below.
The current driver for your \"%s\" sound card is \"%s\" ", $device->{description}, $driver)),
[
@@ -531,7 +286,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});
}
diff --git a/perl-install/harddrake/v4l.pm b/perl-install/harddrake/v4l.pm
index 7711c250a..12d130240 100644
--- a/perl-install/harddrake/v4l.pm
+++ b/perl-install/harddrake/v4l.pm
@@ -473,7 +473,7 @@ sub config {
if ($in->ask_from("BTTV configuration", N("For most modern TV cards, the bttv module of the GNU/Linux kernel just auto-detect the rights parameters.
-If your card is misdetected, you can force the right tuner and card types here. Just select your tv card parameters if needed."),
+If your card is misdetected, you can force the right tuner and card types here. Just select your TV card parameters if needed."),
[
{ label => N("Card model:"), val => \$conf{card}, list => [ keys %cards_list ], default => -1, sort =>1, separator => '|' },
{ label => N("Tuner type:"), val => \$conf{tuner}, list => [keys %tuners_lst], format => sub { $tuners_lst{$_[0]} }, sort => 1, separator => '|' },
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-03 15:15:14 +0000