rpms/kdebase-runtime/devel kdebase-runtime-4.1.70-pulseaudio.patch, NONE, 1.1 kdebase-runtime.spec, 1.78, 1.79

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5396/devel

Modified Files:
	kdebase-runtime.spec 
Added Files:
	kdebase-runtime-4.1.70-pulseaudio.patch 
Log Message:
* Thu Nov 20 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.80-3
- readd still relevant part of the Phonon PulseAudio patch (for the KCM)

kdebase-runtime-4.1.70-pulseaudio.patch:

--- NEW FILE kdebase-runtime-4.1.70-pulseaudio.patch ---
diff -Naur kdebase-runtime-4.1.70/phonon/kcm/globalconfig.cpp kdebase-runtime-4.1.70.pulseaudio/phonon/kcm/globalconfig.cpp
--- kdebase-runtime-4.1.70/phonon/kcm/globalconfig.cpp	2008-07-17 23:32:48.000000000 +0200
+++ kdebase-runtime-4.1.70.pulseaudio/phonon/kcm/globalconfig.cpp	2008-10-21 18:49:35.000000000 +0200
@@ -28,6 +28,7 @@
 #include "phononnamespace_p.h"
 
 #include <QtCore/QList>
+#include <QtCore/QHash>
 #include <QtCore/QVariant>
 
 QT_BEGIN_NAMESPACE
@@ -158,6 +159,15 @@
                     | (defaultList.isEmpty() ? 0 : FilterHardwareDevices)
                     );
         }
+        // make PulseAudio the global default (assume it is already default in this list)
+        if (!list.isEmpty()) {
+            int firstIndex = list.first();
+            if (backendIface->objectDescriptionProperties(Phonon::AudioOutputDeviceType,
+                  firstIndex)["name"].toString() == "PulseAudio") {
+                list.removeFirst();
+                defaultList.prepend(firstIndex);
+            }
+        }
         defaultList += list;
     }
 
@@ -212,6 +222,15 @@
                     | (defaultList.isEmpty() ? 0 : FilterHardwareDevices)
                   );
         }
+        // make PulseAudio the global default (assume it is already default in this list)
+        if (!list.isEmpty()) {
+            int firstIndex = list.first();
+            if (backendIface->objectDescriptionProperties(Phonon::AudioCaptureDeviceType,
+                  firstIndex)["name"].toString() == "PulseAudio") {
+                list.removeFirst();
+                defaultList.prepend(firstIndex);
+            }
+        }
         defaultList += list;
     }
 


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- kdebase-runtime.spec	19 Nov 2008 22:08:54 -0000	1.78
+++ kdebase-runtime.spec	20 Nov 2008 14:52:12 -0000	1.79
@@ -8,13 +8,14 @@
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
 Version:       4.1.80
-Release:       2%{?dist}
+Release:       3%{?dist}
 
 License:       GPLv2
 Group:         User Interface/Desktops
 URL:           http://www.kde.org/
 Source0:       ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-runtime-%{version}.tar.bz2
 Source1:       khelpcenter.desktop
+Patch0:        kdebase-runtime-4.1.70-pulseaudio.patch
 Patch1:        kdebase-runtime-4.1.x-searchproviders-shortcuts.patch
 Patch2:        kdebase-runtime-4.1.1-knetattach.patch
 Patch3:        kdebase-runtime-4.1.1-iconthemes-inherit.patch
@@ -98,6 +99,7 @@
 %prep
 %setup -q -n kdebase-runtime-%{version}
 
+%patch0 -p1 -b .pulseaudio
 %patch1 -p1 -b .searchproviders-shortcuts
 %patch2 -p1 -b .knetattach
 %patch3 -p1 -b .iconthemes-inherit
@@ -330,6 +332,9 @@
 
 
 %changelog
+* Thu Nov 20 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.80-3
+- readd still relevant part of the Phonon PulseAudio patch (for the KCM)
+
 * Wed Nov 19 2008 Than Ngo <than at redhat.com> 4.1.80-2
 - drop kdebase-runtime-4.0.72-pulseaudio.patch/icons, it's part of phonon