Mercurial > hg > pulseaudio

changeset 180:095b46980d97 icedtea-integrated

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2008-10-10 Ioana Ivan <iivan@redhat.com> * src/java/org/classpath/icedtea/pulseaudio/PulseAudioDataLine.java (getLineInfo): removed method, moved to each subclass * src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java (getLineInfo): new method * src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLine.java (getLineInfo): new method * src/java/org/classpath/icedtea/pulseaudio/PulseAudioClip.java getLineInfo): new method
author Ioana Ivan <iivan@redhat.com>
date Fri, 10 Oct 2008 12:32:00 -0400
parents 63fe20298326
children c84f9b9f70dc
files .classpath ChangeLog src/java/org/classpath/icedtea/pulseaudio/PulseAudioClip.java src/java/org/classpath/icedtea/pulseaudio/PulseAudioDataLine.java src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLine.java
diffstat 6 files changed, 33 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/.classpath	Fri Oct 10 11:10:27 2008 -0400
+++ b/.classpath	Fri Oct 10 12:32:00 2008 -0400
@@ -3,6 +3,7 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="src" path="unittests"/>
 	<classpathentry kind="src" path="src/java"/>
+	<classpathentry kind="src" path="jcktests"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
--- a/ChangeLog	Fri Oct 10 11:10:27 2008 -0400
+++ b/ChangeLog	Fri Oct 10 12:32:00 2008 -0400
@@ -1,3 +1,14 @@
+2008-10-10 Ioana Ivan <iivan@redhat.com>
+	* src/java/org/classpath/icedtea/pulseaudio/PulseAudioDataLine.java
+	(getLineInfo): removed method, moved to each subclass
+	* src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java
+	(getLineInfo): new method
+	* src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLine.java
+	(getLineInfo): new method
+	* src/java/org/classpath/icedtea/pulseaudio/PulseAudioClip.java
+	getLineInfo): new method
+
+
 2008-10-08 Ioana Ivan <iivan@redhat.com>
 	* src/java/org/classpath/icedtea/pulseaudio/PulseAudioDataLine.java
 	(addStreamListener): startedListener always fires a START event
--- a/src/java/org/classpath/icedtea/pulseaudio/PulseAudioClip.java	Fri Oct 10 11:10:27 2008 -0400
+++ b/src/java/org/classpath/icedtea/pulseaudio/PulseAudioClip.java	Fri Oct 10 12:32:00 2008 -0400
@@ -44,6 +44,7 @@
 import javax.sound.sampled.AudioPermission;
 import javax.sound.sampled.AudioSystem;
 import javax.sound.sampled.Clip;
+import javax.sound.sampled.DataLine;
 import javax.sound.sampled.LineUnavailableException;
 
 import org.classpath.icedtea.pulseaudio.Stream.WriteListener;
@@ -557,5 +558,11 @@
 		super.stop();
 
 	}
+	
+	public javax.sound.sampled.Line.Info getLineInfo() {
+		return new DataLine.Info(Clip.class, supportedFormats,
+				StreamBufferAttributes.MIN_VALUE,
+				StreamBufferAttributes.MAX_VALUE);
+	}
 
 }
--- a/src/java/org/classpath/icedtea/pulseaudio/PulseAudioDataLine.java	Fri Oct 10 11:10:27 2008 -0400
+++ b/src/java/org/classpath/icedtea/pulseaudio/PulseAudioDataLine.java	Fri Oct 10 12:32:00 2008 -0400
@@ -426,12 +426,6 @@
 		return bufferSize;
 	}
 
-	public javax.sound.sampled.Line.Info getLineInfo() {
-		return new DataLine.Info(this.getClass(), supportedFormats,
-				StreamBufferAttributes.MIN_VALUE,
-				StreamBufferAttributes.MAX_VALUE);
-	}
-
 	@Override
 	public AudioFormat getFormat() {
 		if (!isOpen) {
--- a/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java	Fri Oct 10 11:10:27 2008 -0400
+++ b/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java	Fri Oct 10 12:32:00 2008 -0400
@@ -40,6 +40,7 @@
 import java.util.ArrayList;
 
 import javax.sound.sampled.AudioFormat;
+import javax.sound.sampled.DataLine;
 import javax.sound.sampled.AudioPermission;
 import javax.sound.sampled.LineListener;
 import javax.sound.sampled.LineUnavailableException;
@@ -329,5 +330,11 @@
 
 		super.close();
 	}
+	
+	public javax.sound.sampled.Line.Info getLineInfo() {
+		return new DataLine.Info(SourceDataLine.class, supportedFormats,
+				StreamBufferAttributes.MIN_VALUE,
+				StreamBufferAttributes.MAX_VALUE);
+	}
 
 }
--- a/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLine.java	Fri Oct 10 11:10:27 2008 -0400
+++ b/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLine.java	Fri Oct 10 12:32:00 2008 -0400
@@ -38,6 +38,7 @@
 package org.classpath.icedtea.pulseaudio;
 
 import javax.sound.sampled.AudioFormat;
+import javax.sound.sampled.DataLine;
 import javax.sound.sampled.AudioPermission;
 import javax.sound.sampled.LineEvent;
 import javax.sound.sampled.LineUnavailableException;
@@ -362,5 +363,11 @@
 
 		fireLineEvent(new LineEvent(this, LineEvent.Type.STOP, framesSinceOpen));
 	}
+	
+	public javax.sound.sampled.Line.Info getLineInfo() {
+		return new DataLine.Info(TargetDataLine.class, supportedFormats,
+				StreamBufferAttributes.MIN_VALUE,
+				StreamBufferAttributes.MAX_VALUE);
+	}
 
 }