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

[Omair Majid]

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

	    * src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java
	    New variables flushed and drained.
	    (write): Synchronized on this.
	    (flush): Set flushed to true.
	    (drain): Set drained to true.

diffstat:

2 files changed, 61 insertions(+), 34 deletions(-)
src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java |   92 ++++++----
src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLine.java |    3 

diffs (139 lines):

diff -r eb2d35a91b0d -r 86fab9e2bc64 src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java
--- a/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java	Mon Oct 06 11:31:34 2008 -0400
+++ b/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java	Mon Oct 06 15:30:33 2008 -0400
@@ -51,6 +51,9 @@ public class PulseAudioSourceDataLine ex
 	private PulseAudioVolumeControl volumeControl;
 	private boolean muted;
 	private float volume;
+	
+	boolean flushed = false;
+	boolean drained = false;
 
 	public PulseAudioSourceDataLine(EventLoop eventLoop, AudioFormat[] formats,
 			AudioFormat defaultFormat) {
@@ -156,43 +159,56 @@ public class PulseAudioSourceDataLine ex
 
 		while (remainingLength != 0) {
 
-			synchronized (eventLoop.threadLock) {
-
-				do {
-					availableSize = stream.getWritableSize();
-
-					if (availableSize < 0) {
-						return sizeWritten;
+			synchronized (this) {
+				
+				if (!isStarted  || !isOpen) {
+					return sizeWritten;
+				}
+				
+				if (flushed) {
+					return sizeWritten;
+				}
+				
+
+				synchronized (eventLoop.threadLock) {
+
+					do {
+						availableSize = stream.getWritableSize();
+
+						if (availableSize < 0) {
+							return sizeWritten;
+						}
+
+						if (availableSize == 0) {
+							try {
+								eventLoop.threadLock.wait();
+							} catch (InterruptedException e) {
+								// ignore for now
+								interrupted = true;
+							}
+
+						}
+
+					} while (availableSize == 0);
+
+					if (availableSize > remainingLength) {
+						availableSize = remainingLength;
 					}
 
-					if (availableSize == 0) {
-						try {
-							eventLoop.threadLock.wait();
-						} catch (InterruptedException e) {
-							// ignore for now
-							interrupted = true;
-						}
-
-					}
-
-				} while (availableSize == 0);
-
-				if (availableSize > remainingLength) {
-					availableSize = remainingLength;
+					// only write entire frames, so round down avialableSize to
+					// a
+					// multiple of frameSize
+					availableSize = (availableSize / frameSize) * frameSize;
+
+					/* write a little bit of the buffer */
+					stream.write(data, position, availableSize);
+
+					sizeWritten += availableSize;
+					position += availableSize;
+					remainingLength -= availableSize;
+
+					framesSinceOpen += availableSize / frameSize;
 				}
-
-				// only write entire frames, so round down avialableSize to a
-				// multiple of frameSize
-				availableSize = (availableSize / frameSize) * frameSize;
-
-				/* write a little bit of the buffer */
-				stream.write(data, position, availableSize);
-
-				sizeWritten += availableSize;
-				position += availableSize;
-				remainingLength -= availableSize;
-
-				framesSinceOpen += availableSize / frameSize;
 			}
 		}
 
@@ -248,6 +264,10 @@ public class PulseAudioSourceDataLine ex
 
 		operation.waitForCompletion();
 		operation.releaseReference();
+		
+		synchronized (this) {
+			drained = true;
+		}
 
 	}
 
@@ -266,6 +286,10 @@ public class PulseAudioSourceDataLine ex
 		operation.waitForCompletion();
 		operation.releaseReference();
 
+		synchronized (this) {
+			flushed= true;
+		}
+		
 	}
 
 	@Override
diff -r eb2d35a91b0d -r 86fab9e2bc64 src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLine.java
--- a/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLine.java	Mon Oct 06 11:31:34 2008 -0400
+++ b/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLine.java	Mon Oct 06 15:30:33 2008 -0400
@@ -151,6 +151,9 @@ public class PulseAudioTargetDataLine ex
 		/* bytes read on each iteration of loop */
 		int bytesRead;
 
+		flushed = false;
+		drained = false;
+
 		/*
 		 * to read, we first take stuff from the fragmentBuffer
 		 */