rpms/kdelibs
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Fri Jan 04 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.97.0-11

Browse Source 
- force Phonon to use the ALSA default device by default
This commit is contained in:
Kevin Kofler 2008-01-04 15:26:31 +00:00
parent 9c57d8b13c
commit 2affe2b966
2 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
kdelibs-3.97.0-alsa-default-device.patch Normal file
View File

@ -0,0 +1,27 @@
diff -ur kdelibs-3.97.0/phonon/libkaudiodevicelist/audiodevice.cpp kdelibs-3.97.0-alsa-default-device/phonon/libkaudiodevicelist/audiodevice.cpp
--- kdelibs-3.97.0/phonon/libkaudiodevicelist/audiodevice.cpp 2007-11-20 23:02:30.000000000 +0100
+++ kdelibs-3.97.0-alsa-default-device/phonon/libkaudiodevicelist/audiodevice.cpp 2008-01-04 16:23:04.000000000 +0100
@@ -349,6 +349,8 @@
if (lines.size() > 1) {
d->cardName = i18n("%1 (%2)", d->cardName, lines[1]);
}
+ if (alsaDeviceName == "default")
+ d->initialPreference = 1000;
if (alsaDeviceName.startsWith("front:") ||
alsaDeviceName.startsWith("rear:") ||
alsaDeviceName.startsWith("center_lfe:") ||
diff -ur kdelibs-3.97.0/phonon/libkaudiodevicelist/audiodeviceenumerator.cpp kdelibs-3.97.0-alsa-default-device/phonon/libkaudiodevicelist/audiodeviceenumerator.cpp
--- kdelibs-3.97.0/phonon/libkaudiodevicelist/audiodeviceenumerator.cpp 2007-11-27 18:17:14.000000000 +0100
+++ kdelibs-3.97.0-alsa-default-device/phonon/libkaudiodevicelist/audiodeviceenumerator.cpp 2008-01-04 16:23:04.000000000 +0100
@@ -188,6 +188,11 @@
}
snd_device_name_free_hint(hints);
+ DeviceHint defaultHint;
+ defaultHint.name = QString::fromLatin1("default");
+ defaultHint.description= QString::fromLatin1("ALSA Default Device");
+ deviceHints << defaultHint;
+
snd_config_update_free_global();
snd_config_update();
Q_ASSERT(snd_config);

9
kdelibs.spec
View File

@ -4,7 +4,7 @@
Summary: K Desktop Environment 4 - Libraries
Version: 3.97.0
Release: 10%{?dist}
Release: 11%{?dist}
%if 0%{?fedora} > 8
Name: kdelibs
@ -51,6 +51,9 @@ Patch2: kdelibs-3.95.0-kde149705.patch
# FLAC 1.1.3+ support for FindFlac.cmake (patch by Alex Merry)
# http://lists.kde.org/?l=kde-multimedia&m=119806833708186&w=2
Patch3: kdelibs-3.97.0-flac113.patch
# Force Phonon to use the ALSA default device by default
# This should make it work better with PulseAudio.
Patch4: kdelibs-3.97.0-alsa-default-device.patch
BuildRequires: qt4-devel >= 4.3.0
Requires: qt4 >= %{_qt4_version}
@ -129,6 +132,7 @@ applications for KDE 4.
%patch1 -p1 -b .kde149703
%patch2 -p1 -b .kde149705
%patch3 -p1 -b .flac113
%patch4 -p1 -b .alsa-default
%build
@ -257,6 +261,9 @@ rm -rf %{buildroot}
%changelog
* Fri Jan 04 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.97.0-11
- force Phonon to use the ALSA default device by default
* Wed Jan 02 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.97.0-10
- apply patch by Alex Merry to support FLAC 1.1.3+ in FindFlac.cmake