rpms/zynaddsubfx/devel zynaddsubfx-unzombify.patch, NONE, 1.1 zynaddsubfx.spec, 1.10, 1.11

[Anthony Green (green)]

Author: green

Update of /cvs/extras/rpms/zynaddsubfx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12914

Modified Files:
	zynaddsubfx.spec 
Added Files:
	zynaddsubfx-unzombify.patch 
Log Message:
Add -unzombify patch.

zynaddsubfx-unzombify.patch:

--- NEW FILE zynaddsubfx-unzombify.patch ---
--- ZynAddSubFX-2.2.1/src/Output/JACKaudiooutput.C~	2007-10-10 15:12:05.000000000 -0400
+++ ZynAddSubFX-2.2.1/src/Output/JACKaudiooutput.C	2007-10-10 15:17:59.047476392 -0400
@@ -77,9 +77,14 @@
     jack_default_audio_sample_t *outl=(jack_default_audio_sample_t *) jack_port_get_buffer (outport_left, nframes);
     jack_default_audio_sample_t *outr=(jack_default_audio_sample_t *) jack_port_get_buffer (outport_right, nframes);
 
-    pthread_mutex_lock(&jackmaster->mutex);
-    jackmaster->GetAudioOutSamples(nframes,jack_get_sample_rate(jackclient),outl,outr);
-    pthread_mutex_unlock(&jackmaster->mutex);
+    if (!pthread_mutex_trylock(&jackmaster->mutex)) {
+      jackmaster->GetAudioOutSamples(nframes,jack_get_sample_rate(jackclient),outl,outr);
+      pthread_mutex_unlock(&jackmaster->mutex);
+    }
+    else {
+      memset(outl, 0, sizeof(jack_default_audio_sample_t) * nframes);
+      memset(outr, 0, sizeof(jack_default_audio_sample_t) * nframes);
+    }
     
     return(0);
 };


Index: zynaddsubfx.spec
===================================================================
RCS file: /cvs/extras/rpms/zynaddsubfx/devel/zynaddsubfx.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- zynaddsubfx.spec	9 Oct 2007 09:47:11 -0000	1.10
+++ zynaddsubfx.spec	10 Oct 2007 21:25:27 -0000	1.11
@@ -1,7 +1,7 @@
 Summary:        Real-time software synthesizer
 Name:           zynaddsubfx
 Version:        2.2.1
-Release:        16%{?dist}
+Release:        17%{?dist}
 License:        GPL
 Group:          Applications/Multimedia
 URL:            http://zynaddsubfx.sourceforge.net
@@ -9,6 +9,7 @@
 Patch0:         zyn_lash-0.5.0pre0.diff
 Patch1:         zynaddsubfx-fltk-config-broken.patch
 Patch2:         zynaddsubfx-fltk-config-broken-2.patch
+Patch3:		zynaddsubfx-unzombify.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       fltk >= 1.1.3
@@ -42,6 +43,7 @@
 %patch0 -p1
 %patch1 -p0
 %patch2 -p0
+%patch3 -p1
 
 %build
 # fix microtuning bug (no keyboard mapping being done)
@@ -148,6 +150,10 @@
 %{_datadir}/icons/hicolor/64x64/apps/zynaddsubfx.png
 
 %changelog
+* Wed Oct 10 2007 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 2.2.1-17
+- added tweaked unzombify patch by Lars Luthman (patch3), see:
+  http://sourceforge.net/tracker/index.php?func=detail&aid=1498438&group_id=62934&atid=502314
+
 * Tue Oct 09 2007 Anthony Green <green at redhat.com> 2.2.1-16
 - Rebuilt for new lash again.