rpms/kdebase-runtime/F-8 kdebase-runtime-4.1.0-pulseaudio.patch, NONE, 1.1 kdebase-runtime.spec, 1.15, 1.16
Kevin Kofler (kkofler)
fedora-extras-commits at redhat.com
Wed Aug 13 10:31:32 UTC 2008
- Previous message (by thread): rpms/gnome-ppp/devel dead.package, NONE, 1.1 Makefile, 1.1, NONE gnome-ppp.apps, 1.1, NONE gnome-ppp.pam, 1.1, NONE gnome-ppp.spec, 1.6, NONE sources, 1.2, NONE
- Next message (by thread): rpms/kdebase-runtime/F-9 kdebase-runtime-4.1.0-pulseaudio.patch, NONE, 1.1 kdebase-runtime.spec, 1.51, 1.52
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: kkofler
Update of /cvs/pkgs/rpms/kdebase-runtime/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31610/F-8
Modified Files:
kdebase-runtime.spec
Added Files:
kdebase-runtime-4.1.0-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/F-8/kdebase-runtime.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- kdebase-runtime.spec 12 Aug 2008 20:52:40 -0000 1.15
+++ kdebase-runtime.spec 13 Aug 2008 10:31:02 -0000 1.16
@@ -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
- Previous message (by thread): rpms/gnome-ppp/devel dead.package, NONE, 1.1 Makefile, 1.1, NONE gnome-ppp.apps, 1.1, NONE gnome-ppp.pam, 1.1, NONE gnome-ppp.spec, 1.6, NONE sources, 1.2, NONE
- Next message (by thread): rpms/kdebase-runtime/F-9 kdebase-runtime-4.1.0-pulseaudio.patch, NONE, 1.1 kdebase-runtime.spec, 1.51, 1.52
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list