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

List:       kde-commits
Subject:    kdesupport/phonon/xine
From:       Colin Guthrie <kde () colin ! guthr ! ie>
Date:       2010-01-30 11:47:14
Message-ID: 1264852034.433342.522.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1082380 by cguthrie:

xine: Remove unnecessary PulseSupport calls now that the library no longer asks us \
for this when PA is active.

 M  +0 -8      backend.cpp  


--- trunk/kdesupport/phonon/xine/backend.cpp #1082379:1082380
@@ -208,10 +208,6 @@
 
 QList<int> Backend::objectDescriptionIndexes(ObjectDescriptionType type) const
 {
-    PulseSupport *pulse = PulseSupport::getInstance();
-    if (pulse->isActive() && (Phonon::AudioOutputDeviceType == type || \
                Phonon::AudioCaptureDeviceType == type))
-        return pulse->objectDescriptionIndexes(type);
-
     QList<int> list;
     switch(type)
     {
@@ -264,10 +260,6 @@
 
 QHash<QByteArray, QVariant> \
Backend::objectDescriptionProperties(ObjectDescriptionType type, int index) const  {
-    PulseSupport *pulse = PulseSupport::getInstance();
-    if (pulse->isActive() && (Phonon::AudioOutputDeviceType == type || \
                Phonon::AudioCaptureDeviceType == type))
-        return pulse->objectDescriptionProperties(type, index);
-
     //debug() << Q_FUNC_INFO << type << index;
     QHash<QByteArray, QVariant> ret;
     switch (type) {


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