rpms/phonon/devel phonon-4.2.96-pulseaudio.patch, NONE, 1.1 phonon-4.2.96-xine-pulseaudio.patch, NONE, 1.1 phonon.spec, 1.18, 1.19 phonon-4.2.0-pulseaudio.patch, 1.1, NONE phonon-4.2.70-xine-pulseaudio.patch, 1.1, NONE

[Lorenzo Villani]

Author: arbiter

Update of /cvs/pkgs/rpms/phonon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30857

Modified Files:
	phonon.spec 
Added Files:
	phonon-4.2.96-pulseaudio.patch 
	phonon-4.2.96-xine-pulseaudio.patch 
Removed Files:
	phonon-4.2.0-pulseaudio.patch 
	phonon-4.2.70-xine-pulseaudio.patch 
Log Message:
- 4.2.96 but please wait for the tarballs to be released somewhere

phonon-4.2.96-pulseaudio.patch:

--- NEW FILE phonon-4.2.96-pulseaudio.patch ---
diff -Naurw phonon-4.2.96/phonon/globalconfig.cpp phonon-4.2.96.pulseaudio/phonon/globalconfig.cpp
--- phonon-4.2.96/phonon/globalconfig.cpp	2008-11-27 16:41:41.000000000 +0100
+++ phonon-4.2.96.pulseaudio/phonon/globalconfig.cpp	2009-01-08 21:29:18.000000000 +0100
@@ -31,6 +31,7 @@
 #include "phononnamespace_p.h"
 
 #include <QtCore/QList>
+#include <QtCore/QHash>
 #include <QtCore/QVariant>
 
 QT_BEGIN_NAMESPACE
@@ -167,6 +168,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)["name"].toString() == "PulseAudio") {
+                list.removeFirst();
+                defaultList.prepend(firstIndex);
+            }
+        }
         defaultList += list;
     }
 
@@ -222,6 +232,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)["name"].toString() == "PulseAudio") {
+                list.removeFirst();
+                defaultList.prepend(firstIndex);
+            }
+        }
         defaultList += list;
     }
 

phonon-4.2.96-xine-pulseaudio.patch:

--- NEW FILE phonon-4.2.96-xine-pulseaudio.patch ---
diff -Naurw phonon-4.2.96/xine/backend.cpp phonon-4.2.96.xine-pulseaudio/xine/backend.cpp
--- phonon-4.2.96/xine/backend.cpp	2008-12-19 08:08:53.000000000 +0100
+++ phonon-4.2.96.xine-pulseaudio/xine/backend.cpp	2009-01-08 21:31:10.000000000 +0100
@@ -649,7 +649,7 @@
                             "in KDE2 and KDE3. Its use is discuraged.</p></html>"),
                         /*icon name */"audio-backend-arts", outputPlugins[i]);
             } else if (0 == strcmp(outputPlugins[i], "pulseaudio")) {
-                addAudioOutput(nextIndex++, 10, tr("PulseAudio"),
+                addAudioOutput(nextIndex++, 2000, tr("PulseAudio"),
                         xine_get_audio_driver_plugin_description(m_xine, outputPlugins[i]),
                         /*icon name */"audio-backend-pulseaudio", outputPlugins[i]);
             } else if (0 == strcmp(outputPlugins[i], "esd")) {


Index: phonon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/devel/phonon.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- phonon.spec	12 Dec 2008 21:20:20 -0000	1.18
+++ phonon.spec	8 Jan 2009 21:00:00 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: Multimedia framework api
 Name:    phonon
-Version: 4.2.80
-Release: 3%{?dist}
+Version: 4.2.96
+Release: 1%{?dist}
 
 Group:   System Environment/Libraries
 License: LGPLv2+
@@ -14,8 +14,8 @@
 # set through systemsettings, and listed devices are only those supported by the
 # "sink". So it never lists "PulseAudio" as a supported device, you have to pick
 # it as a "sink", and then the device setting is ignored entirely.
-Patch0:  phonon-4.2.0-pulseaudio.patch
-Patch1:  phonon-4.2.70-xine-pulseaudio.patch
+Patch0:  phonon-4.2.96-pulseaudio.patch
+Patch1:  phonon-4.2.96-xine-pulseaudio.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: automoc4
@@ -144,6 +144,12 @@
 
 
 %changelog
+* Thu Jan 08 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 4.2.96-1
+- 4.2.96
+- rebase phonon-4.2.0-pulseaudio.patch (-> phonon-4.2.96-pulseaudio.patch)
+- rebase phonon-4.2.70-xine-pulseaudio.patch 
+  (-> phonon-4.2.96-xine-pulseaudio.patch)
+
 * Fri Dec 12 2008 Rex Dieter <rdieter at fedoraproject.org> 4.2.80-3
 - rebuild for pkgconfig deps
 


--- phonon-4.2.0-pulseaudio.patch DELETED ---


--- phonon-4.2.70-xine-pulseaudio.patch DELETED ---