summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@gmail.com>2014-10-20 21:48:47 +0000
committerPascal Terjan <pterjan@gmail.com>2014-10-20 21:48:47 +0000
commit9e41003ebe5ee7256b5aed88d512e4042d64342a (patch)
tree7dfa6a014cc960b35828bb3d6567f0c44a52a6c2
parentd96031c745ce6a8a4054d2b9ae3ea3b392fbbc97 (diff)
downloaddrakx-9e41003ebe5ee7256b5aed88d512e4042d64342a.tar
drakx-9e41003ebe5ee7256b5aed88d512e4042d64342a.tar.gz
drakx-9e41003ebe5ee7256b5aed88d512e4042d64342a.tar.bz2
drakx-9e41003ebe5ee7256b5aed88d512e4042d64342a.tar.xz
drakx-9e41003ebe5ee7256b5aed88d512e4042d64342a.zip
draksound: adapt to the switch to systemd for spawning PulseAudio
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/harddrake/sound.pm21
2 files changed, 3 insertions, 20 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 6400a6ef2..bc1d0990d 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,4 +1,6 @@
- fix drakxservices not showing all services due to systemctl output change
+- draksound
+ o adapt to the switch to systemd for spawning PulseAudio
Version 16.42 - 18 September 2014
diff --git a/perl-install/harddrake/sound.pm b/perl-install/harddrake/sound.pm
index 2ca4b8e08..520402cb8 100644
--- a/perl-install/harddrake/sound.pm
+++ b/perl-install/harddrake/sound.pm
@@ -61,24 +61,6 @@ sub set_pulseaudio_glitchfree {
} $pa_startup_scriptfile;
}
-my $pa_client_conffile = "$::prefix/etc/pulse/client.conf";
-
-sub set_PA_autospan {
- my ($val) = @_;
-
- return if ! -f $pa_client_conffile;
-
- $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;
-}
-
sub rooted { run_program::rooted($::prefix, @_) }
@@ -129,7 +111,7 @@ sub config {
push @alternative, $driver;
my %des = modules::category2modules_and_description('multimedia/sound');
- my $is_pulseaudio_installed = (-f $pa_startup_scriptfile && -f $pa_client_conffile && -d '/etc/sound/profiles/pulse');
+ 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();
@@ -139,7 +121,6 @@ sub config {
return if !$is_pulseaudio_installed;
set_pulseaudio($is_pulseaudio_enabled);
set_pulseaudio_glitchfree($is_pulseaudio_glitchfree_enabled);
- set_PA_autospan($is_pulseaudio_enabled);
if ($is_pulseaudio_enabled) {
my $lib = (arch() =~ /x86_64/ ? 'lib64' : 'lib');
$in->do_pkgs->ensure_is_installed($lib . 'alsa-plugins-pulseaudio',