summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Guthrie <colin@mageia.org>2011-05-18 22:38:52 +0000
committerColin Guthrie <colin@mageia.org>2011-05-18 22:38:52 +0000
commit985fd0995bb2cefe30e3e829b33bfb44e54885f2 (patch)
treee2e353ee45517ab55f0f8f7a546fb7a709f1852e
parenta863d327c10397278f9ac94cbb6a58aa0b3a8775 (diff)
downloaddrakx-985fd0995bb2cefe30e3e829b33bfb44e54885f2.tar
drakx-985fd0995bb2cefe30e3e829b33bfb44e54885f2.tar.gz
drakx-985fd0995bb2cefe30e3e829b33bfb44e54885f2.tar.bz2
drakx-985fd0995bb2cefe30e3e829b33bfb44e54885f2.tar.xz
drakx-985fd0995bb2cefe30e3e829b33bfb44e54885f2.zip
draksound: Remove the 'Enable 5.1...' option. This is now done via card profiles in native GUIs for GNOME and KDE (or pavucontrol)
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/harddrake/sound.pm26
2 files changed, 2 insertions, 26 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 2edd6500c..ce4805f65 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+- draksound: Remove the "Enable 5.1..." option. This is now done via card profiles
+ in native GUIs for GNOME and KDE (or pavucontrol)
- draksound: Remove the "Enable user switching..." option as it relies on HAL
which is deprecated.
- Change scannerdrake to use skanlite instead of kooka
diff --git a/perl-install/harddrake/sound.pm b/perl-install/harddrake/sound.pm
index 16d26c3da..d06dd708d 100644
--- a/perl-install/harddrake/sound.pm
+++ b/perl-install/harddrake/sound.pm
@@ -243,25 +243,6 @@ sub set_PA_autospan {
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;
-}
-
sub rooted { run_program::rooted($::prefix, @_) }
@@ -319,7 +300,6 @@ sub switch {
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 $old_value = $is_pulseaudio_enabled;
@@ -327,7 +307,6 @@ sub switch {
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);
if ($is_pulseaudio_enabled) {
my $lib = (arch() =~ /x86_64/ ? 'lib64' : 'lib');
$in->do_pkgs->ensure_is_installed($lib . 'alsa-plugins-pulseaudio',
@@ -346,11 +325,6 @@ sub switch {
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("Use Glitch-Free mode"),
type => 'bool', val => \$is_pulseaudio_glitchfree_enabled,
disabled => sub { !$is_pulseaudio_enabled },