changeset in /hg/icedtea: 2008-10-14 Ioana Ivan <iivand at redhat.com>

[Ioana Ivan]

changeset 654694c101ad in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=654694c101ad
description:
	2008-10-14 Ioana Ivan <iivand at redhat.com>

	        * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioDataLine.java
	          (open): startedListener only sends a START event when playback first
	          starts and after an underflow
	          (start): sends a START event if there's data on the line

diffstat:

2 files changed, 24 insertions(+), 9 deletions(-)
ChangeLog                                                                    |    9 +++
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioDataLine.java |   24 ++++++----

diffs (80 lines):

diff -r 17eedb3bbfbd -r 654694c101ad ChangeLog
--- a/ChangeLog	Tue Oct 14 17:08:32 2008 -0400
+++ b/ChangeLog	Wed Oct 15 01:36:05 2008 -0400
@@ -1,3 +1,10 @@ 2008-10-14 Ioana Ivan <iivan at redhat.com>
+2008-10-14 Ioana Ivan <iivand at redhat.com>
+
+        * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioDataLine.java
+	  (open): startedListener only sends a START event when playback first
+	  starts and after an underflow
+	  (start): sends a START event if there's data on the line
+
 2008-10-14 Ioana Ivan <iivan at redhat.com>
 
         * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioClip.java
@@ -6,7 +13,7 @@ 2008-10-14 Ioana Ivan <iivan at redhat.com>
 
 2008-10-14 Omair Majid <omajid at redhat.com>
 
-	* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioDataLine.java
+	* pulseaudio/src/java/org/classpat/icedtea/pulseaudio/PulseAudioDataLine.java
 	(connect): Removed debug output.
 
 2008-10-14 Omair Majid <omajid at redhat.com>
diff -r 17eedb3bbfbd -r 654694c101ad pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioDataLine.java
--- a/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioDataLine.java	Tue Oct 14 17:08:32 2008 -0400
+++ b/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioDataLine.java	Wed Oct 15 01:36:05 2008 -0400
@@ -84,9 +84,9 @@ public abstract class PulseAudioDataLine
 		if (isOpen) {
 			throw new IllegalStateException("Line is already open");
 		}
-		
+
 		PulseAudioMixer mixer = PulseAudioMixer.getInstance();
-		if(!mixer.isOpen()) {
+		if (!mixer.isOpen()) {
 			mixer.open();
 		}
 
@@ -205,13 +205,14 @@ public abstract class PulseAudioDataLine
 		Stream.PlaybackStartedListener startedListener = new Stream.PlaybackStartedListener() {
 			@Override
 			public void update() {
-				fireLineEvent(new LineEvent(PulseAudioDataLine.this,
-						LineEvent.Type.START, framesSinceOpen));
-
+				if (!dataWritten) {
+					fireLineEvent(new LineEvent(PulseAudioDataLine.this,
+							LineEvent.Type.START, framesSinceOpen));
+					synchronized (this) {
+						this.notifyAll();
+					}
+				}
 				dataWritten = true;
-				synchronized (this) {
-					this.notifyAll();
-				}
 
 			}
 		};
@@ -343,6 +344,10 @@ public abstract class PulseAudioDataLine
 			return;
 
 		}
+		if (dataWritten && (!isStarted)) {
+			fireLineEvent(new LineEvent(PulseAudioDataLine.this,
+					LineEvent.Type.START, framesSinceOpen));
+		}
 
 		Operation op;
 		synchronized (eventLoop.threadLock) {
@@ -351,6 +356,9 @@ public abstract class PulseAudioDataLine
 
 		op.waitForCompletion();
 		op.releaseReference();
+		synchronized (this) {
+			this.notifyAll();
+		}
 		isStarted = true;
 
 	}