rpms/kdebase-runtime/devel kdebase-runtime-4.1.0-pulseaudio.patch, NONE, 1.1 kdebase-runtime.spec, 1.63, 1.64 kdebase-runtime-4.0.72-pulseaudio.patch, 1.1, NONE

[Kevin Kofler (kkofler)]

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase-runtime/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31610/devel

Modified Files:
	kdebase-runtime.spec 
Added Files:
	kdebase-runtime-4.1.0-pulseaudio.patch 
Removed Files:
	kdebase-runtime-4.0.72-pulseaudio.patch 
Log Message:
* Wed Aug 13 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.0-3
- fix PA not being default in the Xine backend (KCM part, see phonon-4.2.0-4)

kdebase-runtime-4.1.0-pulseaudio.patch:

--- NEW FILE kdebase-runtime-4.1.0-pulseaudio.patch ---
diff -ur kdebase-runtime-4.1.0/phonon/kcm/globalconfig.cpp kdebase-runtime-4.1.0-pulseaudio/phonon/kcm/globalconfig.cpp
--- kdebase-runtime-4.1.0/phonon/kcm/globalconfig.cpp	2008-07-17 23:32:48.000000000 +0200
+++ kdebase-runtime-4.1.0-pulseaudio/phonon/kcm/globalconfig.cpp	2008-08-13 12:24: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;
     }
 
diff -ur kdebase-runtime-4.1.0/phonon/xine/xineengine.cpp kdebase-runtime-4.1.0-pulseaudio/phonon/xine/xineengine.cpp
--- kdebase-runtime-4.1.0/phonon/xine/xineengine.cpp	2008-06-25 09:52:51.000000000 +0200
+++ kdebase-runtime-4.1.0-pulseaudio/phonon/xine/xineengine.cpp	2008-08-13 12:23:42.000000000 +0200
@@ -369,9 +369,9 @@
                                 "in KDE2 and KDE3. Its use is discouraged.</p></html>"),
                             /*icon name */"audio-backend-arts", outputPlugins[i]);
                 } else if (0 == strcmp(outputPlugins[i], "pulseaudio")) {
-                    addAudioOutput(nextIndex++, 10, i18n("PulseAudio"),
+                    addAudioOutput(nextIndex++, 2000, i18n("PulseAudio"),
                             xine_get_audio_driver_plugin_description(xine(), outputPlugins[i]),
-                            /*icon name */"audio-backend-pulseaudio", outputPlugins[i], true /*isAdvanced*/);
+                            /*icon name */"audio-backend-pulseaudio", outputPlugins[i]);
                 } else if (0 == strcmp(outputPlugins[i], "esd")) {
                     addAudioOutput(nextIndex++, 8, i18n("Esound (ESD)"),
                             xine_get_audio_driver_plugin_description(xine(), outputPlugins[i]),


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- kdebase-runtime.spec	12 Aug 2008 14:06:27 -0000	1.63
+++ kdebase-runtime.spec	13 Aug 2008 10:31:03 -0000	1.64
@@ -8,14 +8,14 @@
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime 
 Version:       4.1.0
-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.0.72-pulseaudio.patch
+Patch0:        kdebase-runtime-4.1.0-pulseaudio.patch
 Patch1:        kdebase-runtime-4.1.x-searchproviders-shortcuts.patch
 Patch100:      kdebase-runtime-4.1.0-nepomuk.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -336,6 +336,9 @@
 
 
 %changelog
+* Wed Aug 13 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.0-3
+- fix PA not being default in the Xine backend (KCM part, see phonon-4.2.0-4)
+
 * Tue Aug 12 2008 Than Ngo <than at redhat.com> 4.1.0-2
 - crash fix when stopping a service that is not yet initialized
 


--- kdebase-runtime-4.0.72-pulseaudio.patch DELETED ---