rpms/kmid2/devel kmid2-0.2.0-timidity-pulseaudio.patch, NONE, 1.1 kmid2.spec, 1.6, 1.7

[Kevin Kofler]

Author: kkofler

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

Modified Files:
	kmid2.spec 
Added Files:
	kmid2-0.2.0-timidity-pulseaudio.patch 
Log Message:
* Sun Jan 31 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.2.0-2
- Support PulseAudio when autospawning TiMidity++ (-OO -opulse switches)

kmid2-0.2.0-timidity-pulseaudio.patch:
 externalsoftsynth.cpp |   21 +++++++++++++--------
 prefs_progs.ui        |    5 +++++
 2 files changed, 18 insertions(+), 8 deletions(-)

--- NEW FILE kmid2-0.2.0-timidity-pulseaudio.patch ---
diff -ur kmid2-0.2.0/src/externalsoftsynth.cpp kmid2-0.2.0-timidity-pulseaudio/src/externalsoftsynth.cpp
--- kmid2-0.2.0/src/externalsoftsynth.cpp	2010-01-12 00:18:33.000000000 +0100
+++ kmid2-0.2.0-timidity-pulseaudio/src/externalsoftsynth.cpp	2010-01-31 23:28:16.000000000 +0100
@@ -249,14 +249,19 @@
     //kDebug() << "waiting=" << waiting;
     if ( m_process.state() == KProcess::NotRunning && m_Ok ) {
         args += "-iA";
-        if (Settings::audio_timidity() == "alsa")
-            args += "-Os";
-        else if (Settings::audio_timidity() == "jack")
-            args += "-Oj";
-        else
-            args += "-Od";
-        if (!Settings::audiodev_timidity().isEmpty())
-            args += ("-o" + Settings::audiodev_timidity());
+        if (Settings::audio_timidity() == "pulseaudio") {
+          args += "-OO"; // libao
+          args += "-opulse"; // use libao's "pulse" device
+        } else {
+          if (Settings::audio_timidity() == "alsa")
+              args += "-Os";
+          else if (Settings::audio_timidity() == "jack")
+              args += "-Oj";
+          else
+              args += "-Od";
+          if (!Settings::audiodev_timidity().isEmpty())
+              args += ("-o" + Settings::audiodev_timidity());
+        }
         if (!Settings::rate_timidity().isEmpty())
             args += ("-s" + Settings::rate_timidity());
         if (!Settings::args_timidity().isEmpty())
diff -ur kmid2-0.2.0/src/prefs_progs.ui kmid2-0.2.0-timidity-pulseaudio/src/prefs_progs.ui
--- kmid2-0.2.0/src/prefs_progs.ui	2010-01-08 13:57:53.000000000 +0100
+++ kmid2-0.2.0-timidity-pulseaudio/src/prefs_progs.ui	2010-01-31 23:25:44.000000000 +0100
@@ -247,6 +247,11 @@
          </item>
          <item>
           <property name="text">
+           <string>pulseaudio</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
            <string>oss</string>
           </property>
          </item>


Index: kmid2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kmid2/devel/kmid2.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- kmid2.spec	31 Jan 2010 22:34:01 -0000	1.6
+++ kmid2.spec	31 Jan 2010 22:46:20 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           kmid2
 Version:        0.2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A MIDI/karaoke player for KDE
 
 Group:          Applications/Multimedia
@@ -9,6 +9,9 @@ License:        GPLv2+ and CC-BY
 URL:            http://userbase.kde.org/KMid2
 
 Source0:        http://downloads.sourceforge.net/project/%{name}/%{name}/%{version}/%{name}-%{version}.tar.bz2
+# support PulseAudio when autospawning TiMidity++ (-OO -opulse switches)
+# submitted upstream, awaiting response
+Patch0:         kmid2-0.2.0-timidity-pulseaudio.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -43,6 +46,7 @@ It also has a keyboard view to see the n
 %setup -q
 # zap bundled copy of drumstick to guarantee it's never used
 rm -rf drumstick
+%patch0 -p1 -b .timidity-pulseaudio
 
 
 %build
@@ -94,6 +98,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Sun Jan 31 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.2.0-2
+- Support PulseAudio when autospawning TiMidity++ (-OO -opulse switches)
+
 * Sun Jan 31 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.2.0-1
 - Update to 0.2.0
 - The examples with copyright issues have been dropped by upstream