changeset in /hg/pulseaudio: 2008-10-07 Omair Majid <omajid at redh...

[Omair Majid]

changeset c080309b8edd in /hg/pulseaudio
details: http://icedtea.classpath.org/hg/pulseaudio?cmd=changeset;node=c080309b8edd
description:
	2008-10-07 Omair Majid <omajid at redhat.com>

	    * src/java/org/classpath/icedtea/pulseaudio/PulseAudioClip.java
	    (writeFrames): Synchronized the call to notifyAll.
	    * src/java/org/classpath/icedtea/pulseaudio/PulseAudioDataLine.java
	    (addStreamListeners): Likewise.

diffstat:

2 files changed, 17 insertions(+), 23 deletions(-)
src/java/org/classpath/icedtea/pulseaudio/PulseAudioClip.java     |    4 -
src/java/org/classpath/icedtea/pulseaudio/PulseAudioDataLine.java |   36 +++-------

diffs (112 lines):

diff -r d7c213ee6717 -r c080309b8edd src/java/org/classpath/icedtea/pulseaudio/PulseAudioClip.java
--- a/src/java/org/classpath/icedtea/pulseaudio/PulseAudioClip.java	Tue Oct 07 12:06:29 2008 -0400
+++ b/src/java/org/classpath/icedtea/pulseaudio/PulseAudioClip.java	Tue Oct 07 14:08:22 2008 -0400
@@ -125,7 +125,9 @@ public class PulseAudioClip extends Puls
 		WriteListener writeListener = new WriteListener() {
 			@Override
 			public void update() {
-				eventLoop.threadLock.notifyAll();
+				synchronized (eventLoop.threadLock) {
+					eventLoop.threadLock.notifyAll();
+				}
 			}
 		};
 
diff -r d7c213ee6717 -r c080309b8edd src/java/org/classpath/icedtea/pulseaudio/PulseAudioDataLine.java
--- a/src/java/org/classpath/icedtea/pulseaudio/PulseAudioDataLine.java	Tue Oct 07 12:06:29 2008 -0400
+++ b/src/java/org/classpath/icedtea/pulseaudio/PulseAudioDataLine.java	Tue Oct 07 14:08:22 2008 -0400
@@ -58,9 +58,8 @@ public abstract class PulseAudioDataLine
 	// true between start() and stop()
 	protected boolean isStarted = false;
 
-	//true between a started and an underflow callback
+	// true between a started and an underflow callback
 	protected boolean dataWritten = false;
-	
 
 	// true if a stream has been paused
 	// protected boolean isPaused = false;
@@ -161,10 +160,9 @@ public abstract class PulseAudioDataLine
 
 		Stream.UnderflowListener stoppedListener = new Stream.UnderflowListener() {
 			@Override
-			
 			public void update() {
 				dataWritten = false;
-				System.out.println("underflow");
+
 				// always send a STOP event on an underflow (assumption:
 				// an underflow can't happen while the stream is corked)
 				fireLineEvent(new LineEvent(PulseAudioDataLine.this,
@@ -176,10 +174,9 @@ public abstract class PulseAudioDataLine
 		Stream.PlaybackStartedListener startedListener = new Stream.PlaybackStartedListener() {
 			@Override
 			public void update() {
-				System.out.println("started callback");
-				
-				//only send a START event in the beginning and following
-				//an underflow
+
+				// only send a START event in the beginning and following
+				// an underflow
 				if (!dataWritten) {
 					fireLineEvent(new LineEvent(PulseAudioDataLine.this,
 							LineEvent.Type.START, framesSinceOpen));
@@ -196,8 +193,9 @@ public abstract class PulseAudioDataLine
 
 			@Override
 			public void update() {
-				// System.out.println("can write");
-				eventLoop.threadLock.notifyAll();
+				synchronized (eventLoop.threadLock) {
+					eventLoop.threadLock.notifyAll();
+				}
 			}
 
 		};
@@ -207,8 +205,9 @@ public abstract class PulseAudioDataLine
 
 			@Override
 			public void update() {
-
-				eventLoop.threadLock.notifyAll();
+				synchronized (eventLoop.threadLock) {
+					eventLoop.threadLock.notifyAll();
+				}
 			}
 
 		};
@@ -314,10 +313,9 @@ public abstract class PulseAudioDataLine
 
 		if (isStarted) {
 			return;
-			
-		}
-
-		
+
+		}
+
 		Operation op;
 		synchronized (eventLoop.threadLock) {
 			op = stream.unCork();
@@ -330,7 +328,6 @@ public abstract class PulseAudioDataLine
 		op.waitForCompletion();
 		op.releaseReference();
 		isStarted = true;
-
 
 	}
 
@@ -427,11 +424,6 @@ public abstract class PulseAudioDataLine
 
 	public void setName(String streamName) {
 		if (isOpen) {
-			/*
-			 * Note: setting the name of the stream after it's created wont
-			 * work. In fact, it sets the name of the application! This is a bug
-			 * in PulseAudio 0.9.12 but fixed in git.
-			 */
 
 			Operation o;
 			synchronized (eventLoop.threadLock) {