rpms/openal/devel openal-pause.patch, NONE, 1.1 openal.spec, 1.18, 1.19

[Andreas Bierfert (awjb)]

Author: awjb

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

Modified Files:
	openal.spec 
Added Files:
	openal-pause.patch 
Log Message:
- apply patch from Hans de Goede (#202260)


openal-pause.patch:

--- NEW FILE openal-pause.patch ---
--- portable/src/alc/alc_context.c.pause	2006-01-23 16:12:09.000000000 +0100
+++ portable/src/alc/alc_context.c	2006-08-11 11:30:23.000000000 +0200
@@ -236,10 +236,17 @@
 		/* someone unpaused us */
 		ispaused = AL_FALSE;
 
-		_alcDeviceResume( cc->write_device );
-		_alcDeviceResume( cc->read_device );
+		if( cc->write_device )
+			_alcDeviceResume( cc->write_device );
+		if( cc->read_device )
+			_alcDeviceResume( cc->read_device );
 
 		_alcUnlockAllContexts();
+		/* If the last context got destroyed after pausing, then the
+		   mixer will have been destroyed too, causing it to be
+		   unlocked, so first try to lock it to make sure it is
+		   actually locked before unlocking it. */
+		_alTryLockMixerPause();
 		_alUnlockMixerPause();
 	} else {
 		/* just unlock contexts */
--- portable/src/al_mixer.c.fixes	2006-08-11 12:38:47.000000000 +0200
+++ portable/src/al_mixer.c	2006-08-11 12:39:42.000000000 +0200
@@ -155,14 +155,6 @@
 static void _alAddBufferToStreamingList( ALuint bid );
 
 /*
- * _alTryLockMixerPause( void )
- *
- * Try to lock the mix_pause mutex.  Return AL_TRUE if lock suceeded, AL_FALSE
- * otherwise.
- */
-static ALboolean _alTryLockMixerPause( void );
-
-/*
  * _alMixSources
  *
  * This is the where most of the action is directed.
@@ -1180,7 +1172,7 @@
  * asynchronous mixers.  Return AL_TRUE if the pause mutex was locked,
  * AL_FALSE otherwise.
  */
-static ALboolean _alTryLockMixerPause( void ) {
+ALboolean _alTryLockMixerPause( void ) {
 	if(_alTryLockMutex( pause_mutex ) == 0) {
 		return AL_TRUE;
 	}
--- portable/src/al_mixer.h.fixes	2006-08-11 12:39:10.000000000 +0200
+++ portable/src/al_mixer.h	2006-08-11 12:39:44.000000000 +0200
@@ -108,6 +108,14 @@
  */
 
 /*
+ * _alTryLockMixerPause( void )
+ *
+ * Try to lock the mix_pause mutex.  Return AL_TRUE if lock suceeded, AL_FALSE
+ * otherwise.
+ */
+ALboolean _alTryLockMixerPause( void );
+
+/*
  * Lock the MixerPause mutex, which is use to "pause" the mixer.
  */
 void _alLockMixerPause( void );



Index: openal.spec
===================================================================
RCS file: /cvs/extras/rpms/openal/devel/openal.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- openal.spec	1 Aug 2006 12:42:31 -0000	1.18
+++ openal.spec	21 Aug 2006 07:01:34 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           openal
 Version:        0.0.9
-Release:        0.6.20060204cvs%{?dist}
+Release:        0.7.20060204cvs%{?dist}
 Summary:        Open Audio Library
 
 Group:          System Environment/Libraries
@@ -15,6 +15,7 @@
 Patch0:         openal-arch.patch
 Patch1:         openal-no-undefined.patch
 Patch2:         openal-pkgconfig.patch
+Patch3:         openal-pause.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  alsa-lib-devel
@@ -53,6 +54,7 @@
 %setup -q -n portable
 %patch1
 %patch2
+%patch3 -p1
 ./autogen.sh
 %patch0 -p1
 
@@ -100,6 +102,10 @@
 
 
 %changelog
+* Mon Aug 21 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.0.9-0.7.20060204
+- apply patch from Hans de Goede (#202260)
+
 * Tue Aug 01 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.0.9-0.6.20060204
 - fix #200439