From a1a3e2f013e06a3847b014292ca6fb52f8d20ba5 Mon Sep 17 00:00:00 2001
From: Colin Guthrie <colin@mageia.org>
Date: Fri, 6 Apr 2012 21:30:12 +0100
Subject: [PATCH 100/101] Prevent kmixctrl running with PulseAudio.
kmixctrl should not save/restore volumes when PulseAudio is used, but
our event loop detection was such that the PulseAudio mixer would refuse
to run as kmixctrl was marked as a non-GUI program
---
kmix/backends/mixer_pulse.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/backends/mixer_pulse.cpp b/backends/mixer_pulse.cpp
index d8732f3..3b2658e 100644
--- a/kmix/backends/mixer_pulse.cpp
+++ b/kmix/backends/mixer_pulse.cpp
@@ -891,9 +891,9 @@ Mixer_PULSE::Mixer_PULSE(Mixer *mixer, int devnum) : Mixer_Backend(mixer, devnum
s_pulseActive = INACTIVE;
// We require a glib event loop
- if (QLatin1String(QAbstractEventDispatcher::instance()->metaObject()->className())
- != "QGuiEventDispatcherGlib") {
- kDebug(67100) << "Disabling PulseAudio integration for lack of GLib event loop.";
+ QLatin1String dispatcher = QLatin1String(QAbstractEventDispatcher::instance()->metaObject()->className());
+ if ("QGuiEventDispatcherGlib" != dispatcher && "QEventDispatcherGlib" != dispatcher) {
+ kDebug(67100) << "Disabling PulseAudio integration for lack of GLib event loop: " << dispatcher;
s_pulseActive = INACTIVE;
}
--
1.7.9.3