rpms/phonon/devel phonon-4.3.80-pulseaudio-device-priorities.patch, NONE, 1.1 phonon.spec, 1.61, 1.62
Kevin Kofler
kkofler at fedoraproject.org
Fri Jan 22 15:13:13 UTC 2010
Author: kkofler
Update of /cvs/pkgs/rpms/phonon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22067/devel
Modified Files:
phonon.spec
Added Files:
phonon-4.3.80-pulseaudio-device-priorities.patch
Log Message:
Sync up (no builds needed):
* Fri Jan 22 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.80-5.1
- F11: port the old PA device priorities patch as we don't have PA integration
phonon-4.3.80-pulseaudio-device-priorities.patch:
globalconfig.cpp | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
--- NEW FILE phonon-4.3.80-pulseaudio-device-priorities.patch ---
diff -ur phonon-4.3.80/phonon/globalconfig.cpp phonon-4.3.80-pulseaudio-device-priorities/phonon/globalconfig.cpp
--- phonon-4.3.80/phonon/globalconfig.cpp 2009-12-03 20:29:35.000000000 +0100
+++ phonon-4.3.80-pulseaudio-device-priorities/phonon/globalconfig.cpp 2010-01-22 15:57:25.000000000 +0100
@@ -33,6 +33,7 @@
#include "pulsesupport_p.h"
#include <QtCore/QList>
+#include <QtCore/QHash>
#include <QtCore/QVariant>
QT_BEGIN_NAMESPACE
@@ -314,6 +315,15 @@
| ((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)["icon"].toString() == "audio-backend-pulseaudio") {
+ list.removeFirst();
+ defaultList.prepend(firstIndex);
+ }
+ }
defaultList += list;
}
@@ -394,6 +404,15 @@
| ((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)["icon"].toString() == "audio-backend-pulseaudio") {
+ list.removeFirst();
+ defaultList.prepend(firstIndex);
+ }
+ }
defaultList += list;
}
Index: phonon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/devel/phonon.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- phonon.spec 21 Jan 2010 20:44:40 -0000 1.61
+++ phonon.spec 22 Jan 2010 15:13:13 -0000 1.62
@@ -4,7 +4,7 @@
Summary: Multimedia framework api
Name: phonon
Version: 4.3.80
-Release: 5%{?dist}
+Release: 5%{?dist}.1
Group: System Environment/Libraries
License: LGPLv2+
URL: http://phonon.kde.org/
@@ -21,9 +21,10 @@ Source14: hi48-phonon-gstreamer.png
Source15: hi64-phonon-gstreamer.png
Source16: hi128-phonon-gstreamer.png
-# Prefer PulseAudio
-# This one was easiest to port, but doesn't seem to work by itself as-is
-# maybe we can just wait for the improvie PA support to land.
+# Make PulseAudio the default when listed by the Xine backend and native
+# PulseAudio integration is not available (e.g. F-11 with too old PulseAudio).
+Patch0: phonon-4.3.80-pulseaudio-device-priorities.patch
+# Give PulseAudio the highest priority in the Xine backend so the above works.
Patch1: phonon-4.3.50-xine_pulseaudio.patch
## Mandriva/upstreamable patches
@@ -95,6 +96,7 @@ Provides: %{name}-backend-gst = %{versi
%setup -q -n phonon%{!?snap:-%{version}}
%if 0%{?pa_keep_old_hacks}
+%patch0 -p1 -b .pulseaudio-device-priorities
%patch1 -p1 -b .xine_pulseaudio
%endif
@@ -208,6 +210,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
%changelog
+* Fri Jan 22 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.80-5.1
+- F11: port the old PA device priorities patch as we don't have PA integration
+
* Thu Jan 21 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.80-5
- no sound with phonon-xine/pulseaudio (kde#223662, rh#553945)
More information about the scm-commits
mailing list