Mailinglist Archive: yast-commit (2114 mails)

< Previous Next >
[yast-commit] r58692 - in /trunk/sound: package/yast2-sound.changes sound/src/PulseAudio.ycp
  • From: lslezak@xxxxxxxxxxxxxxxx
  • Date: Mon, 21 Sep 2009 15:33:06 -0000
  • Message-id: <E1Mpkt0-0005Qb-3u@xxxxxxxxxxxxxxxx>
Author: lslezak
Date: Mon Sep 21 17:33:05 2009
New Revision: 58692

URL: http://svn.opensuse.org/viewcvs/yast?rev=58692&view=rev
Log:
- Disable PulseAudio in KDE installations (bnc#537784)

Modified:
trunk/sound/package/yast2-sound.changes
trunk/sound/sound/src/PulseAudio.ycp

Modified: trunk/sound/package/yast2-sound.changes
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/sound/package/yast2-sound.changes?rev=58692&r1=58691&r2=58692&view=diff
==============================================================================
--- trunk/sound/package/yast2-sound.changes (original)
+++ trunk/sound/package/yast2-sound.changes Mon Sep 21 17:33:05 2009
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Mon Sep 21 17:25:25 CEST 2009 - lslezak@xxxxxxx
+
+- Disable PulseAudio in KDE installations (bnc#537784)
+
+-------------------------------------------------------------------
Tue Jun 16 14:58:02 CEST 2009 - mvidner@xxxxxxx

- Using autodocs-ycp.ami, which contains a fix for automake 1.11.

Modified: trunk/sound/sound/src/PulseAudio.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/sound/sound/src/PulseAudio.ycp?rev=58692&r1=58691&r2=58692&view=diff
==============================================================================
--- trunk/sound/sound/src/PulseAudio.ycp (original)
+++ trunk/sound/sound/src/PulseAudio.ycp Mon Sep 21 17:33:05 2009
@@ -46,6 +46,20 @@
// reset the modification flag
modified = false;

+ if (Mode::installation())
+ {
+ y2milestone("Installation mode detected, PA status will be based on the
desktop");
+
+ string sysconf =
(string)SCR::Read(.sysconfig.displaymanager.DISPLAYMANAGER);
+ y2milestone("DISPLAYMANAGER: %1", sysconf);
+
+ pa_enabled = !regexpmatch(sysconf, "^kdm.*$");
+ if (pa_enabled == nil) pa_enabled = true;
+
+ y2milestone("PulseAudio enabled: %1", pa_enabled);
+ return true;
+ }
+
if (FileUtils::Exists(pa_setup_script))
{
map out = (map)SCR::Execute(.target.bash_output, pa_setup_script + "
--status");

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages