rpms/kdelibs/devel kdelibs-3.97.0-alsa-default-device.patch, NONE, 1.1 kdelibs.spec, 1.258, 1.259

[Kevin Kofler (kkofler)]

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25420/devel

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-3.97.0-alsa-default-device.patch 
Log Message:
* Fri Jan 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.97.0-11
- force Phonon to use the ALSA default device by default

kdelibs-3.97.0-alsa-default-device.patch:

--- NEW FILE kdelibs-3.97.0-alsa-default-device.patch ---
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);


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.258
retrieving revision 1.259
diff -u -r1.258 -r1.259
--- kdelibs.spec	2 Jan 2008 18:00:27 -0000	1.258
+++ kdelibs.spec	4 Jan 2008 15:26:31 -0000	1.259
@@ -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 @@
 # 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 @@
 %patch1 -p1 -b .kde149703
 %patch2 -p1 -b .kde149705
 %patch3 -p1 -b .flac113
+%patch4 -p1 -b .alsa-default
 
 
 %build
@@ -257,6 +261,9 @@
 
 
 %changelog
+* Fri Jan 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.97.0-11
+- force Phonon to use the ALSA default device by default
+
 * Wed Jan 02 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.97.0-10
 - apply patch by Alex Merry to support FLAC 1.1.3+ in FindFlac.cmake