changeset in /hg/pulseaudio: 2008-09-25 Ioana Ivan <iivan at redhat...

[Ioana Ivan]

changeset 6201d96f7b94 in /hg/pulseaudio
details: http://icedtea.classpath.org/hg/pulseaudio?cmd=changeset;node=6201d96f7b94
description:
	2008-09-25 Ioana Ivan <iivan at redhat.com>

	        * src/native/org_classpath_icedtea_Stream.c
	        (Java_org_classpath_icedtea_pulseaudio_Stream_native_1pa_1stream_1connect_1playback):
	        pass 0 as a flag to pa_stream_connect_playback

	        * src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java:
	        formating changes

diffstat:

3 files changed, 37 insertions(+), 32 deletions(-)
ChangeLog                                                               |    9 +
src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java |   55 ++++------
src/native/org_classpath_icedtea_pulseaudio_Stream.c                    |    5 

diffs (142 lines):

diff -r e29a9eb84a4e -r 6201d96f7b94 ChangeLog
--- a/ChangeLog	Wed Sep 24 10:51:53 2008 -0400
+++ b/ChangeLog	Thu Sep 25 14:33:45 2008 -0400
@@ -1,3 +1,12 @@ 2008-09-23 Ioana Ivan <iivan at redhat.com>
+2008-09-25 Ioana Ivan <iivan at redhat.com>
+	
+	* src/native/org_classpath_icedtea_Stream.c
+	(Java_org_classpath_icedtea_pulseaudio_Stream_native_1pa_1stream_1connect_1playback):
+	pass 0 as a flag to pa_stream_connect_playback
+
+	* src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java:
+	formating changes
+
 2008-09-23 Ioana Ivan <iivan at redhat.com>
 	* src/java/org/classpath/icedtea/pulseaudio/PulseAudioDataLine.java:
 		-split open() into createStream(), addStreamListeners() and
diff -r e29a9eb84a4e -r 6201d96f7b94 src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java
--- a/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java	Wed Sep 24 10:51:53 2008 -0400
+++ b/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java	Thu Sep 25 14:33:45 2008 -0400
@@ -105,25 +105,25 @@ public class PulseAudioSourceDataLine ex
 
 	}
 
-	protected void connectLine(int bufferSize, Stream masterStream) throws LineUnavailableException {
+	protected void connectLine(int bufferSize, Stream masterStream)
+			throws LineUnavailableException {
 		StreamBufferAttributes bufferAttributes = new StreamBufferAttributes(
 
-				bufferSize, bufferSize / 4, bufferSize / 8,
+		bufferSize, bufferSize / 4, bufferSize / 8,
 				((bufferSize / 10) > 100 ? bufferSize / 10 : 100), 0);
 
-
-		if(masterStream != null) {
-			synchronized (eventLoop.threadLock) {
-				stream.connectForPlayback(Stream.DEFAULT_DEVICE, bufferAttributes, masterStream.getStreamPointer());
+		if (masterStream != null) {
+			synchronized (eventLoop.threadLock) {
+				stream.connectForPlayback(Stream.DEFAULT_DEVICE,
+						bufferAttributes, masterStream.getStreamPointer());
 			}
 		} else {
 			synchronized (eventLoop.threadLock) {
-				stream.connectForPlayback(Stream.DEFAULT_DEVICE, bufferAttributes, null);
-			}
-		}
-	}
-	
-
+				stream.connectForPlayback(Stream.DEFAULT_DEVICE,
+						bufferAttributes, null);
+			}
+		}
+	}
 
 	@Override
 	public int write(byte[] data, int offset, int length) {
@@ -133,11 +133,10 @@ public class PulseAudioSourceDataLine ex
 			throw new IllegalStateException("must call open() before write()");
 		}
 
-
-		/*if (!isStarted) {
-			throw new IllegalStateException("must call start() before write()");
-		}*/
-
+		/*
+		 * if (!isStarted) { throw new IllegalStateException("must call start()
+		 * before write()"); }
+		 */
 
 		int frameSize = currentFormat.getFrameSize();
 		if (length % frameSize != 0) {
@@ -158,15 +157,13 @@ public class PulseAudioSourceDataLine ex
 
 		int sizeWritten = 0;
 
-	
-
 		boolean interrupted = false;
 
 		while (remainingLength != 0) {
 
 			synchronized (eventLoop.threadLock) {
 				availableSize = stream.getWritableSize();
-			
+
 				do {
 					if (availableSize < 0) {
 						return sizeWritten;
@@ -181,29 +178,25 @@ public class PulseAudioSourceDataLine ex
 						}
 
 					}
-					
+
 					availableSize = stream.getWritableSize();
-					//System.out.println(availableSize);
-					
+					// System.out.println(availableSize);
 
 				} while (availableSize == 0);
-			
 
 				if (availableSize > remainingLength) {
 					availableSize = remainingLength;
 				}
 				/* write a little bit of the buffer */
-		
-					stream.write(data, position, availableSize);
-					//System.out.println("written " + availableSize);
-	
+
+				stream.write(data, position, availableSize);
+				// System.out.println("written " + availableSize);
 
 				sizeWritten += availableSize;
 				position += availableSize;
 				remainingLength -= availableSize;
-				}
-			}
-		
+			}
+		}
 
 		// all the data should have been played by now
 		assert (sizeWritten == length);
diff -r e29a9eb84a4e -r 6201d96f7b94 src/native/org_classpath_icedtea_pulseaudio_Stream.c
--- a/src/native/org_classpath_icedtea_pulseaudio_Stream.c	Wed Sep 24 10:51:53 2008 -0400
+++ b/src/native/org_classpath_icedtea_pulseaudio_Stream.c	Thu Sep 25 14:33:45 2008 -0400
@@ -435,7 +435,10 @@ JNIEXPORT jint JNICALL Java_org_classpat
 			return -1; // oome thrown
 		}
 	}
-	int value = pa_stream_connect_playback(stream, dev, &buffer_attr, PA_STREAM_START_CORKED, NULL, sync_stream);
+	/* Set flags to 0 to fix problem with draining before calling start, might need to
+	be changed back to PA_STREAM_START_CORKED in the future, if we'll be able to implement
+	synchronization*/ 
+	int value = pa_stream_connect_playback(stream, dev, &buffer_attr, 0, NULL, sync_stream);
 
 	if (dev != NULL) {
 		(*env)->ReleaseStringUTFChars(env, device, dev);