summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/harddrake/sound.pm25
2 files changed, 2 insertions, 25 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 57e51a8a7..2edd6500c 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+- draksound: Remove the "Enable user switching..." option as it relies on HAL
+ which is deprecated.
- Change scannerdrake to use skanlite instead of kooka
- any.pm: s!/usr/share/mdk/faces/!/usr/share/mga/faces/! should fix (mga#1315)
diff --git a/perl-install/harddrake/sound.pm b/perl-install/harddrake/sound.pm
index 3871e30e8..16d26c3da 100644
--- a/perl-install/harddrake/sound.pm
+++ b/perl-install/harddrake/sound.pm
@@ -181,25 +181,6 @@ our %oss2alsa =
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$/;
@@ -339,7 +320,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 $is_user_switching = is_user_switching_enabled();
my $old_value = $is_pulseaudio_enabled;
@@ -348,7 +328,6 @@ sub switch {
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',
@@ -372,10 +351,6 @@ sub switch {
disabled => sub { !$is_pulseaudio_enabled },
},
{
- text => N("Enable user switching for audio applications"),
- type => 'bool', val => \$is_user_switching,
- },
- {
text => N("Use Glitch-Free mode"),
type => 'bool', val => \$is_pulseaudio_glitchfree_enabled,
disabled => sub { !$is_pulseaudio_enabled },