[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdesupport/phonon
From:       Colin Guthrie <kde () colin ! guthr ! ie>
Date:       2009-11-20 0:10:09
Message-ID: 1258675809.832687.32235.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1051715 by cguthrie:

pulsesupport: Move the setOutputDevice noop with pulse enabled out of the backend and \
into the phonon abstraction layer.

 M  +0 -7      gstreamer/audiooutput.cpp  
 M  +8 -0      phonon/audiooutput.cpp  


--- trunk/kdesupport/phonon/gstreamer/audiooutput.cpp #1051714:1051715
@@ -22,7 +22,6 @@
 #include "mediaobject.h"
 #include "gsthelper.h"
 #include <phonon/audiooutput.h>
-#include <phonon/pulsesupport_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -127,11 +126,6 @@
 {
     m_backend->logMessage(Q_FUNC_INFO + QString::number(newDevice), Backend::Info, \
this);  
-    // If we are using PulseAudio we don't acutally change devices at all.
-    // Also the fact that m_device is initialised to 0 breaks things totally when \
                the index is not 0 :s
-    if (PulseSupport::getInstance()->isActive())
-        return true;
-
     if (newDevice == m_device)
         return true;
 
@@ -146,7 +140,6 @@
         // Save previous state
         GstState oldState = GST_STATE(m_audioSink);
         const QByteArray oldDeviceValue = GstHelper::property(m_audioSink, \
                "device");
-        // Due to Pulseaudio related cosmetic hacks in devicemanager.cpp we have to \
                fix up the "device"
         const QByteArray deviceId = m_backend->deviceManager()->gstId(newDevice);
         m_device = newDevice;
 
--- trunk/kdesupport/phonon/phonon/audiooutput.cpp #1051714:1051715
@@ -220,6 +220,10 @@
 
 bool AudioOutput::setOutputDevice(const AudioOutputDevice &newAudioOutputDevice)
 {
+    // If we are using PulseAudio we don't acutally change devices at all.
+    if (PulseSupport::getInstance()->isActive())
+        return true;
+
     K_D(AudioOutput);
     if (!newAudioOutputDevice.isValid()) {
         d->outputDeviceOverridden = false;
@@ -363,6 +367,10 @@
 
 void AudioOutputPrivate::handleAutomaticDeviceChange(const AudioOutputDevice \
&device2, DeviceChangeType type)  {
+    // If we are using PulseAudio we don't acutally change devices at all.
+    if (PulseSupport::getInstance()->isActive())
+        return;
+
     Q_Q(AudioOutput);
     deviceBeforeFallback = device.index();
     device = device2;


[prev in list] [next in list] [prev in thread] [next in thread]