From 985fd0995bb2cefe30e3e829b33bfb44e54885f2 Mon Sep 17 00:00:00 2001
From: Colin Guthrie <colin@mageia.org>
Date: Wed, 18 May 2011 22:38:52 +0000
Subject: draksound: Remove the 'Enable 5.1...' option. This is now done via
 card profiles in native GUIs for GNOME and KDE (or pavucontrol)

---
 perl-install/harddrake/sound.pm | 26 --------------------------
 1 file changed, 26 deletions(-)

(limited to 'perl-install/harddrake/sound.pm')

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',
@@ -345,11 +324,6 @@ sub switch {
                 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("Use Glitch-Free mode"),
                 type => 'bool', val => \$is_pulseaudio_glitchfree_enabled,
-- 
cgit v1.2.1