rpms/qt/devel qt-x11-opensource-src-4.5.2-pulseaudio.patch, NONE, 1.1 qt.spec, 1.313, 1.314 phonon-4.2.96-pulseaudio.patch, 1.1, NONE

[Than Ngo]

Author: than

Update of /cvs/extras/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17661

Modified Files:
	qt.spec 
Added Files:
	qt-x11-opensource-src-4.5.2-pulseaudio.patch 
Removed Files:
	phonon-4.2.96-pulseaudio.patch 
Log Message:
rename to qt-x11-opensource-src-4.5.2-pulseaudio.patch 


qt-x11-opensource-src-4.5.2-pulseaudio.patch:
 globalconfig.cpp |   19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

--- NEW FILE qt-x11-opensource-src-4.5.2-pulseaudio.patch ---
diff -up qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/phonon/globalconfig.cpp.phonon-pulseaudio qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/phonon/globalconfig.cpp
--- qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/phonon/globalconfig.cpp.phonon-pulseaudio	2009-06-20 06:57:54.000000000 +0200
+++ qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/phonon/globalconfig.cpp	2009-08-21 00:11:55.000000000 +0200
@@ -31,6 +31,7 @@
 #include "phononnamespace_p.h"
 
 #include <QtCore/QList>
+#include <QtCore/QHash>
 #include <QtCore/QVariant>
 
 QT_BEGIN_NAMESPACE
@@ -167,6 +168,15 @@ QList<int> GlobalConfig::audioOutputDevi
                     | ((override & HideUnavailableDevices) ? FilterUnavailableDevices : 0)
                     );
         }
+        // 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;
     }
 
@@ -222,6 +232,15 @@ QList<int> GlobalConfig::audioCaptureDev
                     | ((override & HideUnavailableDevices) ? FilterUnavailableDevices : 0)
                   );
         }
+        // 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: qt.spec
===================================================================
RCS file: /cvs/extras/rpms/qt/devel/qt.spec,v
retrieving revision 1.313
retrieving revision 1.314
diff -u -p -r1.313 -r1.314
--- qt.spec	21 Aug 2009 08:31:46 -0000	1.313
+++ qt.spec	21 Aug 2009 09:39:23 -0000	1.314
@@ -45,7 +45,7 @@ Patch15: qt-x11-opensource-src-4.5.1-ena
 # include kde4 plugin path, http://bugzilla.redhat.com/498809
 Patch16: qt-x11-opensource-src-4.5.1-kde4_plugins.patch 
 # make PulseAudio the default device in Phonon
-Patch17: phonon-4.2.96-pulseaudio.patch
+Patch17: qt-x11-opensource-src-4.5.2-pulseaudio.patch
 Patch19: qt-x11-opensource-src-4.5.1-phonon.patch
 Patch21: qt-x11-opensource-src-4.5.2-gst-pulsaudio.patch
 
@@ -377,9 +377,7 @@ Qt libraries used for drawing widgets an
 %patch13 -p1 -b .gcc_hack
 %patch15 -p1 -b .enable_ft_lcdfilter
 %patch16 -p1 -b .kde4_plugins
-pushd src/3rdparty/phonon
 %patch17 -p1 -b .phonon-pulseaudio
-popd
 %patch19 -p1 -b .servicesfile
 %patch21 -p1 -b .gst-pulsaudio
 %patch51 -p1 -b .qdoc3
@@ -393,7 +391,7 @@ popd
 
 # kde-qt branch
 %patch200 -p1 -b .kde-qt-patches-20090820git
-%patch201 -p1 -b .0118-qtcopy-define
+%patch201 -p0 -b .0118-qtcopy-define
 %patch202 -p0 -b .0283-do-not-deduce-scrollbar-extent-twice
 %patch203 -p0 -b .0285-qgv-dontshowchildren
 


--- phonon-4.2.96-pulseaudio.patch DELETED ---